diff options
author | Tony Lindgren <tony@atomide.com> | 2008-10-14 16:27:27 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-14 17:24:14 -0400 |
commit | aa59e19d05114f9fb7718d6bc8398255476fb4f5 (patch) | |
tree | 6396523489f83b0f9c5856904164c3c67aa17254 /arch/arm/plat-omap | |
parent | a5a5b8c527b8d88056d4a63ccac66eb20af8228b (diff) |
[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/plat-omap')
-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 a374b945ac17..6467f57a2ac1 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) {} | |||
392 | 392 | ||
393 | #if defined(CONFIG_OMAP_WATCHDOG) || defined(CONFIG_OMAP_WATCHDOG_MODULE) | 393 | #if defined(CONFIG_OMAP_WATCHDOG) || defined(CONFIG_OMAP_WATCHDOG_MODULE) |
394 | 394 | ||
395 | #if defined(CONFIG_ARCH_OMAP34XX) | 395 | #ifdef CONFIG_ARCH_OMAP24XX |
396 | #define OMAP_WDT_BASE 0x48314000 | ||
397 | #elif defined(CONFIG_ARCH_OMAP24XX) | ||
398 | |||
399 | #ifdef CONFIG_ARCH_OMAP2430 | ||
400 | /* WDT2 */ | ||
401 | #define OMAP_WDT_BASE 0x49016000 | ||
402 | #else | ||
403 | #define OMAP_WDT_BASE 0x48022000 | 396 | #define OMAP_WDT_BASE 0x48022000 |
404 | #endif | ||
405 | |||
406 | #else | 397 | #else |
407 | #define OMAP_WDT_BASE 0xfffeb000 | 398 | #define OMAP_WDT_BASE 0xfffeb000 |
408 | #endif | 399 | #endif |