diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-21 07:21:32 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-21 07:21:32 +0100 |
| commit | a93d620159524088d9633f60a8f746e3dd2e791e (patch) | |
| tree | 09da5c10d18adc2b27ee88dcf5673e92d49b4043 /arch/arm/Kconfig | |
| parent | GPIO: clps711x: use platform_device_unregister in gpio_clps711x_init() (diff) | |
| parent | ARM: clps711x: merge files related to EDB7211-board into one (diff) | |
| download | linux-a93d620159524088d9633f60a8f746e3dd2e791e.tar.xz linux-a93d620159524088d9633f60a8f746e3dd2e791e.zip | |
Merge branch 'clps711x/soc' into clps711x/soc2
Conflicts:
arch/arm/Kconfig
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index f456cf4ae3ca..e63e3eee13ce 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -369,6 +369,7 @@ config ARCH_CLPS711X select CLKDEV_LOOKUP select COMMON_CLK select CPU_ARM720T + select GENERIC_CLOCKEVENTS select NEED_MACH_MEMORY_H help Support for Cirrus Logic 711x/721x/731x based boards. |