diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-12-16 14:28:10 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-12-16 14:28:10 -0500 |
| commit | 2cb85a7bd2ca6db3ab3d632d0a1b6ca3770ddcf4 (patch) | |
| tree | 04857b183cef8996c7380ebc8a83b5110c71e15d /arch/arm/mach-omap2/Kconfig | |
| parent | d7dde8c191d136415819e4456e21f2b0cc00c326 (diff) | |
| parent | d9ba573718666df2e7e30d671f81bba39d07f91c (diff) | |
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 | |||
| 26 | 26 | ||
| 27 | config SOC_HAS_REALTIME_COUNTER | 27 | config SOC_HAS_REALTIME_COUNTER |
| 28 | bool "Real time free running counter" | 28 | bool "Real time free running counter" |
| 29 | depends on SOC_OMAP5 | ||
| 30 | default y | ||
| 29 | 31 | ||
| 30 | config ARCH_OMAP2 | 32 | config ARCH_OMAP2 |
| 31 | bool "TI OMAP2" | 33 | bool "TI OMAP2" |
| @@ -79,7 +81,6 @@ config SOC_OMAP5 | |||
| 79 | select ARM_GIC | 81 | select ARM_GIC |
| 80 | select CPU_V7 | 82 | select CPU_V7 |
| 81 | select HAVE_SMP | 83 | select HAVE_SMP |
| 82 | select SOC_HAS_REALTIME_COUNTER | ||
| 83 | select COMMON_CLK | 84 | select COMMON_CLK |
| 84 | 85 | ||
| 85 | comment "OMAP Core Type" | 86 | comment "OMAP Core Type" |