diff options
| author | Len Brown <len.brown@intel.com> | 2008-02-07 03:07:55 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-02-07 03:07:55 -0500 |
| commit | 8f859016ea49cd8d7c743533bd1ab3db9a813ffa (patch) | |
| tree | 6bf8238b2d1635e6f7f04ac199b63fab4b3bd834 /drivers/acpi/dock.c | |
| parent | dd07a8db7283f52f347aee468007556944b5b393 (diff) | |
| parent | 17196d6e533a5c09ca57bf398099ffa3c13248b1 (diff) | |
Merge branches 'release' and 'autoload' into release
Diffstat (limited to 'drivers/acpi/dock.c')
| -rw-r--r-- | drivers/acpi/dock.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c index 1dabdf4c07b..b3dec2101e2 100644 --- a/drivers/acpi/dock.c +++ b/drivers/acpi/dock.c @@ -51,6 +51,12 @@ static struct atomic_notifier_head dock_notifier_list; static struct platform_device *dock_device; static char dock_device_name[] = "dock"; +static const struct acpi_device_id dock_device_ids[] = { + {"LNXDOCK", 0}, + {"", 0}, +}; +MODULE_DEVICE_TABLE(acpi, dock_device_ids); + struct dock_station { acpi_handle handle; unsigned long last_dock_time; |