projects / openwrt / staging / mkresin.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Upgrade to Linux 2.6.19
[openwrt/staging/mkresin.git] / target / linux / rb532-2.6 / patches / 100-rb5xx_support.patch
diff --git a/target/linux/rb532-2.6/patches/100-rb5xx_support.patch b/target/linux/rb532-2.6/patches/100-rb5xx_support.patch
index 9a8f21d2076f056972697be3552736460d52c54b..0dda2407be34105aea1b7b91701309f1bda86253 100644 (file)
--- a/target/linux/rb532-2.6/patches/100-rb5xx_support.patch
+++ b/target/linux/rb532-2.6/patches/100-rb5xx_support.patch
@@ -1,7 +1,7 @@
 diff -urN linux.old/arch/mips/Kconfig linux.dev/arch/mips/Kconfig
---- linux.old/arch/mips/Kconfig        2006-06-18 03:49:35.000000000 +0200
-+++ linux.dev/arch/mips/Kconfig        2006-10-11 21:56:38.000000000 +0200
-@@ -742,6 +742,19 @@
+--- linux.old/arch/mips/Kconfig        2006-11-29 22:57:37.000000000 +0100
++++ linux.dev/arch/mips/Kconfig        2006-12-14 04:09:50.000000000 +0100
+@@ -728,6 +728,19 @@
        select SYS_SUPPORTS_BIG_ENDIAN
        select TOSHIBA_BOARDS
  
@@ -21,7 +21,7 @@ diff -urN linux.old/arch/mips/Kconfig linux.dev/arch/mips/Kconfig
  config TOSHIBA_RBTX4927
        bool "Toshiba TBTX49[23]7 board"
        select DMA_NONCOHERENT
-@@ -1028,7 +1041,7 @@
+@@ -1015,7 +1028,7 @@
  
  config MIPS_L1_CACHE_SHIFT
        int
@@ -31,9 +31,9 @@ diff -urN linux.old/arch/mips/Kconfig linux.dev/arch/mips/Kconfig
        default "5"
  
 diff -urN linux.old/arch/mips/Makefile linux.dev/arch/mips/Makefile
---- linux.old/arch/mips/Makefile       2006-10-11 21:55:59.000000000 +0200
-+++ linux.dev/arch/mips/Makefile       2006-10-11 21:56:38.000000000 +0200
-@@ -580,6 +580,13 @@
+--- linux.old/arch/mips/Makefile       2006-12-14 03:13:55.000000000 +0100
++++ linux.dev/arch/mips/Makefile       2006-12-14 04:09:50.000000000 +0100
+@@ -586,6 +586,13 @@
  load-$(CONFIG_TOSHIBA_JMR3927)        += 0xffffffff80050000
  
  #
@@ -48,9 +48,9 @@ diff -urN linux.old/arch/mips/Makefile linux.dev/arch/mips/Makefile
  # Toshiba RBTX4937 board
  #
 diff -urN linux.old/arch/mips/mm/tlbex.c linux.dev/arch/mips/mm/tlbex.c
---- linux.old/arch/mips/mm/tlbex.c     2006-06-18 03:49:35.000000000 +0200
-+++ linux.dev/arch/mips/mm/tlbex.c     2006-10-11 21:56:38.000000000 +0200
-@@ -876,7 +876,6 @@
+--- linux.old/arch/mips/mm/tlbex.c     2006-11-29 22:57:37.000000000 +0100
++++ linux.dev/arch/mips/mm/tlbex.c     2006-12-14 04:09:50.000000000 +0100
+@@ -874,7 +874,6 @@
        case CPU_R10000:
        case CPU_R12000:
        case CPU_R14000:
@@ -58,7 +58,7 @@ diff -urN linux.old/arch/mips/mm/tlbex.c linux.dev/arch/mips/mm/tlbex.c
        case CPU_SB1:
        case CPU_SB1A:
        case CPU_4KSC:
-@@ -904,6 +903,7 @@
+@@ -902,6 +901,7 @@
                tlbw(p);
                break;
  
@@ -68,7 +68,7 @@ diff -urN linux.old/arch/mips/mm/tlbex.c linux.dev/arch/mips/mm/tlbex.c
        case CPU_34K:
 diff -urN linux.old/arch/mips/pci/fixup-rb500.c linux.dev/arch/mips/pci/fixup-rb500.c
 --- linux.old/arch/mips/pci/fixup-rb500.c      1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/pci/fixup-rb500.c      2006-10-11 21:56:38.000000000 +0200
++++ linux.dev/arch/mips/pci/fixup-rb500.c      2006-12-14 04:09:50.000000000 +0100
 @@ -0,0 +1,49 @@
 +/*
 + * Copyright 2001 MontaVista Software Inc.
@@ -96,7 +96,7 @@ diff -urN linux.old/arch/mips/pci/fixup-rb500.c linux.dev/arch/mips/pci/fixup-rb
 + *  675 Mass Ave, Cambridge, MA 02139, USA.
 + */
 +
-+#include <linux/config.h>
++#include <linux/autoconf.h>
 +#include <linux/types.h>
 +#include <linux/pci.h>
 +#include <linux/kernel.h>
@@ -120,16 +120,16 @@ diff -urN linux.old/arch/mips/pci/fixup-rb500.c linux.dev/arch/mips/pci/fixup-rb
 +}
 +
 diff -urN linux.old/arch/mips/pci/Makefile linux.dev/arch/mips/pci/Makefile
---- linux.old/arch/mips/pci/Makefile   2006-06-18 03:49:35.000000000 +0200
-+++ linux.dev/arch/mips/pci/Makefile   2006-10-11 21:56:38.000000000 +0200
-@@ -57,3 +57,4 @@
- obj-$(CONFIG_TOSHIBA_RBTX4938)        += fixup-tx4938.o ops-tx4938.o
+--- linux.old/arch/mips/pci/Makefile   2006-11-29 22:57:37.000000000 +0100
++++ linux.dev/arch/mips/pci/Makefile   2006-12-14 04:09:50.000000000 +0100
+@@ -53,3 +53,4 @@
  obj-$(CONFIG_VICTOR_MPC30X)   += fixup-mpc30x.o
  obj-$(CONFIG_ZAO_CAPCELLA)    += fixup-capcella.o
