diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 12:26:05 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 12:26:05 -0400 |
| commit | 11f0d9311c6e9ed928dc98ce6e9d14c0ee274b05 (patch) | |
| tree | 2bdb21608485c63d9a8de0e5445fa9bfc537b8d9 /arch/arm/Kconfig | |
| parent | 1faca4ced8594d3586302e8d1788a60932f2bbca (diff) | |
| parent | fbe92fcc7570eaba4bd5786cb1bbc5e693dba6bd (diff) | |
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 | |||
| 716 | select CPU_V6 | 716 | select CPU_V6 |
| 717 | select ARM_VIC | 717 | select ARM_VIC |
| 718 | select HAVE_CLK | 718 | select HAVE_CLK |
| 719 | select HAVE_TCM | ||
| 719 | select CLKDEV_LOOKUP | 720 | select CLKDEV_LOOKUP |
| 720 | select NO_IOPORT | 721 | select NO_IOPORT |
| 721 | select ARCH_USES_GETTIMEOFFSET | 722 | select ARCH_USES_GETTIMEOFFSET |