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/misc/asus-laptop.c | |
| parent | cb3e0c107bebc6cf3e7158f7aa54c32017c7d4c4 (diff) | |
| parent | 1ba90e3a87c46500623afdc3898573e4a5ebb21b (diff) | |
| download | op-kernel-dev-323ef30af3a0da47cc761b04b262d98d0fe79126.zip op-kernel-dev-323ef30af3a0da47cc761b04b262d98d0fe79126.tar.gz | |
Pull auto-load-modules into release branch
Diffstat (limited to 'drivers/misc/asus-laptop.c')
| -rw-r--r-- | drivers/misc/asus-laptop.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/misc/asus-laptop.c b/drivers/misc/asus-laptop.c index 6b89854..d0fc4fd 100644 --- a/drivers/misc/asus-laptop.c +++ b/drivers/misc/asus-laptop.c @@ -53,7 +53,6 @@ #define ASUS_HOTK_NAME "Asus Laptop Support" #define ASUS_HOTK_CLASS "hotkey" #define ASUS_HOTK_DEVICE_NAME "Hotkey" -#define ASUS_HOTK_HID "ATK0100" #define ASUS_HOTK_FILE "asus-laptop" #define ASUS_HOTK_PREFIX "\\_SB.ATKD." @@ -197,12 +196,18 @@ static struct asus_hotk *hotk; /* * The hotkey driver declaration */ +static const struct acpi_device_id asus_device_ids[] = { + {"ATK0100", 0}, + {"", 0}, +}; +MODULE_DEVICE_TABLE(acpi, asus_device_ids); + static int asus_hotk_add(struct acpi_device *device); static int asus_hotk_remove(struct acpi_device *device, int type); static struct acpi_driver asus_hotk_driver = { .name = ASUS_HOTK_NAME, .class = ASUS_HOTK_CLASS, - .ids = ASUS_HOTK_HID, + .ids = asus_device_ids, .ops = { .add = asus_hotk_add, .remove = asus_hotk_remove, |
