summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorEugene Teo <eugeneteo@kernel.sg>2007-08-03 17:22:32 +0200
committerLen Brown <len.brown@intel.com>2007-08-03 21:26:41 +0200
commitf7b88ccb63188e775fe02e746c39ed177741cfc7 (patch)
tree2bd28f719274979c318d6084528f5e6d2bc5dd5a /drivers
parentsony-laptop: sony_nc_ids[] can become static. (diff)
downloadlinux-f7b88ccb63188e775fe02e746c39ed177741cfc7.tar.xz
linux-f7b88ccb63188e775fe02e746c39ed177741cfc7.zip
sonypi: fix ids member of struct acpi_driver
ids member of struct acpi_driver is of type struct acpi_device_id, not a character array. Signed-off-by: Eugene Teo <eugeneteo@kernel.sg> Signed-off-by: Mattia Dongili <malattia@linux.it> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/char/sonypi.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
index 73037a4d3c50..aeec67e27264 100644
--- a/drivers/char/sonypi.c
+++ b/drivers/char/sonypi.c
@@ -1147,10 +1147,15 @@ static int sonypi_acpi_remove(struct acpi_device *device, int type)
return 0;
}
+const static struct acpi_device_id sonypi_device_ids[] = {
+ {"SNY6001", 0},
+ {"", 0},
+};
+
static struct acpi_driver sonypi_acpi_driver = {
.name = "sonypi",
.class = "hkey",
- .ids = "SNY6001",
+ .ids = sonypi_device_ids,
.ops = {
.add = sonypi_acpi_add,
.remove = sonypi_acpi_remove,