aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/devices/platform-imx-i2c.c
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2013-01-30 08:07:14 -0500
committerShawn Guo <shawn.guo@linaro.org>2013-01-30 08:07:14 -0500
commit1d7180e24e22a608cc4d7e8fd425a19a9394a7ed (patch)
treebd747993fe7943d0f28578e371f426e4f6227ad3 /arch/arm/mach-imx/devices/platform-imx-i2c.c
parenta49f0d1ea3ec94fc7cf33a7c36a16343b74bd565 (diff)
parent7356420cd34e40fe27bf26555b0bf3f2849a43dd (diff)
Merge tag 'imx-cleanup-3.9' into imx6q-cpuidle
Diffstat (limited to 'arch/arm/mach-imx/devices/platform-imx-i2c.c')
-rw-r--r--arch/arm/mach-imx/devices/platform-imx-i2c.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm/mach-imx/devices/platform-imx-i2c.c b/arch/arm/mach-imx/devices/platform-imx-i2c.c
index 8e30e5703cd2..57d342e85c2f 100644
--- a/arch/arm/mach-imx/devices/platform-imx-i2c.c
+++ b/arch/arm/mach-imx/devices/platform-imx-i2c.c
@@ -70,16 +70,6 @@ const struct imx_imx_i2c_data imx35_imx_i2c_data[] __initconst = {
70}; 70};
71#endif /* ifdef CONFIG_SOC_IMX35 */ 71#endif /* ifdef CONFIG_SOC_IMX35 */
72 72
73#ifdef CONFIG_SOC_IMX50
74const struct imx_imx_i2c_data imx50_imx_i2c_data[] __initconst = {
75#define imx50_imx_i2c_data_entry(_id, _hwid) \
76 imx_imx_i2c_data_entry(MX50, "imx21-i2c", _id, _hwid, SZ_4K)
77 imx50_imx_i2c_data_entry(0, 1),
78 imx50_imx_i2c_data_entry(1, 2),
79 imx50_imx_i2c_data_entry(2, 3),
80};
81#endif /* ifdef CONFIG_SOC_IMX51 */
82
83#ifdef CONFIG_SOC_IMX51 73#ifdef CONFIG_SOC_IMX51
84const struct imx_imx_i2c_data imx51_imx_i2c_data[] __initconst = { 74const struct imx_imx_i2c_data imx51_imx_i2c_data[] __initconst = {
85#define imx51_imx_i2c_data_entry(_id, _hwid) \ 75#define imx51_imx_i2c_data_entry(_id, _hwid) \