summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-11-23 21:30:24 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2012-11-24 00:03:59 -0800
commitd6f6dfd941de2b106af1290b810eff9b1c523772 (patch)
treedd6ea1e1421e6bafbe630a4e756f6df9acbfae58 /drivers/input
parent1cb0aa88179b7a71c240529e9d781d7bbb43d2e8 (diff)
downloadop-kernel-dev-d6f6dfd941de2b106af1290b810eff9b1c523772.zip
op-kernel-dev-d6f6dfd941de2b106af1290b810eff9b1c523772.tar.gz
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.c4
-rw-r--r--drivers/input/misc/bma150.c2
-rw-r--r--drivers/input/touchscreen/mms114.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/input/keyboard/tegra-kbc.c b/drivers/input/keyboard/tegra-kbc.c
index 48ef283..0bbcf97 100644
--- a/drivers/input/keyboard/tegra-kbc.c
+++ b/drivers/input/keyboard/tegra-kbc.c
@@ -87,7 +87,7 @@ struct tegra_kbc {
struct clk *clk;
};
-static const u32 tegra_kbc_default_keymap[] __devinitdata = {
+static const u32 tegra_kbc_default_keymap[] = {
KEY(0, 2, KEY_W),
KEY(0, 3, KEY_S),
KEY(0, 4, KEY_A),
@@ -223,7 +223,7 @@ static const u32 tegra_kbc_default_keymap[] __devinitdata = {
};
static const
-struct matrix_keymap_data tegra_kbc_default_keymap_data __devinitdata = {
+struct matrix_keymap_data tegra_kbc_default_keymap_data = {
.keymap = tegra_kbc_default_keymap,
.keymap_size = ARRAY_SIZE(tegra_kbc_default_keymap),
};
diff --git a/drivers/input/misc/bma150.c b/drivers/input/misc/bma150.c
index 0788c94..5b459d7 100644
--- a/drivers/input/misc/bma150.c
+++ b/drivers/input/misc/bma150.c
@@ -158,7 +158,7 @@ struct bma150_data {
* are stated and verified by Bosch Sensortec where they are configured
* to provide a generic sensitivity performance.
*/
-static struct bma150_cfg default_cfg __devinitdata = {
+static struct bma150_cfg default_cfg = {
.any_motion_int = 1,
.hg_int = 1,
.lg_int = 1,
diff --git a/drivers/input/touchscreen/mms114.c b/drivers/input/touchscreen/mms114.c
index f4c1bc8..0334898 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[] = {
MODULE_DEVICE_TABLE(i2c, mms114_id);
#ifdef CONFIG_OF
-static struct of_device_id __devinitdata mms114_dt_match[] = {
+static struct of_device_id mms114_dt_match[] = {
{ .compatible = "melfas,mms114" },
{ }
};
OpenPOWER on IntegriCloud