+ obj-$(CONFIG_WR_PPMC)         += fixup-wrppmc.o
 +obj-$(CONFIG_MIKROTIK_RB500)  += pci-rc32434.o ops-rc32434.o fixup-rb500.o
 diff -urN linux.old/arch/mips/pci/ops-rc32434.c linux.dev/arch/mips/pci/ops-rc32434.c
 --- linux.old/arch/mips/pci/ops-rc32434.c      1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/pci/ops-rc32434.c      2006-10-11 21:56:38.000000000 +0200
++++ linux.dev/arch/mips/pci/ops-rc32434.c      2006-12-14 04:09:50.000000000 +0100
 @@ -0,0 +1,195 @@
 +/**************************************************************************
 + *
@@ -169,7 +169,7 @@ diff -urN linux.old/arch/mips/pci/ops-rc32434.c linux.dev/arch/mips/pci/ops-rc32
 + **************************************************************************
 + */
 +
-+#include <linux/config.h>
++#include <linux/autoconf.h>
 +#include <linux/init.h>
 +#include <linux/pci.h>
 +#include <linux/types.h>
@@ -328,7 +328,7 @@ diff -urN linux.old/arch/mips/pci/ops-rc32434.c linux.dev/arch/mips/pci/ops-rc32
 +};
 diff -urN linux.old/arch/mips/pci/pci-rc32434.c linux.dev/arch/mips/pci/pci-rc32434.c
 --- linux.old/arch/mips/pci/pci-rc32434.c      1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/pci/pci-rc32434.c      2006-10-11 21:56:38.000000000 +0200
++++ linux.dev/arch/mips/pci/pci-rc32434.c      2006-12-14 04:09:50.000000000 +0100
 @@ -0,0 +1,234 @@
 +/**************************************************************************
 + *
@@ -368,7 +368,7 @@ diff -urN linux.old/arch/mips/pci/pci-rc32434.c linux.dev/arch/mips/pci/pci-rc32
 + **************************************************************************
 + */
 +
-+#include <linux/config.h>
++#include <linux/autoconf.h>
 +#include <linux/types.h>
 +#include <linux/pci.h>
 +#include <linux/kernel.h>
@@ -566,8 +566,24 @@ diff -urN linux.old/arch/mips/pci/pci-rc32434.c linux.dev/arch/mips/pci/pci-rc32
 +
 diff -urN linux.old/arch/mips/rb500/devices.c linux.dev/arch/mips/rb500/devices.c
 --- linux.old/arch/mips/rb500/devices.c        1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/rb500/devices.c        2006-10-11 21:56:38.000000000 +0200
-@@ -0,0 +1,198 @@
++++ linux.dev/arch/mips/rb500/devices.c        2006-12-14 04:09:50.000000000 +0100
+@@ -0,0 +1,214 @@
++/*
++ *  RouterBoard 500 Platform devices
++ *  Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
++ *
++ *  This program is free software; you can redistribute it and/or modify
++ *  it under the terms of the GNU General Public License as published by
++ *  the Free Software Foundation; either version 2 of the License, or
++ *  (at your option) any later version.
++ *
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ *  GNU General Public License for more details.
++ *
++ *  $Id$
++ */
 +#include <linux/kernel.h>
 +#include <linux/init.h>
 +#include <linux/module.h>
@@ -768,7 +784,7 @@ diff -urN linux.old/arch/mips/rb500/devices.c linux.dev/arch/mips/rb500/devices.
 +#endif
 diff -urN linux.old/arch/mips/rb500/early_serial.c linux.dev/arch/mips/rb500/early_serial.c
 --- linux.old/arch/mips/rb500/early_serial.c   1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/rb500/early_serial.c   2006-10-11 21:56:38.000000000 +0200
++++ linux.dev/arch/mips/rb500/early_serial.c   2006-12-14 04:09:50.000000000 +0100
 @@ -0,0 +1,199 @@
 +/**************************************************************************
 + *
@@ -971,7 +987,7 @@ diff -urN linux.old/arch/mips/rb500/early_serial.c linux.dev/arch/mips/rb500/ear
 +}
 diff -urN linux.old/arch/mips/rb500/irq.c linux.dev/arch/mips/rb500/irq.c
 --- linux.old/arch/mips/rb500/irq.c    1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/rb500/irq.c    2006-10-11 21:56:38.000000000 +0200
++++ linux.dev/arch/mips/rb500/irq.c    2006-12-14 04:14:16.000000000 +0100
 @@ -0,0 +1,264 @@
 +/*
 + * BRIEF MODULE DESCRIPTION
@@ -1212,7 +1228,7 @@ diff -urN linux.old/arch/mips/rb500/irq.c linux.dev/arch/mips/rb500/irq.c
 +              irq_desc[i].status = IRQ_DISABLED;
 +              irq_desc[i].action = NULL;
 +              irq_desc[i].depth = 1;
-+              irq_desc[i].handler = &rc32434_irq_type;
++              irq_desc[i].chip = &rc32434_irq_type;
 +              spin_lock_init(&irq_desc[i].lock);
 +      }
 +}
@@ -1225,7 +1241,7 @@ diff -urN linux.old/arch/mips/rb500/irq.c linux.dev/arch/mips/rb500/irq.c
 +      unsigned int cp0_cause = read_c0_cause() & read_c0_status();
 +
 +      if (cp0_cause & CAUSEF_IP7) {
-+              ll_timer_interrupt(7, regs);
++              ll_timer_interrupt(7);
 +      } else if ((ip = (cp0_cause & 0x7c00))) {
 +              group = 21 - rc32434_clz(ip);
 +
@@ -1234,12 +1250,12 @@ diff -urN linux.old/arch/mips/rb500/irq.c linux.dev/arch/mips/rb500/irq.c
 +              pend = READ_PEND(addr);
 +              pend &= ~READ_MASK(addr); // only unmasked interrupts
 +              pend = 39 - rc32434_clz(pend);
-+              do_IRQ((group << 5) + pend, regs);
++              do_IRQ((group << 5) + pend);
 +      }
 +}
 diff -urN linux.old/arch/mips/rb500/Makefile linux.dev/arch/mips/rb500/Makefile
 --- linux.old/arch/mips/rb500/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/rb500/Makefile 2006-10-11 21:56:38.000000000 +0200
++++ linux.dev/arch/mips/rb500/Makefile 2006-12-14 04:09:50.000000000 +0100
 @@ -0,0 +1,5 @@
 +#
 +# Makefile for the RB500 board specific parts of the kernel
@@ -1248,7 +1264,7 @@ diff -urN linux.old/arch/mips/rb500/Makefile linux.dev/arch/mips/rb500/Makefile
 +obj-y  += irq.o time.o setup.o serial.o early_serial.o prom.o misc.o devices.o
 diff -urN linux.old/arch/mips/rb500/misc.c linux.dev/arch/mips/rb500/misc.c
 --- linux.old/arch/mips/rb500/misc.c   1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/rb500/misc.c   2006-10-11 21:56:38.000000000 +0200
++++ linux.dev/arch/mips/rb500/misc.c   2006-12-14 04:09:50.000000000 +0100
 @@ -0,0 +1,56 @@
 +#include <linux/module.h>
 +#include <linux/kernel.h>   /* printk() */
