Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 841f48a8 authored by Russell King's avatar Russell King
Browse files

Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6

parents 10d48b39 4793ca40

arch/arm/mach-imx/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -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.

arch/arm/mach-imx/mach-cpuimx27.c

+1 −1
Original line number Diff line number Diff line
@@ -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));