diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 18:26:05 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 18:26:05 +0200 |
commit | 11f0d9311c6e9ed928dc98ce6e9d14c0ee274b05 (patch) | |
tree | 2bdb21608485c63d9a8de0e5445fa9bfc537b8d9 /arch/arm/Kconfig | |
parent | 1faca4ced8594d3586302e8d1788a60932f2bbca (diff) | |
parent | fbe92fcc7570eaba4bd5786cb1bbc5e693dba6bd (diff) | |
download | linux-11f0d9311c6e9ed928dc98ce6e9d14c0ee274b05.tar.gz linux-11f0d9311c6e9ed928dc98ce6e9d14c0ee274b05.tar.bz2 linux-11f0d9311c6e9ed928dc98ce6e9d14c0ee274b05.zip |
Merge branch 'samsung/devel' into next/devel2
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 bd220b85c550..012ff5fbb7e8 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -716,6 +716,7 @@ config ARCH_S3C64XX select CPU_V6 select ARM_VIC select HAVE_CLK + select HAVE_TCM select CLKDEV_LOOKUP select NO_IOPORT select ARCH_USES_GETTIMEOFFSET |