diff options
| author | Olof Johansson <olof@lixom.net> | 2012-06-17 01:40:37 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-06-17 01:40:37 -0400 |
| commit | 51a1ec0164e2030e0492bdede4e68090a3394c52 (patch) | |
| tree | bbd4fb29ca65609b66b4c23e2426c0458b37ddf4 /arch/arm/Kconfig | |
| parent | 485802a6c524e62b5924849dd727ddbb1497cc71 (diff) | |
| parent | a15687c487662c1cdcaf9d6f89270b616ccbad02 (diff) | |
Merge branch 'nomadik-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into next/soc
* 'nomadik-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
ARM: nomadik: bump all IRQ numbers by one
ARM: nomadik: register the MMC/SD device
ARM: nomadik: register the I2C devices
ARM: nomadik: register all three I2C busses
ARM: nomadik: convert to generic clock
ARM: nomadik: register PL031 RTC
ARM: nomadik: register AMBA devices dynamically
ARM: nomadik: register GPIOs dynamically
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 84449dd8f03..3b9c64817d2 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -911,7 +911,7 @@ config ARCH_NOMADIK | |||
| 911 | select ARM_AMBA | 911 | select ARM_AMBA |
| 912 | select ARM_VIC | 912 | select ARM_VIC |
| 913 | select CPU_ARM926T | 913 | select CPU_ARM926T |
| 914 | select CLKDEV_LOOKUP | 914 | select COMMON_CLK |
| 915 | select GENERIC_CLOCKEVENTS | 915 | select GENERIC_CLOCKEVENTS |
| 916 | select PINCTRL | 916 | select PINCTRL |
| 917 | select MIGHT_HAVE_CACHE_L2X0 | 917 | select MIGHT_HAVE_CACHE_L2X0 |