diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-20 10:38:27 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-20 10:38:27 +0100 |
| commit | c721be2807467819d16db4d61a4c5db539bcc1c7 (patch) | |
| tree | ee166b44ad37480d3f05b6a0930bd69e16c6fbf9 /arch/arm/mach-mxs/include/mach | |
| parent | 1e87347c2f6e124d73b4921c4580adad4ac534d6 (diff) | |
| parent | 27ad4bf72a27c80c121b2349174e6b41b2e3afd8 (diff) | |
| download | kernel_samsung_smdk4412-c721be2807467819d16db4d61a4c5db539bcc1c7.zip kernel_samsung_smdk4412-c721be2807467819d16db4d61a4c5db539bcc1c7.tar.gz kernel_samsung_smdk4412-c721be2807467819d16db4d61a4c5db539bcc1c7.tar.bz2 | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Diffstat (limited to 'arch/arm/mach-mxs/include/mach')
| -rw-r--r-- | arch/arm/mach-mxs/include/mach/devices-common.h | 5 | ||||
| -rw-r--r-- | arch/arm/mach-mxs/include/mach/mx23.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-mxs/include/mach/devices-common.h b/arch/arm/mach-mxs/include/mach/devices-common.h index c5137f1..7a37469 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> diff --git a/arch/arm/mach-mxs/include/mach/mx23.h b/arch/arm/mach-mxs/include/mach/mx23.h index c0a18c2..599094b 100644 --- a/arch/arm/mach-mxs/include/mach/mx23.h +++ b/arch/arm/mach-mxs/include/mach/mx23.h @@ -57,7 +57,7 @@ #define MX23_AUDIOIN_BASE_ADDR (MX23_IO_BASE_ADDR + 0x04c000) #define MX23_LRADC_BASE_ADDR (MX23_IO_BASE_ADDR + 0x050000) #define MX23_SPDIF_BASE_ADDR (MX23_IO_BASE_ADDR + 0x054000) -#define MX23_I2C0_BASE_ADDR (MX23_IO_BASE_ADDR + 0x058000) +#define MX23_I2C_BASE_ADDR (MX23_IO_BASE_ADDR + 0x058000) #define MX23_RTC_BASE_ADDR (MX23_IO_BASE_ADDR + 0x05c000) #define MX23_PWM_BASE_ADDR (MX23_IO_BASE_ADDR + 0x064000) #define MX23_TIMROT_BASE_ADDR (MX23_IO_BASE_ADDR + 0x068000) |