diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-12 22:43:26 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-12 22:43:36 +0100 |
| commit | 841f48a849e0dc14fe6f3d2bd31e831ac6a76546 (patch) | |
| tree | ed5946b32134587db9b6fc3a309bc4737b6199d7 | |
| parent | 10d48b3934940c178635413b5128c33bc17abe1d (diff) | |
| parent | 4793ca4028e4dcdbf2740db50995c9378ded3cf8 (diff) | |
| download | linux-841f48a849e0dc14fe6f3d2bd31e831ac6a76546.tar.gz linux-841f48a849e0dc14fe6f3d2bd31e831ac6a76546.tar.bz2 linux-841f48a849e0dc14fe6f3d2bd31e831ac6a76546.zip | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6
| -rw-r--r-- | arch/arm/mach-imx/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-imx/mach-cpuimx27.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index c5c0369bb481..2f7e2728970d 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -122,6 +122,7 @@ config MACH_CPUIMX27 select IMX_HAVE_PLATFORM_IMX_I2C select IMX_HAVE_PLATFORM_IMX_UART select IMX_HAVE_PLATFORM_MXC_NAND + select MXC_ULPI if USB_ULPI help Include support for Eukrea CPUIMX27 platform. This includes specific configurations for the module and its peripherals. diff --git a/arch/arm/mach-imx/mach-cpuimx27.c b/arch/arm/mach-imx/mach-cpuimx27.c index 339150ab0ea5..6830afd1d2ba 100644 --- a/arch/arm/mach-imx/mach-cpuimx27.c +++ b/arch/arm/mach-imx/mach-cpuimx27.c @@ -259,7 +259,7 @@ static void __init eukrea_cpuimx27_init(void) i2c_register_board_info(0, eukrea_cpuimx27_i2c_devices, ARRAY_SIZE(eukrea_cpuimx27_i2c_devices)); - imx27_add_i2c_imx1(&cpuimx27_i2c1_data); + imx27_add_i2c_imx0(&cpuimx27_i2c1_data); platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices)); |