@@ -1308,7 +1324,7 @@ diff -urN linux.old/arch/mips/rb500/misc.c linux.dev/arch/mips/rb500/misc.c
 +EXPORT_SYMBOL(changeLatchU5);
 diff -urN linux.old/arch/mips/rb500/prom.c linux.dev/arch/mips/rb500/prom.c
 --- linux.old/arch/mips/rb500/prom.c   1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/rb500/prom.c   2006-10-11 21:56:38.000000000 +0200
++++ linux.dev/arch/mips/rb500/prom.c   2006-12-14 05:15:05.000000000 +0100
 @@ -0,0 +1,181 @@
 +/*
 +* prom.c 
@@ -1337,7 +1353,7 @@ diff -urN linux.old/arch/mips/rb500/prom.c linux.dev/arch/mips/rb500/prom.c
 +
 +*/
 +
-+#include <linux/config.h>
++#include <linux/autoconf.h>
 +#include <linux/init.h>
 +#include <linux/mm.h>
 +#include <linux/module.h>
@@ -1493,7 +1509,7 @@ diff -urN linux.old/arch/mips/rb500/prom.c linux.dev/arch/mips/rb500/prom.c
 +
 diff -urN linux.old/arch/mips/rb500/serial.c linux.dev/arch/mips/rb500/serial.c
 --- linux.old/arch/mips/rb500/serial.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/rb500/serial.c 2006-10-11 21:56:38.000000000 +0200
++++ linux.dev/arch/mips/rb500/serial.c 2006-12-14 04:09:50.000000000 +0100
 @@ -0,0 +1,79 @@
 +/**************************************************************************
 + *
@@ -1534,7 +1550,7 @@ diff -urN linux.old/arch/mips/rb500/serial.c linux.dev/arch/mips/rb500/serial.c
 + */
 +
 +
-+#include <linux/config.h>
++#include <linux/autoconf.h>
 +#include <linux/init.h>
 +#include <linux/sched.h>
 +#include <linux/pci.h>
@@ -1576,8 +1592,8 @@ diff -urN linux.old/arch/mips/rb500/serial.c linux.dev/arch/mips/rb500/serial.c
 +}
 diff -urN linux.old/arch/mips/rb500/setup.c linux.dev/arch/mips/rb500/setup.c
 --- linux.old/arch/mips/rb500/setup.c  1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/rb500/setup.c  2006-10-11 21:56:38.000000000 +0200
-@@ -0,0 +1,84 @@
++++ linux.dev/arch/mips/rb500/setup.c  2006-12-14 04:51:12.000000000 +0100
+@@ -0,0 +1,81 @@
 +/*
 + * setup.c - boot time setup code
 + */
@@ -1586,22 +1602,20 @@ diff -urN linux.old/arch/mips/rb500/setup.c linux.dev/arch/mips/rb500/setup.c
 +#include <linux/mm.h>
 +#include <linux/sched.h>
 +#include <linux/irq.h>
-+#include <asm/bootinfo.h>
-+#include <asm/io.h>
 +#include <linux/ioport.h>
++#include <linux/pm.h>
++#include <asm/bootinfo.h>
 +#include <asm/mipsregs.h>
 +#include <asm/pgtable.h>
 +#include <asm/reboot.h>
 +#include <asm/addrspace.h>     /* for KSEG1ADDR() */
++#include <asm/time.h>
++#include <asm/io.h>
 +#include <asm/rc32434/rc32434.h>
-+#include <linux/pm.h>
 +#include <asm/rc32434/pci.h>
 +
-+extern void (*board_time_init)(void);
-+extern void (*board_timer_setup)(struct irqaction *irq);
-+extern void rc32434_time_init(void);
-+extern void rc32434_timer_setup(struct irqaction *irq);
 +#ifdef CONFIG_PCI
++extern void *rc32434_time_init(void);
 +extern int __init rc32434_pcibridge_init(void);
 +#endif
 +
@@ -1629,12 +1643,11 @@ diff -urN linux.old/arch/mips/rb500/setup.c linux.dev/arch/mips/rb500/setup.c
 +}
 +#endif
 +
-+void __init plat_setup(void)
++void __init plat_mem_setup(void)
 +{
 +      unsigned int pciCntlVal;
 +
 +      board_time_init = rc32434_time_init;
-+      board_timer_setup = rc32434_timer_setup;
 +
 +#ifdef CONFIG_CPU_HAS_WB
 +      __wbflush = rb_write_buffer_flush;
@@ -1664,8 +1677,8 @@ diff -urN linux.old/arch/mips/rb500/setup.c linux.dev/arch/mips/rb500/setup.c
 +}
 diff -urN linux.old/arch/mips/rb500/time.c linux.dev/arch/mips/rb500/time.c
 --- linux.old/arch/mips/rb500/time.c   1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/rb500/time.c   2006-10-11 21:56:38.000000000 +0200
