diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-01-18 12:42:23 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-01-19 10:38:43 -0800 |
| commit | 05b5ca9b100300c8b98429962071aa66c5d2460e (patch) | |
| tree | 643c3a38bd271997c61a58d59ccdbebc1f6beb28 /arch/arm/plat-omap/counter_32k.c | |
| parent | f376ea1780085196fcfff6bc27e8f6ddb324ae57 (diff) | |
omap1: Fix booting for 15xx and 730 with omap1_defconfig
For omap15xx and 730 we need to use the MPU timer
as the 32K timer is not available. For omap16xx
we want to use the 32K timer because of PM. Fix this
by allowing to build in both timers.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/plat-omap/counter_32k.c')
| -rw-r--r-- | arch/arm/plat-omap/counter_32k.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/plat-omap/counter_32k.c b/arch/arm/plat-omap/counter_32k.c index 0367998ff68..5d7b08b5a13 100644 --- a/arch/arm/plat-omap/counter_32k.c +++ b/arch/arm/plat-omap/counter_32k.c @@ -36,8 +36,6 @@ #define OMAP16XX_TIMER_32K_SYNCHRONIZED 0xfffbc410 -#if !(defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP15XX)) - #include <linux/clocksource.h> /* @@ -195,6 +193,3 @@ int __init omap_init_clocksource_32k(void) } return 0; } - -#endif /* !(defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP15XX)) */ - |