diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-02 23:29:32 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-02 23:29:32 +0000 |
| commit | b93a4afcff7be859e30cad2a305731516057d6cf (patch) | |
| tree | fb5fe55864e16527e453efd18790a34db22ee2a1 /arch/arm/Kconfig | |
| parent | 62c132a8008991530839401674ce8e1b12b005d3 (diff) | |
| parent | 9b1489e989695c4d502865f8bec616c0f17e99ab (diff) | |
| download | kernel_samsung_aries-b93a4afcff7be859e30cad2a305731516057d6cf.zip kernel_samsung_aries-b93a4afcff7be859e30cad2a305731516057d6cf.tar.gz kernel_samsung_aries-b93a4afcff7be859e30cad2a305731516057d6cf.tar.bz2 | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Conflicts:
arch/arm/Makefile
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index f34d462..7ac8386 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -310,10 +310,9 @@ config ARCH_MXC bool "Freescale MXC/iMX-based" select GENERIC_TIME select GENERIC_CLOCKEVENTS - select ARCH_MTD_XIP - select GENERIC_GPIO select ARCH_REQUIRE_GPIOLIB select HAVE_CLK + select COMMON_CLKDEV help Support for Freescale MXC/iMX-based family of processors |