diff options
Diffstat (limited to 'drivers/misc/sony-laptop.c')
-rw-r--r-- | drivers/misc/sony-laptop.c | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/drivers/misc/sony-laptop.c b/drivers/misc/sony-laptop.c index 303e48ca0e8a..14ee06c8f127 100644 --- a/drivers/misc/sony-laptop.c +++ b/drivers/misc/sony-laptop.c | |||
@@ -1124,10 +1124,22 @@ static int sony_nc_remove(struct acpi_device *device, int type) | |||
1124 | return 0; | 1124 | return 0; |
1125 | } | 1125 | } |
1126 | 1126 | ||
1127 | static const struct acpi_device_id sony_device_ids[] = { | ||
1128 | {SONY_NC_HID, 0}, | ||
1129 | {SONY_PIC_HID, 0}, | ||
1130 | {"", 0}, | ||
1131 | }; | ||
1132 | MODULE_DEVICE_TABLE(acpi, sony_device_ids); | ||
1133 | |||
1134 | static const struct acpi_device_id sony_nc_device_ids[] = { | ||
1135 | {SONY_NC_HID, 0}, | ||
1136 | {"", 0}, | ||
1137 | }; | ||
1138 | |||
1127 | static struct acpi_driver sony_nc_driver = { | 1139 | static struct acpi_driver sony_nc_driver = { |
1128 | .name = SONY_NC_DRIVER_NAME, | 1140 | .name = SONY_NC_DRIVER_NAME, |
1129 | .class = SONY_NC_CLASS, | 1141 | .class = SONY_NC_CLASS, |
1130 | .ids = SONY_NC_HID, | 1142 | .ids = sony_nc_device_ids, |
1131 | .owner = THIS_MODULE, | 1143 | .owner = THIS_MODULE, |
1132 | .ops = { | 1144 | .ops = { |
1133 | .add = sony_nc_add, | 1145 | .add = sony_nc_add, |
@@ -2470,10 +2482,15 @@ static int sony_pic_resume(struct acpi_device *device) | |||
2470 | return 0; | 2482 | return 0; |
2471 | } | 2483 | } |
2472 | 2484 | ||
2485 | static const struct acpi_device_id sony_pic_device_ids[] = { | ||
2486 | {SONY_PIC_HID, 0}, | ||
2487 | {"", 0}, | ||
2488 | }; | ||
2489 | |||
2473 | static struct acpi_driver sony_pic_driver = { | 2490 | static struct acpi_driver sony_pic_driver = { |
2474 | .name = SONY_PIC_DRIVER_NAME, | 2491 | .name = SONY_PIC_DRIVER_NAME, |
2475 | .class = SONY_PIC_CLASS, | 2492 | .class = SONY_PIC_CLASS, |
2476 | .ids = SONY_PIC_HID, | 2493 | .ids = sony_pic_device_ids, |
2477 | .owner = THIS_MODULE, | 2494 | .owner = THIS_MODULE, |
2478 | .ops = { | 2495 | .ops = { |
2479 | .add = sony_pic_add, | 2496 | .add = sony_pic_add, |