diff options
| author | Len Brown <len.brown@intel.com> | 2007-07-25 01:36:53 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-07-25 01:36:53 -0400 |
| commit | 323ef30af3a0da47cc761b04b262d98d0fe79126 (patch) | |
| tree | 37636b25acc557969aee51f1fe3e3cbc7a9760ea /drivers/pnp/pnpacpi | |
| parent | cb3e0c107bebc6cf3e7158f7aa54c32017c7d4c4 (diff) | |
| parent | 1ba90e3a87c46500623afdc3898573e4a5ebb21b (diff) | |
Pull auto-load-modules into release branch
Diffstat (limited to 'drivers/pnp/pnpacpi')
| -rw-r--r-- | drivers/pnp/pnpacpi/core.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c index c37a558ecd96..fcd32ac575c3 100644 --- a/drivers/pnp/pnpacpi/core.c +++ b/drivers/pnp/pnpacpi/core.c @@ -21,7 +21,10 @@ #include <linux/acpi.h> #include <linux/pnp.h> +#include <linux/mod_devicetable.h> #include <acpi/acpi_bus.h> +#include <acpi/actypes.h> + #include "pnpacpi.h" static int num = 0; @@ -33,15 +36,17 @@ static int num = 0; * have irqs (PIC, Timer) because we call acpi_register_gsi. * Finaly only devices that have a CRS method need to be in this list. */ -static char __initdata excluded_id_list[] = - "PNP0C09," /* EC */ - "PNP0C0F," /* Link device */ - "PNP0000," /* PIC */ - "PNP0100," /* Timer */ - ; +static __initdata struct acpi_device_id excluded_id_list[] ={ + {"PNP0C09", 0}, /* EC */ + {"PNP0C0F", 0}, /* Link device */ + {"PNP0000", 0}, /* PIC */ + {"PNP0100", 0}, /* Timer */ + {"", 0}, +}; + static inline int is_exclusive_device(struct acpi_device *dev) { - return (!acpi_match_ids(dev, excluded_id_list)); + return (!acpi_match_device_ids(dev, excluded_id_list)); } /* |