aboutsummaryrefslogtreecommitdiff
path: root/drivers/char
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-07-25 01:36:53 -0400
committerLen Brown <len.brown@intel.com>2007-07-25 01:36:53 -0400
commit323ef30af3a0da47cc761b04b262d98d0fe79126 (patch)
tree37636b25acc557969aee51f1fe3e3cbc7a9760ea /drivers/char
parentcb3e0c107bebc6cf3e7158f7aa54c32017c7d4c4 (diff)
parent1ba90e3a87c46500623afdc3898573e4a5ebb21b (diff)
Pull auto-load-modules into release branch
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/hpet.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
index ba0e74ad74b..9a2694e5f8b 100644
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
@@ -1007,9 +1007,15 @@ static int hpet_acpi_remove(struct acpi_device *device, int type)
return -EINVAL;
}
+static const struct acpi_device_id hpet_device_ids[] = {
+ {"PNP0103", 0},
+ {"", 0},
+};
+MODULE_DEVICE_TABLE(acpi, hpet_device_ids);
+
static struct acpi_driver hpet_acpi_driver = {
.name = "hpet",
- .ids = "PNP0103",
+ .ids = hpet_device_ids,
.ops = {
.add = hpet_acpi_add,
.remove = hpet_acpi_remove,