-@@ -0,0 +1,94 @@
++++ linux.dev/arch/mips/rb500/time.c   2006-12-14 04:48:33.000000000 +0100
+@@ -0,0 +1,93 @@
 +/*
 +****************************************************************************
 +* Carsten Langgaard, carstenl@mips.com
@@ -1699,7 +1712,7 @@ diff -urN linux.old/arch/mips/rb500/time.c linux.dev/arch/mips/rb500/time.c
 +****************************************************************************
 +*/
 +
-+#include <linux/config.h>
++#include <linux/autoconf.h>
 +#include <linux/init.h>
 +#include <linux/kernel_stat.h>
 +#include <linux/sched.h>
@@ -1715,7 +1728,6 @@ diff -urN linux.old/arch/mips/rb500/time.c linux.dev/arch/mips/rb500/time.c
 +
 +static unsigned long r4k_offset; /* Amount to incr compare reg each time */
 +static unsigned long r4k_cur;    /* What counter should be at next timer irq */
-+extern void ll_timer_interrupt(int irq, struct pt_regs *regs);
 +extern unsigned int mips_hpt_frequency;
 +extern unsigned int idt_cpu_freq;
 +
@@ -1750,7 +1762,7 @@ diff -urN linux.old/arch/mips/rb500/time.c linux.dev/arch/mips/rb500/time.c
 +      local_irq_restore(flags);
 +}
 +
-+void __init rc32434_timer_setup(struct irqaction *irq)
++void __init plat_timer_setup(struct irqaction *irq)
 +{
 +      /* we are using the cpu counter for timer interrupts */
 +      setup_irq(MIPS_CPU_TIMER_IRQ, irq);
@@ -1761,8 +1773,8 @@ diff -urN linux.old/arch/mips/rb500/time.c linux.dev/arch/mips/rb500/time.c
 +}
 +
 diff -urN linux.old/drivers/mtd/devices/block2mtd.c linux.dev/drivers/mtd/devices/block2mtd.c
---- linux.old/drivers/mtd/devices/block2mtd.c  2006-10-11 21:55:59.000000000 +0200
-+++ linux.dev/drivers/mtd/devices/block2mtd.c  2006-10-11 22:24:51.000000000 +0200
+--- linux.old/drivers/mtd/devices/block2mtd.c  2006-11-29 22:57:37.000000000 +0100
++++ linux.dev/drivers/mtd/devices/block2mtd.c  2006-12-14 04:09:50.000000000 +0100
 @@ -26,7 +26,6 @@
  #define ERROR(fmt, args...) printk(KERN_ERR "block2mtd: " fmt "\n" , ## args)
  #define INFO(fmt, args...) printk(KERN_INFO "block2mtd: " fmt "\n" , ## args)
@@ -1771,7 +1783,7 @@ diff -urN linux.old/drivers/mtd/devices/block2mtd.c linux.dev/drivers/mtd/device
  /* Info for the block device */
  struct block2mtd_dev {
        struct list_head list;
-@@ -104,7 +103,7 @@
+@@ -106,7 +105,7 @@
  
        while (pages) {
                page = page_readahead(mapping, index);
@@ -1780,7 +1792,7 @@ diff -urN linux.old/drivers/mtd/devices/block2mtd.c linux.dev/drivers/mtd/device
                        return -ENOMEM;
                if (IS_ERR(page))
                        return PTR_ERR(page);
-@@ -285,7 +284,7 @@
+@@ -287,7 +286,7 @@
  
  
  /* FIXME: ensure that mtd->size % erase_size == 0 */
@@ -1789,7 +1801,7 @@ diff -urN linux.old/drivers/mtd/devices/block2mtd.c linux.dev/drivers/mtd/device
  {
        struct block_device *bdev;
        struct block2mtd_dev *dev;
-@@ -328,14 +327,15 @@
+@@ -330,14 +329,15 @@
  
        /* Setup the MTD structure */
        /* make the name contain the block device in */
@@ -1805,9 +1817,9 @@ diff -urN linux.old/drivers/mtd/devices/block2mtd.c linux.dev/drivers/mtd/device
        dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK;
 +      dev->mtd.size -= dev->mtd.size % erase_size;
        dev->mtd.erasesize = erase_size;
+       dev->mtd.writesize = 1;
        dev->mtd.type = MTD_RAM;
-       dev->mtd.flags = MTD_CAP_RAM;
-@@ -353,7 +353,7 @@
+@@ -356,7 +356,7 @@
        }
        list_add(&dev->list, &blkmtd_device_list);
        INFO("mtd%d: [%s] erase_size = %dKiB [%d]", dev->mtd.index,
@@ -1816,7 +1828,7 @@ diff -urN linux.old/drivers/mtd/devices/block2mtd.c linux.dev/drivers/mtd/device
                        dev->mtd.erasesize >> 10, dev->mtd.erasesize);
        return dev;
  
-@@ -429,7 +429,7 @@
+@@ -432,7 +432,7 @@
  {
        char buf[80 + 12]; /* 80 for device, 12 for erase size */
        char *str = buf;
@@ -1825,7 +1837,7 @@ diff -urN linux.old/drivers/mtd/devices/block2mtd.c linux.dev/drivers/mtd/device
        char *name;
        size_t erase_size = PAGE_SIZE;
        int i, ret;
-@@ -440,7 +440,7 @@
+@@ -443,7 +443,7 @@
        strcpy(str, val);
        kill_final_newline(str);
  
@@ -1834,7 +1846,7 @@ diff -urN linux.old/drivers/mtd/devices/block2mtd.c linux.dev/drivers/mtd/device
                token[i] = strsep(&str, ",");
  
        if (str)
-@@ -461,13 +461,13 @@
+@@ -464,13 +464,13 @@
                }
        }
  
@@ -1850,7 +1862,7 @@ diff -urN linux.old/drivers/mtd/devices/block2mtd.c linux.dev/drivers/mtd/device
  {
  #ifdef MODULE
        return block2mtd_setup2(val);
-@@ -496,6 +496,7 @@
+@@ -499,6 +499,7 @@
  
  module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);
  MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>]\"");
