diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/input/misc/apanel.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/input/misc/apanel.c')
| -rw-r--r-- | drivers/input/misc/apanel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/misc/apanel.c b/drivers/input/misc/apanel.c index 71b82434264d..a8d2b8db4e35 100644 --- a/drivers/input/misc/apanel.c +++ b/drivers/input/misc/apanel.c | |||
| @@ -149,7 +149,7 @@ static void apanel_shutdown(struct i2c_client *client) | |||
| 149 | apanel_remove(client); | 149 | apanel_remove(client); |
| 150 | } | 150 | } |
| 151 | 151 | ||
| 152 | static struct i2c_device_id apanel_id[] = { | 152 | static const struct i2c_device_id apanel_id[] = { |
| 153 | { "fujitsu_apanel", 0 }, | 153 | { "fujitsu_apanel", 0 }, |
| 154 | { } | 154 | { } |
| 155 | }; | 155 | }; |