7 files changed, 15 insertions, 90 deletions

diff --git a/drivers/char/hvc_console.c b/drivers/char/hvc_console.c
index 35cca4c7fb18..fa27d1676ee5 100644
--- a/drivers/char/hvc_console.c
+++ b/drivers/char/hvc_console.c
@@ -194,7 +194,7 @@ static int __init hvc_console_setup(struct console *co, char *options)
         return 0;
 }
 
-static struct console hvc_con_driver = {
+static struct console hvc_console = {
         .name           = "hvc",
         .write          = hvc_console_print,
         .device         = hvc_console_device,
@@ -220,7 +220,7 @@ static struct console hvc_con_driver = {
  */
 static int __init hvc_console_init(void)
 {
-        register_console(&hvc_con_driver);
+        register_console(&hvc_console);
         return 0;
 }
 console_initcall(hvc_console_init);
@@ -276,8 +276,8 @@ int hvc_instantiate(uint32_t vtermno, int index, const struct hv_ops *ops)
          * now (setup won't fail at this point).  It's ok to just
          * call register again if previously .setup failed.
          */
-        if (index == hvc_con_driver.index)
-                register_console(&hvc_con_driver);
+        if (index == hvc_console.index)
+                register_console(&hvc_console);
 
         return 0;
 }
@@ -641,7 +641,7 @@ int hvc_poll(struct hvc_struct *hp)
                 }
                 for (i = 0; i < n; ++i) {
 #ifdef CONFIG_MAGIC_SYSRQ
-                        if (hp->index == hvc_con_driver.index) {
+                        if (hp->index == hvc_console.index) {
                                 /* Handle the SysRq Hack */
                                 /* XXX should support a sequence */
                                 if (buf[i] == '\x0f') { /* ^O */
@@ -909,7 +909,7 @@ static void __exit hvc_exit(void)
                 tty_unregister_driver(hvc_driver);
                 /* return tty_struct instances allocated in hvc_init(). */
                 put_tty_driver(hvc_driver);
-                unregister_console(&hvc_con_driver);
+                unregister_console(&hvc_console);
         }
 }
 module_exit(hvc_exit);
diff --git a/drivers/char/hvsi.c b/drivers/char/hvsi.c
index d4b14ff1c4c1..1f4b6de65a2d 100644
--- a/drivers/char/hvsi.c
+++ b/drivers/char/hvsi.c
@@ -1255,7 +1255,7 @@ static int __init hvsi_console_setup(struct console *console, char *options)
         return 0;
 }
 
-static struct console hvsi_con_driver = {
+static struct console hvsi_console = {
         .name           = "hvsi",
         .write          = hvsi_console_print,
         .device         = hvsi_console_device,
@@ -1308,7 +1308,7 @@ static int __init hvsi_console_init(void)
         }
 
         if (hvsi_count)
-                register_console(&hvsi_con_driver);
+                register_console(&hvsi_console);
         return 0;
 }
 console_initcall(hvsi_console_init);
diff --git a/drivers/input/serio/i8042-io.h b/drivers/input/serio/i8042-io.h
index 847f4aad7ed5..5d48bb66aa73 100644
--- a/drivers/input/serio/i8042-io.h
+++ b/drivers/input/serio/i8042-io.h
@@ -27,6 +27,11 @@
 #include <asm/irq.h>
 #elif defined(CONFIG_SH_CAYMAN)
 #include <asm/irq.h>
+#elif defined(CONFIG_PPC)
+extern int of_i8042_kbd_irq;
+extern int of_i8042_aux_irq;
+# define I8042_KBD_IRQ  of_i8042_kbd_irq
+# define I8042_AUX_IRQ  of_i8042_aux_irq
 #else
 # define I8042_KBD_IRQ  1
 # define I8042_AUX_IRQ  12
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index f22bc9f05ddb..6629d09f3b38 100644
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -321,7 +321,7 @@ config MTD_CFI_FLAGADM
 
 config MTD_REDWOOD
         tristate "CFI Flash devices mapped on IBM Redwood"
-        depends on MTD_CFI && ( REDWOOD_4 || REDWOOD_5 || REDWOOD_6 )
+        depends on MTD_CFI
         help
           This enables access routines for the flash chips on the IBM
           Redwood board. If you have one of these boards and would like to
diff --git a/drivers/mtd/maps/redwood.c b/drivers/mtd/maps/redwood.c
index 933c0b63b016..d2c9db00db0c 100644
--- a/drivers/mtd/maps/redwood.c
+++ b/drivers/mtd/maps/redwood.c
@@ -22,8 +22,6 @@
 
 #include <asm/io.h>
 
-#if !defined (CONFIG_REDWOOD_6)
-
 #define WINDOW_ADDR 0xffc00000
 #define WINDOW_SIZE 0x00400000
 
@@ -69,47 +67,6 @@ static struct mtd_partition redwood_flash_partitions[] = {
         }
 };
 
-#else /* CONFIG_REDWOOD_6 */
-/* FIXME: the window is bigger - armin */
-#define WINDOW_ADDR 0xff800000
-#define WINDOW_SIZE 0x00800000
-
-#define RW_PART0_OF     0
-#define RW_PART0_SZ     0x400000        /* 4 MiB data */
-#define RW_PART1_OF     RW_PART0_OF + RW_PART0_SZ
-#define RW_PART1_SZ     0x10000         /* 64K VPD */
-#define RW_PART2_OF     RW_PART1_OF + RW_PART1_SZ
-#define RW_PART2_SZ     0x400000 - (0x10000 + 0x20000)
-#define RW_PART3_OF     RW_PART2_OF + RW_PART2_SZ
-#define RW_PART3_SZ     0x20000
-
-static struct mtd_partition redwood_flash_partitions[] = {
-        {
-                .name = "Redwood filesystem",
-                .offset = RW_PART0_OF,
-                .size = RW_PART0_SZ
-        },
-        {
-                .name = "Redwood OpenBIOS Vital Product Data",
-                .offset = RW_PART1_OF,
-                .size = RW_PART1_SZ,
-                .mask_flags = MTD_WRITEABLE     /* force read-only */
-        },
-        {
-                .name = "Redwood kernel",
-                .offset = RW_PART2_OF,
-                .size = RW_PART2_SZ
-        },
-        {
-                .name = "Redwood OpenBIOS",
-                .offset = RW_PART3_OF,
-                .size = RW_PART3_SZ,
-                .mask_flags = MTD_WRITEABLE     /* force read-only */
-        }
-};
-
-#endif /* CONFIG_REDWOOD_6 */
-
 struct map_info redwood_flash_map = {
         .name = "IBM Redwood",
         .size = WINDOW_SIZE,
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index ce2fcdd4ab90..313d3060fc1d 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -913,7 +913,7 @@ config SMC91X
         tristate "SMC 91C9x/91C1xxx support"
         select CRC32
         select MII
-        depends on ARM || REDWOOD_5 || REDWOOD_6 || M32R || SUPERH || \
+        depends on ARM || M32R || SUPERH || \
                 MIPS || BLACKFIN || MN10300 || COLDFIRE
         help
           This is a driver for SMC's 91x series of Ethernet chipsets,
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h
index 8d2772cc42f2..ee747919a766 100644
--- a/drivers/net/smc91x.h
+++ b/drivers/net/smc91x.h
@@ -83,43 +83,6 @@ static inline void SMC_outw(u16 val, void __iomem *ioaddr, int reg)
         }
 }
 
-#elif defined(CONFIG_REDWOOD_5) || defined(CONFIG_REDWOOD_6)
-
-/* We can only do 16-bit reads and writes in the static memory space. */
-#define SMC_CAN_USE_8BIT        0
-#define SMC_CAN_USE_16BIT       1
-#define SMC_CAN_USE_32BIT       0
-#define SMC_NOWAIT              1
-
-#define SMC_IO_SHIFT            0
-
-#define SMC_inw(a, r)           in_be16((volatile u16 *)((a) + (r)))
-#define SMC_outw(v, a, r)       out_be16((volatile u16 *)((a) + (r)), v)
-#define SMC_insw(a, r, p, l)                                            \
-        do {                                                            \
-                unsigned long __port = (a) + (r);                       \
-                u16 *__p = (u16 *)(p);                                  \
-                int __l = (l);                                          \
-                insw(__port, __p, __l);                                 \
-                while (__l > 0) {                                       \
-                        *__p = swab16(*__p);                            \
-                        __p++;                                          \
-                        __l--;                                          \
-                }                                                       \
-        } while (0)
-#define SMC_outsw(a, r, p, l)                                           \
-        do {                                                            \
-                unsigned long __port = (a) + (r);                       \
-                u16 *__p = (u16 *)(p);                                  \
-                int __l = (l);                                          \
-                while (__l > 0) {                                       \
-                        /* Believe it or not, the swab isn't needed. */ \
-                        outw( /* swab16 */ (*__p++), __port);           \
-                        __l--;                                          \
-                }                                                       \
-        } while (0)
-#define SMC_IRQ_FLAGS           (0)
-
 #elif defined(CONFIG_SA1100_PLEB)
 /* We can only do 16-bit reads and writes in the static memory space. */
 #define SMC_CAN_USE_8BIT        1