diff options
| author | Bill Pemberton <wfp5p@virginia.edu> | 2012-11-24 00:30:24 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-11-24 03:03:59 -0500 |
| commit | d6f6dfd941de2b106af1290b810eff9b1c523772 (patch) | |
| tree | dd6ea1e1421e6bafbe630a4e756f6df9acbfae58 /drivers/input | |
| parent | 1cb0aa88179b7a71c240529e9d781d7bbb43d2e8 (diff) | |
Input: remove use of __devinitdata
CONFIG_HOTPLUG is going away as an option so __devinitdata is no
longer needed.
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/keyboard/tegra-kbc.c | 4 | ||||
| -rw-r--r-- | drivers/input/misc/bma150.c | 2 | ||||
| -rw-r--r-- | drivers/input/touchscreen/mms114.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/input/keyboard/tegra-kbc.c b/drivers/input/keyboard/tegra-kbc.c index 48ef283cef37..0bbcf971d103 100644 --- a/drivers/input/keyboard/tegra-kbc.c +++ b/drivers/input/keyboard/tegra-kbc.c | |||
| @@ -87,7 +87,7 @@ struct tegra_kbc { | |||
| 87 | struct clk *clk; | 87 | struct clk *clk; |
| 88 | }; | 88 | }; |
| 89 | 89 | ||
| 90 | static const u32 tegra_kbc_default_keymap[] __devinitdata = { | 90 | static const u32 tegra_kbc_default_keymap[] = { |
| 91 | KEY(0, 2, KEY_W), | 91 | KEY(0, 2, KEY_W), |
| 92 | KEY(0, 3, KEY_S), | 92 | KEY(0, 3, KEY_S), |
| 93 | KEY(0, 4, KEY_A), | 93 | KEY(0, 4, KEY_A), |
| @@ -223,7 +223,7 @@ static const u32 tegra_kbc_default_keymap[] __devinitdata = { | |||
| 223 | }; | 223 | }; |
| 224 | 224 | ||
| 225 | static const | 225 | static const |
| 226 | struct matrix_keymap_data tegra_kbc_default_keymap_data __devinitdata = { | 226 | struct matrix_keymap_data tegra_kbc_default_keymap_data = { |
| 227 | .keymap = tegra_kbc_default_keymap, | 227 | .keymap = tegra_kbc_default_keymap, |
| 228 | .keymap_size = ARRAY_SIZE(tegra_kbc_default_keymap), | 228 | .keymap_size = ARRAY_SIZE(tegra_kbc_default_keymap), |
| 229 | }; | 229 | }; |
diff --git a/drivers/input/misc/bma150.c b/drivers/input/misc/bma150.c index 0788c94fb460..5b459d7dd207 100644 --- a/drivers/input/misc/bma150.c +++ b/drivers/input/misc/bma150.c | |||
| @@ -158,7 +158,7 @@ struct bma150_data { | |||
| 158 | * are stated and verified by Bosch Sensortec where they are configured | 158 | * are stated and verified by Bosch Sensortec where they are configured |
| 159 | * to provide a generic sensitivity performance. | 159 | * to provide a generic sensitivity performance. |
| 160 | */ | 160 | */ |
| 161 | static struct bma150_cfg default_cfg __devinitdata = { | 161 | static struct bma150_cfg default_cfg = { |
| 162 | .any_motion_int = 1, | 162 | .any_motion_int = 1, |
| 163 | .hg_int = 1, | 163 | .hg_int = 1, |
| 164 | .lg_int = 1, | 164 | .lg_int = 1, |
diff --git a/drivers/input/touchscreen/mms114.c b/drivers/input/touchscreen/mms114.c index f4c1bc8a5a8d..0334898f9205 100644 --- a/drivers/input/touchscreen/mms114.c +++ b/drivers/input/touchscreen/mms114.c | |||
| @@ -576,7 +576,7 @@ static const struct i2c_device_id mms114_id[] = { | |||
| 576 | MODULE_DEVICE_TABLE(i2c, mms114_id); | 576 | MODULE_DEVICE_TABLE(i2c, mms114_id); |
| 577 | 577 | ||
| 578 | #ifdef CONFIG_OF | 578 | #ifdef CONFIG_OF |
| 579 | static struct of_device_id __devinitdata mms114_dt_match[] = { | 579 | static struct of_device_id mms114_dt_match[] = { |
| 580 | { .compatible = "melfas,mms114" }, | 580 | { .compatible = "melfas,mms114" }, |
| 581 | { } | 581 | { } |
| 582 | }; | 582 | }; |
