summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mxs/include/mach
diff options
context:
space:
mode:
authorUwe Kleine-König2011-01-11 10:22:14 +0100
committerSascha Hauer2011-05-19 13:11:23 +0200
commit01d8cf03db728519ff291aa3519c9543b1203ed7 (patch)
tree4d375e5c0fee63e332bdd3cd90e640aa9d43bf6a /arch/arm/mach-mxs/include/mach
parentARM: mxs/i.MX23: make i2c defines consistent and match the reference manual (diff)
downloadkernel-qcow2-linux-01d8cf03db728519ff291aa3519c9543b1203ed7.tar.gz
kernel-qcow2-linux-01d8cf03db728519ff291aa3519c9543b1203ed7.tar.xz
kernel-qcow2-linux-01d8cf03db728519ff291aa3519c9543b1203ed7.zip
ARM: mxs: fix naming of struct holding info for mxs-i2c devices
For consistency mxs has to be repeated, one for the name space and another one for the device name. LAKML-Reference: 1300308028-8922-1-git-send-email-u.kleine-koenig@pengutronix.de Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mxs/include/mach')
-rw-r--r--arch/arm/mach-mxs/include/mach/devices-common.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-mxs/include/mach/devices-common.h b/arch/arm/mach-mxs/include/mach/devices-common.h
index c5137f14c364..7a37469ed5bf 100644
--- a/arch/arm/mach-mxs/include/mach/devices-common.h
+++ b/arch/arm/mach-mxs/include/mach/devices-common.h
@@ -65,13 +65,14 @@ struct platform_device *__init mxs_add_flexcan(
const struct flexcan_platform_data *pdata);
/* i2c */
-struct mxs_i2c_data {
+struct mxs_mxs_i2c_data {
int id;
resource_size_t iobase;
resource_size_t errirq;
resource_size_t dmairq;
};
-struct platform_device * __init mxs_add_mxs_i2c(const struct mxs_i2c_data *data);
+struct platform_device * __init mxs_add_mxs_i2c(
+ const struct mxs_mxs_i2c_data *data);
/* mmc */
#include <mach/mmc.h>