diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-12-16 20:28:10 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-12-16 20:28:10 +0100 |
| commit | 2cb85a7bd2ca6db3ab3d632d0a1b6ca3770ddcf4 (patch) | |
| tree | 04857b183cef8996c7380ebc8a83b5110c71e15d /arch/arm/mach-omap2/Kconfig | |
| parent | ARM: OMAP2+: common: remove use of vram (diff) | |
| parent | ARM: OMAP: Move plat/omap-serial.h to include/linux/platform_data/serial-omap.h (diff) | |
| download | linux-2cb85a7bd2ca6db3ab3d632d0a1b6ca3770ddcf4.tar.xz linux-2cb85a7bd2ca6db3ab3d632d0a1b6ca3770ddcf4.zip | |
Merge branch 'omap-for-v3.8/fixes-for-merge-window' into omap-for-v3.8/fixes-for-merge-window-v2
Diffstat (limited to 'arch/arm/mach-omap2/Kconfig')
| -rw-r--r-- | arch/arm/mach-omap2/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index be0f62bf9037..41b581fd0213 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -26,6 +26,8 @@ config SOC_HAS_OMAP2_SDRC config SOC_HAS_REALTIME_COUNTER bool "Real time free running counter" + depends on SOC_OMAP5 + default y config ARCH_OMAP2 bool "TI OMAP2" @@ -79,7 +81,6 @@ config SOC_OMAP5 select ARM_GIC select CPU_V7 select HAVE_SMP - select SOC_HAS_REALTIME_COUNTER select COMMON_CLK comment "OMAP Core Type" |