From bb800d71d08971d5a02e572f74de0bc37643840a Mon Sep 17 00:00:00 2001
From: Christoph Egger <siccegge@cs.fau.de>
Date: Wed, 9 Jun 2010 13:21:30 +0200
Subject: [PATCH] --- yaml --- r: 204530 b: refs/heads/master c:
 3f441ee1cc150623aa64ddb1333d57eca78fdac2 h: refs/heads/master v: v3

---
 [refs]                                           | 2 +-
 trunk/arch/mips/include/asm/mach-pb1x00/pb1550.h | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index d7585d55c1bf..ec9c95072423 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 723b7f812fbcf76abad2c03674b3b3893ccd8516
+refs/heads/master: 3f441ee1cc150623aa64ddb1333d57eca78fdac2
diff --git a/trunk/arch/mips/include/asm/mach-pb1x00/pb1550.h b/trunk/arch/mips/include/asm/mach-pb1x00/pb1550.h
index 58796410bd6e..fc4d766641ce 100644
--- a/trunk/arch/mips/include/asm/mach-pb1x00/pb1550.h
+++ b/trunk/arch/mips/include/asm/mach-pb1x00/pb1550.h
@@ -40,14 +40,6 @@
 #define SMBUS_PSC_BASE		PSC2_BASE_ADDR
 #define I2S_PSC_BASE		PSC3_BASE_ADDR
 
-#if defined(CONFIG_MTD_PB1550_BOOT) && defined(CONFIG_MTD_PB1550_USER)
-#define PB1550_BOTH_BANKS
-#elif defined(CONFIG_MTD_PB1550_BOOT) && !defined(CONFIG_MTD_PB1550_USER)
-#define PB1550_BOOT_ONLY
-#elif !defined(CONFIG_MTD_PB1550_BOOT) && defined(CONFIG_MTD_PB1550_USER)
-#define PB1550_USER_ONLY
-#endif
-
 /*
  * Timing values as described in databook, * ns value stripped of
  * lower 2 bits.