diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2006-08-23 00:47:39 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2006-08-23 00:47:39 -0400 |
| commit | 72a623be00fa3d77724c1b0cac07c1bac60e70a5 (patch) | |
| tree | cd9504c0ca36e1426706094ad691554eee39f677 | |
| parent | 8ea371fb6df5a6e8056265e0089fd578e87797fc (diff) | |
Input: wistron - fix crash due to referencing __initdata
Remove __initdata markings from keymaps as they are used during
normal driver operations.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| -rw-r--r-- | drivers/input/misc/wistron_btns.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/input/misc/wistron_btns.c b/drivers/input/misc/wistron_btns.c index a8efc1af36cb..de0f46dd9692 100644 --- a/drivers/input/misc/wistron_btns.c +++ b/drivers/input/misc/wistron_btns.c | |||
| @@ -259,11 +259,11 @@ static int __init dmi_matched(struct dmi_system_id *dmi) | |||
| 259 | return 1; | 259 | return 1; |
| 260 | } | 260 | } |
| 261 | 261 | ||
| 262 | static struct key_entry keymap_empty[] __initdata = { | 262 | static struct key_entry keymap_empty[] = { |
| 263 | { KE_END, 0 } | 263 | { KE_END, 0 } |
| 264 | }; | 264 | }; |
| 265 | 265 | ||
| 266 | static struct key_entry keymap_fs_amilo_pro_v2000[] __initdata = { | 266 | static struct key_entry keymap_fs_amilo_pro_v2000[] = { |
| 267 | { KE_KEY, 0x01, KEY_HELP }, | 267 | { KE_KEY, 0x01, KEY_HELP }, |
| 268 | { KE_KEY, 0x11, KEY_PROG1 }, | 268 | { KE_KEY, 0x11, KEY_PROG1 }, |
| 269 | { KE_KEY, 0x12, KEY_PROG2 }, | 269 | { KE_KEY, 0x12, KEY_PROG2 }, |
| @@ -273,7 +273,7 @@ static struct key_entry keymap_fs_amilo_pro_v2000[] __initdata = { | |||
| 273 | { KE_END, 0 } | 273 | { KE_END, 0 } |
| 274 | }; | 274 | }; |
| 275 | 275 | ||
| 276 | static struct key_entry keymap_fujitsu_n3510[] __initdata = { | 276 | static struct key_entry keymap_fujitsu_n3510[] = { |
| 277 | { KE_KEY, 0x11, KEY_PROG1 }, | 277 | { KE_KEY, 0x11, KEY_PROG1 }, |
| 278 | { KE_KEY, 0x12, KEY_PROG2 }, | 278 | { KE_KEY, 0x12, KEY_PROG2 }, |
| 279 | { KE_KEY, 0x36, KEY_WWW }, | 279 | { KE_KEY, 0x36, KEY_WWW }, |
| @@ -285,7 +285,7 @@ static struct key_entry keymap_fujitsu_n3510[] __initdata = { | |||
| 285 | { KE_END, 0 } | 285 | { KE_END, 0 } |
| 286 | }; | 286 | }; |
| 287 | 287 | ||
| 288 | static struct key_entry keymap_wistron_ms2111[] __initdata = { | 288 | static struct key_entry keymap_wistron_ms2111[] = { |
| 289 | { KE_KEY, 0x11, KEY_PROG1 }, | 289 | { KE_KEY, 0x11, KEY_PROG1 }, |
| 290 | { KE_KEY, 0x12, KEY_PROG2 }, | 290 | { KE_KEY, 0x12, KEY_PROG2 }, |
| 291 | { KE_KEY, 0x13, KEY_PROG3 }, | 291 | { KE_KEY, 0x13, KEY_PROG3 }, |
| @@ -294,7 +294,7 @@ static struct key_entry keymap_wistron_ms2111[] __initdata = { | |||
| 294 | { KE_END, 0 } | 294 | { KE_END, 0 } |
| 295 | }; | 295 | }; |
| 296 | 296 | ||
| 297 | static struct key_entry keymap_wistron_ms2141[] __initdata = { | 297 | static struct key_entry keymap_wistron_ms2141[] = { |
| 298 | { KE_KEY, 0x11, KEY_PROG1 }, | 298 | { KE_KEY, 0x11, KEY_PROG1 }, |
| 299 | { KE_KEY, 0x12, KEY_PROG2 }, | 299 | { KE_KEY, 0x12, KEY_PROG2 }, |
| 300 | { KE_WIFI, 0x30, 0 }, | 300 | { KE_WIFI, 0x30, 0 }, |
| @@ -307,7 +307,7 @@ static struct key_entry keymap_wistron_ms2141[] __initdata = { | |||
| 307 | { KE_END, 0 } | 307 | { KE_END, 0 } |
| 308 | }; | 308 | }; |
| 309 | 309 | ||
| 310 | static struct key_entry keymap_acer_aspire_1500[] __initdata = { | 310 | static struct key_entry keymap_acer_aspire_1500[] = { |
| 311 | { KE_KEY, 0x11, KEY_PROG1 }, | 311 | { KE_KEY, 0x11, KEY_PROG1 }, |
| 312 | { KE_KEY, 0x12, KEY_PROG2 }, | 312 | { KE_KEY, 0x12, KEY_PROG2 }, |
| 313 | { KE_WIFI, 0x30, 0 }, | 313 | { KE_WIFI, 0x30, 0 }, |
| @@ -317,7 +317,7 @@ static struct key_entry keymap_acer_aspire_1500[] __initdata = { | |||
| 317 | { KE_END, 0 } | 317 | { KE_END, 0 } |
| 318 | }; | 318 | }; |
| 319 | 319 | ||
| 320 | static struct key_entry keymap_acer_travelmate_240[] __initdata = { | 320 | static struct key_entry keymap_acer_travelmate_240[] = { |
| 321 | { KE_KEY, 0x31, KEY_MAIL }, | 321 | { KE_KEY, 0x31, KEY_MAIL }, |
| 322 | { KE_KEY, 0x36, KEY_WWW }, | 322 | { KE_KEY, 0x36, KEY_WWW }, |
| 323 | { KE_KEY, 0x11, KEY_PROG1 }, | 323 | { KE_KEY, 0x11, KEY_PROG1 }, |
| @@ -327,7 +327,7 @@ static struct key_entry keymap_acer_travelmate_240[] __initdata = { | |||
| 327 | { KE_END, 0 } | 327 | { KE_END, 0 } |
| 328 | }; | 328 | }; |
| 329 | 329 | ||
| 330 | static struct key_entry keymap_aopen_1559as[] __initdata = { | 330 | static struct key_entry keymap_aopen_1559as[] = { |
| 331 | { KE_KEY, 0x01, KEY_HELP }, | 331 | { KE_KEY, 0x01, KEY_HELP }, |
| 332 | { KE_KEY, 0x06, KEY_PROG3 }, | 332 | { KE_KEY, 0x06, KEY_PROG3 }, |
| 333 | { KE_KEY, 0x11, KEY_PROG1 }, | 333 | { KE_KEY, 0x11, KEY_PROG1 }, |