@@ -1859,22 +1871,22 @@ diff -urN linux.old/drivers/mtd/devices/block2mtd.c linux.dev/drivers/mtd/device
  static int __init block2mtd_init(void)
  {
 diff -urN linux.old/drivers/pci/Makefile linux.dev/drivers/pci/Makefile
---- linux.old/drivers/pci/Makefile     2006-06-18 03:49:35.000000000 +0200
-+++ linux.dev/drivers/pci/Makefile     2006-10-11 21:56:38.000000000 +0200
-@@ -27,6 +27,7 @@
- obj-$(CONFIG_MIPS) += setup-bus.o setup-irq.o
- obj-$(CONFIG_X86_VISWS) += setup-irq.o
+--- linux.old/drivers/pci/Makefile     2006-11-29 22:57:37.000000000 +0100
++++ linux.dev/drivers/pci/Makefile     2006-12-14 04:09:50.000000000 +0100
+@@ -16,6 +16,7 @@
+ 
+ # Build the PCI MSI interrupt support
  obj-$(CONFIG_PCI_MSI) += msi.o
 +obj-$(CONFIG_MIKROTIK_RB500) += setup-irq.o
  
- #
- # ACPI Related PCI FW Functions
+ # Build the Hypertransport interrupt support
+ obj-$(CONFIG_HT_IRQ) += htirq.o
 diff -urN linux.old/include/asm-mips/bootinfo.h linux.dev/include/asm-mips/bootinfo.h
---- linux.old/include/asm-mips/bootinfo.h      2006-06-18 03:49:35.000000000 +0200
-+++ linux.dev/include/asm-mips/bootinfo.h      2006-10-11 21:56:38.000000000 +0200
-@@ -218,6 +218,8 @@
- #define MACH_GROUP_TITAN       22     /* PMC-Sierra Titan             */
- #define  MACH_TITAN_YOSEMITE  1       /* PMC-Sierra Yosemite          */
+--- linux.old/include/asm-mips/bootinfo.h      2006-11-29 22:57:37.000000000 +0100
++++ linux.dev/include/asm-mips/bootinfo.h      2006-12-14 04:09:50.000000000 +0100
+@@ -212,6 +212,8 @@
+ #define MACH_GROUP_NEC_EMMA2RH 25     /* NEC EMMA2RH (was 23)         */
+ #define  MACH_NEC_MARKEINS    0       /* NEC EMMA2RH Mark-eins        */
  
 +#define MACH_GROUP_MIKROTIK    24 /* Mikrotik Boards                      */
 +
@@ -1882,8 +1894,8 @@ diff -urN linux.old/include/asm-mips/bootinfo.h linux.dev/include/asm-mips/booti
  
  const char *get_system_type(void);
 diff -urN linux.old/include/asm-mips/cpu.h linux.dev/include/asm-mips/cpu.h
---- linux.old/include/asm-mips/cpu.h   2006-06-18 03:49:35.000000000 +0200
-+++ linux.dev/include/asm-mips/cpu.h   2006-10-11 21:56:38.000000000 +0200
+--- linux.old/include/asm-mips/cpu.h   2006-11-29 22:57:37.000000000 +0100
++++ linux.dev/include/asm-mips/cpu.h   2006-12-14 04:09:50.000000000 +0100
 @@ -200,7 +200,8 @@
  #define CPU_SB1A              62
  #define CPU_74K                       63
@@ -1896,7 +1908,7 @@ diff -urN linux.old/include/asm-mips/cpu.h linux.dev/include/asm-mips/cpu.h
   * ISA Level encodings
 diff -urN linux.old/include/asm-mips/rc32434/crom.h linux.dev/include/asm-mips/rc32434/crom.h
 --- linux.old/include/asm-mips/rc32434/crom.h  1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/include/asm-mips/rc32434/crom.h  2006-10-11 21:56:38.000000000 +0200
++++ linux.dev/include/asm-mips/rc32434/crom.h  2006-12-14 04:09:50.000000000 +0100
 @@ -0,0 +1,98 @@
 +#ifndef __IDT_CROM_H__
 +#define __IDT_CROM_H__
@@ -1998,7 +2010,7 @@ diff -urN linux.old/include/asm-mips/rc32434/crom.h linux.dev/include/asm-mips/r
 +#endif        // __IDT_CROM_H__
 diff -urN linux.old/include/asm-mips/rc32434/ddr.h linux.dev/include/asm-mips/rc32434/ddr.h
 --- linux.old/include/asm-mips/rc32434/ddr.h   1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/include/asm-mips/rc32434/ddr.h   2006-10-11 21:56:38.000000000 +0200
++++ linux.dev/include/asm-mips/rc32434/ddr.h   2006-12-14 04:09:50.000000000 +0100
 @@ -0,0 +1,175 @@
 +#ifndef __IDT_DDR_H__
 +#define __IDT_DDR_H__
@@ -2177,7 +2189,7 @@ diff -urN linux.old/include/asm-mips/rc32434/ddr.h linux.dev/include/asm-mips/rc
 +#endif        // __IDT_DDR_H__
 diff -urN linux.old/include/asm-mips/rc32434/dev.h linux.dev/include/asm-mips/rc32434/dev.h
 --- linux.old/include/asm-mips/rc32434/dev.h   1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/include/asm-mips/rc32434/dev.h   2006-10-11 21:56:38.000000000 +0200
++++ linux.dev/include/asm-mips/rc32434/dev.h   2006-12-14 04:09:50.000000000 +0100
 @@ -0,0 +1,134 @@
 +#ifndef __IDT_DEV_H__
 +#define __IDT_DEV_H__
@@ -2315,7 +2327,7 @@ diff -urN linux.old/include/asm-mips/rc32434/dev.h linux.dev/include/asm-mips/rc
 +
 diff -urN linux.old/include/asm-mips/rc32434/dma.h linux.dev/include/asm-mips/rc32434/dma.h
 --- linux.old/include/asm-mips/rc32434/dma.h   1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/include/asm-mips/rc32434/dma.h   2006-10-11 21:56:38.000000000 +0200
++++ linux.dev/include/asm-mips/rc32434/dma.h   2006-12-14 04:09:50.000000000 +0100
 @@ -0,0 +1,202 @@
 +#ifndef __IDT_DMA_H__
 +#define __IDT_DMA_H__
@@ -2521,7 +2533,7 @@ diff -urN linux.old/include/asm-mips/rc32434/dma.h linux.dev/include/asm-mips/rc
 +
 diff -urN linux.old/include/asm-mips/rc32434/dma_v.h linux.dev/include/asm-mips/rc32434/dma_v.h
 --- linux.old/include/asm-mips/rc32434/dma_v.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/include/asm-mips/rc32434/dma_v.h 2006-10-11 21:56:38.000000000 +0200
++++ linux.dev/include/asm-mips/rc32434/dma_v.h 2006-12-14 04:09:50.000000000 +0100
 @@ -0,0 +1,73 @@
 +#ifndef __IDT_DMA_V_H__
 +#define __IDT_DMA_V_H__
@@ -2598,7 +2610,7 @@ diff -urN linux.old/include/asm-mips/rc32434/dma_v.h linux.dev/include/asm-mips/
 +
 diff -urN linux.old/include/asm-mips/rc32434/eth.h linux.dev/include/asm-mips/rc32434/eth.h
 --- linux.old/include/asm-mips/rc32434/eth.h   1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/include/asm-mips/rc32434/eth.h   2006-10-11 21:56:38.000000000 +0200
++++ linux.dev/include/asm-mips/rc32434/eth.h   2006-12-14 04:09:50.000000000 +0100
 @@ -0,0 +1,322 @@
 +#ifndef       __IDT_ETH_H__
 +#define       __IDT_ETH_H__
@@ -2924,7 +2936,7 @@ diff -urN linux.old/include/asm-mips/rc32434/eth.h linux.dev/include/asm-mips/rc
 +
 diff -urN linux.old/include/asm-mips/rc32434/eth_v.h linux.dev/include/asm-mips/rc32434/eth_v.h
 --- linux.old/include/asm-mips/rc32434/eth_v.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/include/asm-mips/rc32434/eth_v.h 2006-10-11 21:56:38.000000000 +0200
++++ linux.dev/include/asm-mips/rc32434/eth_v.h 2006-12-14 04:09:50.000000000 +0100
 @@ -0,0 +1,64 @@
 +#ifndef       __IDT_ETH_V_H__
 +#define       __IDT_ETH_V_H__
@@ -2992,7 +3004,7 @@ diff -urN linux.old/include/asm-mips/rc32434/eth_v.h linux.dev/include/asm-mips/
 +
 diff -urN linux.old/include/asm-mips/rc32434/gpio.h linux.dev/include/asm-mips/rc32434/gpio.h
 --- linux.old/include/asm-mips/rc32434/gpio.h  1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/include/asm-mips/rc32434/gpio.h  2006-10-11 21:56:38.000000000 +0200
++++ linux.dev/include/asm-mips/rc32434/gpio.h  2006-12-14 04:09:50.000000000 +0100
 @@ -0,0 +1,182 @@
 +#ifndef __IDT_GPIO_H__
 +#define __IDT_GPIO_H__
@@ -3178,7 +3190,7 @@ diff -urN linux.old/include/asm-mips/rc32434/gpio.h linux.dev/include/asm-mips/r
 +
 diff -urN linux.old/include/asm-mips/rc32434/i2c.h linux.dev/include/asm-mips/rc32434/i2c.h
 --- linux.old/include/asm-mips/rc32434/i2c.h   1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/include/asm-mips/rc32434/i2c.h   2006-10-11 21:56:38.000000000 +0200
++++ linux.dev/include/asm-mips/rc32434/i2c.h   2006-12-14 04:09:50.000000000 +0100
 @@ -0,0 +1,147 @@
 +#ifndef __IDT_I2C_H__
 +#define __IDT_I2C_H__
@@ -3329,7 +3341,7 @@ diff -urN linux.old/include/asm-mips/rc32434/i2c.h linux.dev/include/asm-mips/rc
 +#endif        // __IDT_I2C_H__
 diff -urN linux.old/include/asm-mips/rc32434/integ.h linux.dev/include/asm-mips/rc32434/integ.h
 --- linux.old/include/asm-mips/rc32434/integ.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/include/asm-mips/rc32434/integ.h 2006-10-11 21:56:38.000000000 +0200
++++ linux.dev/include/asm-mips/rc32434/integ.h 2006-12-14 04:09:50.000000000 +0100
 @@ -0,0 +1,78 @@
 +#ifndef __IDT_INTEG_H__
 +#define __IDT_INTEG_H__
@@ -3411,7 +3423,7 @@ diff -urN linux.old/include/asm-mips/rc32434/integ.h linux.dev/include/asm-mips/
 +#endif        // __IDT_INTEG_H__
 diff -urN linux.old/include/asm-mips/rc32434/int.h linux.dev/include/asm-mips/rc32434/int.h
 --- linux.old/include/asm-mips/rc32434/int.h   1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/include/asm-mips/rc32434/int.h   2006-10-11 21:56:38.000000000 +0200
++++ linux.dev/include/asm-mips/rc32434/int.h   2006-12-14 04:09:50.000000000 +0100
 @@ -0,0 +1,167 @@
 +#ifndef __IDT_INT_H__
 +#define __IDT_INT_H__
@@ -3582,7 +3594,7 @@ diff -urN linux.old/include/asm-mips/rc32434/int.h linux.dev/include/asm-mips/rc
 +
 diff -urN linux.old/include/asm-mips/rc32434/iparb.h linux.dev/include/asm-mips/rc32434/iparb.h
 --- linux.old/include/asm-mips/rc32434/iparb.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/include/asm-mips/rc32434/iparb.h 2006-10-11 21:56:38.000000000 +0200
++++ linux.dev/include/asm-mips/rc32434/iparb.h 2006-12-14 04:09:50.000000000 +0100
 @@ -0,0 +1,95 @@
 +#ifndef __IDT_IPARB_H__
 +#define __IDT_IPARB_H__
@@ -3681,7 +3693,7 @@ diff -urN linux.old/include/asm-mips/rc32434/iparb.h linux.dev/include/asm-mips/
 +#endif        // __IDT_IPARB_H__
 diff -urN linux.old/include/asm-mips/rc32434/irm.h linux.dev/include/asm-mips/rc32434/irm.h
 --- linux.old/include/asm-mips/rc32434/irm.h   1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/include/asm-mips/rc32434/irm.h   2006-10-11 21:56:38.000000000 +0200
++++ linux.dev/include/asm-mips/rc32434/irm.h   2006-12-14 04:09:50.000000000 +0100
 @@ -0,0 +1,55 @@
 +#ifndef __IDT_IRM_H__
 +#define __IDT_IRM_H__
@@ -3740,19 +3752,19 @@ diff -urN linux.old/include/asm-mips/rc32434/irm.h linux.dev/include/asm-mips/rc
 +#endif        // __IDT_IRM_H__
 diff -urN linux.old/include/asm-mips/rc32434/irq.h linux.dev/include/asm-mips/rc32434/irq.h
 --- linux.old/include/asm-mips/rc32434/irq.h   1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/include/asm-mips/rc32434/irq.h   2006-10-11 21:56:38.000000000 +0200
++++ linux.dev/include/asm-mips/rc32434/irq.h   2006-12-14 04:09:50.000000000 +0100
 @@ -0,0 +1,8 @@
 +#ifndef __ASM_MACH_MIPS_IRQ_H
 +#define __ASM_MACH_MIPS_IRQ_H
 +
-+#include <linux/config.h>
++#include <linux/autoconf.h>
 +
 +#define NR_IRQS       256
 +
 +#endif /* __ASM_MACH_MIPS_IRQ_H */
 diff -urN linux.old/include/asm-mips/rc32434/nvram.h linux.dev/include/asm-mips/rc32434/nvram.h
 --- linux.old/include/asm-mips/rc32434/nvram.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/include/asm-mips/rc32434/nvram.h 2006-10-11 21:56:38.000000000 +0200
++++ linux.dev/include/asm-mips/rc32434/nvram.h 2006-12-14 04:09:50.000000000 +0100
 @@ -0,0 +1,97 @@
 +#ifndef __IDT_NVRAM_H
 +#define __IDT_NVRAM_H
@@ -3853,7 +3865,7 @@ diff -urN linux.old/include/asm-mips/rc32434/nvram.h linux.dev/include/asm-mips/
 +
 diff -urN linux.old/include/asm-mips/rc32434/pci.h linux.dev/include/asm-mips/rc32434/pci.h
 --- linux.old/include/asm-mips/rc32434/pci.h   1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/include/asm-mips/rc32434/pci.h   2006-10-11 21:56:38.000000000 +0200
++++ linux.dev/include/asm-mips/rc32434/pci.h   2006-12-14 04:09:50.000000000 +0100
 @@ -0,0 +1,695 @@
 +/**************************************************************************
 + *
@@ -4552,7 +4564,7 @@ diff -urN linux.old/include/asm-mips/rc32434/pci.h linux.dev/include/asm-mips/rc
 +
 diff -urN linux.old/include/asm-mips/rc32434/pcikorina.h linux.dev/include/asm-mips/rc32434/pcikorina.h
 --- linux.old/include/asm-mips/rc32434/pcikorina.h     1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/include/asm-mips/rc32434/pcikorina.h     2006-10-11 21:56:38.000000000 +0200
++++ linux.dev/include/asm-mips/rc32434/pcikorina.h     2006-12-14 04:09:50.000000000 +0100
 @@ -0,0 +1,209 @@
 +/* $Id: pciacacia.h,v 1.5 2001/05/01 10:09:17 carstenl Exp $
 + *
@@ -4765,7 +4777,7 @@ diff -urN linux.old/include/asm-mips/rc32434/pcikorina.h linux.dev/include/asm-m
 +
 diff -urN linux.old/include/asm-mips/rc32434/pci_regs.h linux.dev/include/asm-mips/rc32434/pci_regs.h
 --- linux.old/include/asm-mips/rc32434/pci_regs.h      1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/include/asm-mips/rc32434/pci_regs.h      2006-10-11 21:56:38.000000000 +0200
++++ linux.dev/include/asm-mips/rc32434/pci_regs.h      2006-12-14 04:09:50.000000000 +0100
 @@ -0,0 +1,8 @@
 +/* Override the default address space for this arch
 +*/
@@ -4777,8 +4789,23 @@ diff -urN linux.old/include/asm-mips/rc32434/pci_regs.h linux.dev/include/asm-mi
 +
 diff -urN linux.old/include/asm-mips/rc32434/rb.h linux.dev/include/asm-mips/rc32434/rb.h
 --- linux.old/include/asm-mips/rc32434/rb.h    1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/include/asm-mips/rc32434/rb.h    2006-10-11 21:56:38.000000000 +0200
-@@ -0,0 +1,69 @@
++++ linux.dev/include/asm-mips/rc32434/rb.h    2006-12-14 04:09:50.000000000 +0100
+@@ -0,0 +1,84 @@
++/*
++ *  Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
++ *
++ *  This program is free software; you can redistribute it and/or modify
++ *  it under the terms of the GNU General Public License as published by
++ *  the Free Software Foundation; either version 2 of the License, or
++ *  (at your option) any later version.
++ *
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ *  GNU General Public License for more details.
++ *
++ *  $Id$
++ */
 +#ifndef __MIPS_RB_H__
 +#define __MIPS_RB_H__
 +#include <linux/genhd.h>
@@ -4850,7 +4877,7 @@ diff -urN linux.old/include/asm-mips/rc32434/rb.h linux.dev/include/asm-mips/rc3
 +#endif
 diff -urN linux.old/include/asm-mips/rc32434/rc32434.h linux.dev/include/asm-mips/rc32434/rc32434.h
 --- linux.old/include/asm-mips/rc32434/rc32434.h       1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/include/asm-mips/rc32434/rc32434.h       2006-10-11 21:56:38.000000000 +0200
++++ linux.dev/include/asm-mips/rc32434/rc32434.h       2006-12-14 04:09:50.000000000 +0100
 @@ -0,0 +1,126 @@
 +/*
 + ***************************************************************************
@@ -4879,7 +4906,7 @@ diff -urN linux.old/include/asm-mips/rc32434/rc32434.h linux.dev/include/asm-mip
 +#ifndef _RC32434_H_
 +#define _RC32434_H_
 +
-+#include <linux/config.h>
++#include <linux/autoconf.h>
 +#include <linux/delay.h>
 +#include <asm/io.h>
 +#include <asm/rc32434/timer.h>
@@ -4980,7 +5007,7 @@ diff -urN linux.old/include/asm-mips/rc32434/rc32434.h linux.dev/include/asm-mip
 +#endif /* _RC32434_H_ */
 diff -urN linux.old/include/asm-mips/rc32434/rst.h linux.dev/include/asm-mips/rc32434/rst.h
 --- linux.old/include/asm-mips/rc32434/rst.h   1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/include/asm-mips/rc32434/rst.h   2006-10-11 21:56:38.000000000 +0200
++++ linux.dev/include/asm-mips/rc32434/rst.h   2006-12-14 04:09:50.000000000 +0100
 @@ -0,0 +1,105 @@
 +#ifndef __IDT_RST_H__
 +#define __IDT_RST_H__
@@ -5089,7 +5116,7 @@ diff -urN linux.old/include/asm-mips/rc32434/rst.h linux.dev/include/asm-mips/rc
 +#endif        // __IDT_RST_H__
 diff -urN linux.old/include/asm-mips/rc32434/spi.h linux.dev/include/asm-mips/rc32434/spi.h
 --- linux.old/include/asm-mips/rc32434/spi.h   1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/include/asm-mips/rc32434/spi.h   2006-10-11 21:56:38.000000000 +0200
++++ linux.dev/include/asm-mips/rc32434/spi.h   2006-12-14 04:09:50.000000000 +0100
 @@ -0,0 +1,100 @@
 +#ifndef __IDT_SPI_H__
 +#define __IDT_SPI_H__
@@ -5193,7 +5220,7 @@ diff -urN linux.old/include/asm-mips/rc32434/spi.h linux.dev/include/asm-mips/rc
 +#endif        // __IDT_SPI_H__
 diff -urN linux.old/include/asm-mips/rc32434/timer.h linux.dev/include/asm-mips/rc32434/timer.h
 --- linux.old/include/asm-mips/rc32434/timer.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/include/asm-mips/rc32434/timer.h 2006-10-11 21:56:38.000000000 +0200
++++ linux.dev/include/asm-mips/rc32434/timer.h 2006-12-14 04:09:50.000000000 +0100
 @@ -0,0 +1,91 @@
 +/**************************************************************************
 + *
@@ -5288,7 +5315,7 @@ diff -urN linux.old/include/asm-mips/rc32434/timer.h linux.dev/include/asm-mips/
 +
 diff -urN linux.old/include/asm-mips/rc32434/tim.h linux.dev/include/asm-mips/rc32434/tim.h
 --- linux.old/include/asm-mips/rc32434/tim.h   1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/include/asm-mips/rc32434/tim.h   2006-10-11 21:56:38.000000000 +0200
++++ linux.dev/include/asm-mips/rc32434/tim.h   2006-12-14 04:09:50.000000000 +0100
 @@ -0,0 +1,78 @@
 +#ifndef __IDT_TIM_H__
 +#define __IDT_TIM_H__
@@ -5370,8 +5397,8 @@ diff -urN linux.old/include/asm-mips/rc32434/tim.h linux.dev/include/asm-mips/rc
 +
 diff -urN linux.old/include/asm-mips/rc32434/types.h linux.dev/include/asm-mips/rc32434/types.h
 --- linux.old/include/asm-mips/rc32434/types.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/include/asm-mips/rc32434/types.h 2006-10-11 21:56:38.000000000 +0200
-@@ -0,0 +1,39 @@
++++ linux.dev/include/asm-mips/rc32434/types.h 2006-12-14 04:10:43.000000000 +0100
+@@ -0,0 +1,35 @@
 +#ifndef __IDT_TYPES_H__
 +#define __IDT_TYPES_H__
 +
@@ -5406,14 +5433,10 @@ diff -urN linux.old/include/asm-mips/rc32434/types.h linux.dev/include/asm-mips/
 +typedef unsigned long long    U64 ;
 +typedef signed long long      S64 ;
 +
-+#ifndef __cplusplus
-+      typedef U32             bool ;  // (false == 0), (true is != false)
-+#endif        // __cplusplus
-+
 +#endif        // __IDT_TYPES_H__
 diff -urN linux.old/include/asm-mips/rc32434/uart.h linux.dev/include/asm-mips/rc32434/uart.h
 --- linux.old/include/asm-mips/rc32434/uart.h  1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/include/asm-mips/rc32434/uart.h  2006-10-11 21:56:38.000000000 +0200
++++ linux.dev/include/asm-mips/rc32434/uart.h  2006-12-14 04:09:50.000000000 +0100
 @@ -0,0 +1,178 @@
 +#ifndef __IDT_UART_H__
 +#define __IDT_UART_H__
Staging tree of Mathias Kresin