[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>

diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c
index a374b945ac176e9766112b7fdd3b850521b4d857..6467f57a2ac1404ed96845bbe99e9ebf099f7ce5 100644 (file)
--- 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