diff options
| author | Tony Lindgren <tony@atomide.com> | 2008-10-14 21:27:27 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-14 22:24:14 +0100 |
| commit | aa59e19d05114f9fb7718d6bc8398255476fb4f5 (patch) | |
| tree | 6396523489f83b0f9c5856904164c3c67aa17254 /arch/arm | |
| parent | a5a5b8c527b8d88056d4a63ccac66eb20af8228b (diff) | |
| download | linux-3.10-aa59e19d05114f9fb7718d6bc8398255476fb4f5.tar.gz linux-3.10-aa59e19d05114f9fb7718d6bc8398255476fb4f5.tar.bz2 linux-3.10-aa59e19d05114f9fb7718d6bc8398255476fb4f5.zip | |
[ARM] 5302/1: ARM: OMAP: Revert omap3 WDT changes to avoid merge conflict
With the upcoming WDT patches OMAP_WDT_BASE is no longer needed
in devices.c. Revert some earlier omap3 changes to avoid merge
conflicts with the WDT patches.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/plat-omap/devices.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c index a374b945ac1..6467f57a2ac 100644 --- a/arch/arm/plat-omap/devices.c +++ b/arch/arm/plat-omap/devices.c @@ -392,17 +392,8 @@ static inline void omap_init_uwire(void) {} #if defined(CONFIG_OMAP_WATCHDOG) || defined(CONFIG_OMAP_WATCHDOG_MODULE) -#if defined(CONFIG_ARCH_OMAP34XX) -#define OMAP_WDT_BASE 0x48314000 -#elif defined(CONFIG_ARCH_OMAP24XX) - -#ifdef CONFIG_ARCH_OMAP2430 -/* WDT2 */ -#define OMAP_WDT_BASE 0x49016000 -#else +#ifdef CONFIG_ARCH_OMAP24XX #define OMAP_WDT_BASE 0x48022000 -#endif - #else #define OMAP_WDT_BASE 0xfffeb000 #endif |