diff options
| author | Li Shaohua <shaohua.li@intel.com> | 2006-12-07 20:56:51 +0800 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-12-15 23:38:35 -0500 |
| commit | 54a07001b9efb6a3bb9a9d8ac9ddb226e29b5406 (patch) | |
| tree | 1614c0b44b2020c680d2bdddb8e6db80db62315e /drivers/acpi | |
| parent | 96333578b023957537c3e98b50af7f3b7e08e411 (diff) | |
| download | blackbird-op-linux-54a07001b9efb6a3bb9a9d8ac9ddb226e29b5406.tar.gz blackbird-op-linux-54a07001b9efb6a3bb9a9d8ac9ddb226e29b5406.zip | |
ACPI: consolidate two motherboard drivers into one
Consolidate motherboard1 and motherboard2 drivers into one
so that driver core doesn't complain that two drivers have
the same name.
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/motherboard.c | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/drivers/acpi/motherboard.c b/drivers/acpi/motherboard.c index 2e17ec75af03..bedb5118e312 100644 --- a/drivers/acpi/motherboard.c +++ b/drivers/acpi/motherboard.c @@ -33,8 +33,7 @@ ACPI_MODULE_NAME("acpi_motherboard") /* Dell use PNP0C01 instead of PNP0C02 */ -#define ACPI_MB_HID1 "PNP0C01" -#define ACPI_MB_HID2 "PNP0C02" +#define ACPI_MB_HID "PNP0C01,PNP0C02" /** * Doesn't care about legacy IO ports, only IO ports beyond 0x1000 are reserved * Doesn't care about the failure of 'request_region', since other may reserve @@ -110,19 +109,10 @@ static int acpi_motherboard_add(struct acpi_device *device) return 0; } -static struct acpi_driver acpi_motherboard_driver1 = { +static struct acpi_driver acpi_motherboard_driver = { .name = "motherboard", .class = "", - .ids = ACPI_MB_HID1, - .ops = { - .add = acpi_motherboard_add, - }, -}; - -static struct acpi_driver acpi_motherboard_driver2 = { - .name = "motherboard", - .class = "", - .ids = ACPI_MB_HID2, + .ids = ACPI_MB_HID, .ops = { .add = acpi_motherboard_add, }, @@ -173,8 +163,7 @@ static void __init acpi_reserve_resources(void) static int __init acpi_motherboard_init(void) { - acpi_bus_register_driver(&acpi_motherboard_driver1); - acpi_bus_register_driver(&acpi_motherboard_driver2); + acpi_bus_register_driver(&acpi_motherboard_driver); /* * Guarantee motherboard IO reservation first * This module must run after scan.c |
