Merge branch 'imx/multi-platform' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/cleanup

Browse source

Two bug fixes for the imx multi-platform support.

* 'imx/multi-platform' of git://git.linaro.org/people/shawnguo/linux-2.6:
  ARM: imx: select HAVE_IMX_SRC when SMP is enabled
  ARM: mach-imx: Fix selection of ARCH_MXC

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

...

This commit is contained in:

Arnd Bergmann 2012-10-25 15:33:38 +02:00

parent eccfe8b75b 68b25325a7

commit 6767d05ed8

3 changed files with 4 additions and 3 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

arch/arm/configs/imx_v4_v5_defconfig

View file

1

arch/arm/configs/imx_v6_v7_defconfig

View file

5

arch/arm/mach-imx/Kconfig

View file