bugfix for the rb532 block2mtd code

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4320 3c298f89-4303-0410-b956-a3cf2f4a3e73

1 files changed, 60 insertions, 56 deletions

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 ae78d452b..f3d114ef8 100644
--- a/target/linux/rb532-2.6/patches/100-rb5xx_support.patch
+++ b/target/linux/rb532-2.6/patches/100-rb5xx_support.patch
@@ -1,6 +1,6 @@
 diff -urN linux.old/arch/mips/Kconfig linux.dev/arch/mips/Kconfig
---- linux.old/arch/mips/Kconfig	2006-06-18 17:31:54.000000000 +0200
-+++ linux.dev/arch/mips/Kconfig	2006-06-18 17:18:16.000000000 +0200
+--- linux.old/arch/mips/Kconfig	2006-07-29 19:53:20.000000000 +0200
++++ linux.dev/arch/mips/Kconfig	2006-07-29 19:31:51.000000000 +0200
 @@ -742,6 +742,19 @@
  	select SYS_SUPPORTS_BIG_ENDIAN
  	select TOSHIBA_BOARDS
@@ -31,8 +31,8 @@ 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-06-18 17:31:54.000000000 +0200
-+++ linux.dev/arch/mips/Makefile	2006-06-18 17:18:16.000000000 +0200
+--- linux.old/arch/mips/Makefile	2006-07-29 19:53:20.000000000 +0200
++++ linux.dev/arch/mips/Makefile	2006-07-29 19:31:51.000000000 +0200
 @@ -580,6 +580,13 @@
  load-$(CONFIG_TOSHIBA_JMR3927)	+= 0xffffffff80050000
  
@@ -48,8 +48,8 @@ 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 17:31:54.000000000 +0200
-+++ linux.dev/arch/mips/mm/tlbex.c	2006-06-18 17:18:16.000000000 +0200
+--- linux.old/arch/mips/mm/tlbex.c	2006-07-29 19:53:20.000000000 +0200
++++ linux.dev/arch/mips/mm/tlbex.c	2006-07-29 19:31:51.000000000 +0200
 @@ -876,7 +876,6 @@
  	case CPU_R10000:
  	case CPU_R12000:
@@ -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-06-18 17:18:16.000000000 +0200
++++ linux.dev/arch/mips/pci/fixup-rb500.c	2006-07-29 19:31:51.000000000 +0200
 @@ -0,0 +1,49 @@
 +/*
 + * Copyright 2001 MontaVista Software Inc.
@@ -120,8 +120,8 @@ 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 17:31:54.000000000 +0200
-+++ linux.dev/arch/mips/pci/Makefile	2006-06-18 17:18:16.000000000 +0200
+--- linux.old/arch/mips/pci/Makefile	2006-07-29 19:53:20.000000000 +0200
++++ linux.dev/arch/mips/pci/Makefile	2006-07-29 19:31:51.000000000 +0200
 @@ -57,3 +57,4 @@
  obj-$(CONFIG_TOSHIBA_RBTX4938)	+= fixup-tx4938.o ops-tx4938.o
  obj-$(CONFIG_VICTOR_MPC30X)	+= fixup-mpc30x.o
@@ -129,7 +129,7 @@ diff -urN linux.old/arch/mips/pci/Makefile linux.dev/arch/mips/pci/Makefile
 +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-06-18 17:18:16.000000000 +0200
++++ linux.dev/arch/mips/pci/ops-rc32434.c	2006-07-29 19:31:51.000000000 +0200
 @@ -0,0 +1,195 @@
 +/**************************************************************************
 + *
@@ -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-06-18 17:18:16.000000000 +0200
++++ linux.dev/arch/mips/pci/pci-rc32434.c	2006-07-29 19:31:51.000000000 +0200
 @@ -0,0 +1,234 @@
 +/**************************************************************************
 + *
@@ -566,7 +566,7 @@ 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-06-18 17:18:16.000000000 +0200
++++ linux.dev/arch/mips/rb500/devices.c	2006-07-29 19:31:51.000000000 +0200
 @@ -0,0 +1,211 @@
 +#include <linux/kernel.h>
 +#include <linux/init.h>
@@ -781,7 +781,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-06-18 17:18:16.000000000 +0200
++++ linux.dev/arch/mips/rb500/early_serial.c	2006-07-29 19:31:51.000000000 +0200
 @@ -0,0 +1,199 @@
 +/**************************************************************************
 + *
@@ -984,7 +984,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-06-18 17:31:37.000000000 +0200
++++ linux.dev/arch/mips/rb500/irq.c	2006-07-29 19:31:51.000000000 +0200
 @@ -0,0 +1,264 @@
 +/*
 + * BRIEF MODULE DESCRIPTION
@@ -1252,7 +1252,7 @@ diff -urN linux.old/arch/mips/rb500/irq.c linux.dev/arch/mips/rb500/irq.c
 +}
 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-06-18 17:36:48.000000000 +0200
++++ linux.dev/arch/mips/rb500/Makefile	2006-07-29 19:31:51.000000000 +0200
 @@ -0,0 +1,5 @@
 +#
 +# Makefile for the RB500 board specific parts of the kernel
@@ -1261,7 +1261,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-06-18 17:18:16.000000000 +0200
++++ linux.dev/arch/mips/rb500/misc.c	2006-07-29 19:31:51.000000000 +0200
 @@ -0,0 +1,54 @@
 +#include <linux/module.h>
 +#include <linux/kernel.h>   /* printk() */
@@ -1319,7 +1319,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-06-18 17:18:16.000000000 +0200
++++ linux.dev/arch/mips/rb500/prom.c	2006-07-29 19:31:51.000000000 +0200
 @@ -0,0 +1,181 @@
 +/*
 +* prom.c 
@@ -1504,7 +1504,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-06-18 17:18:16.000000000 +0200
++++ linux.dev/arch/mips/rb500/serial.c	2006-07-29 19:31:51.000000000 +0200
 @@ -0,0 +1,79 @@
 +/**************************************************************************
 + *
@@ -1587,7 +1587,7 @@ 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-06-18 17:18:16.000000000 +0200
++++ linux.dev/arch/mips/rb500/setup.c	2006-07-29 19:31:51.000000000 +0200
 @@ -0,0 +1,84 @@
 +/*
 + * setup.c - boot time setup code
@@ -1675,7 +1675,7 @@ 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-06-18 17:18:16.000000000 +0200
++++ linux.dev/arch/mips/rb500/time.c	2006-07-29 19:31:51.000000000 +0200
 @@ -0,0 +1,94 @@
 +/*
 +****************************************************************************
@@ -1772,8 +1772,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-06-18 17:31:54.000000000 +0200
-+++ linux.dev/drivers/mtd/devices/block2mtd.c	2006-06-18 17:18:16.000000000 +0200
+--- linux.old/drivers/mtd/devices/block2mtd.c	2006-07-29 19:53:54.000000000 +0200
++++ linux.dev/drivers/mtd/devices/block2mtd.c	2006-07-29 19:47:03.000000000 +0200
 @@ -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)
@@ -1839,7 +1839,7 @@ diff -urN linux.old/drivers/mtd/devices/block2mtd.c linux.dev/drivers/mtd/device
  			dev->mtd.erasesize >> 10, dev->mtd.erasesize);
  	return dev;
  
-@@ -416,7 +414,7 @@
+@@ -416,10 +414,10 @@
  	return 0;				\
  } while (0)
  
@@ -1847,7 +1847,11 @@ diff -urN linux.old/drivers/mtd/devices/block2mtd.c linux.dev/drivers/mtd/device
 +int block2mtd_setup(const char *val, struct kernel_param *kp)
  {
  	char buf[80+12], *str=buf; /* 80 for device, 12 for erase size */
- 	char *token[2];
+-	char *token[2];
++	char *token[3];
+ 	char *name;
+ 	size_t erase_size = PAGE_SIZE;
+ 	int i, ret;
 @@ -430,7 +428,7 @@
  	strcpy(str, val);
  	kill_final_newline(str);
@@ -1875,8 +1879,8 @@ 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 17:31:54.000000000 +0200
-+++ linux.dev/drivers/pci/Makefile	2006-06-18 17:18:16.000000000 +0200
+--- linux.old/drivers/pci/Makefile	2006-07-29 19:53:20.000000000 +0200
++++ linux.dev/drivers/pci/Makefile	2006-07-29 19:31:51.000000000 +0200
 @@ -27,6 +27,7 @@
  obj-$(CONFIG_MIPS) += setup-bus.o setup-irq.o
  obj-$(CONFIG_X86_VISWS) += setup-irq.o
@@ -1886,8 +1890,8 @@ diff -urN linux.old/drivers/pci/Makefile linux.dev/drivers/pci/Makefile
  #
  # ACPI Related PCI FW Functions
 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 17:31:54.000000000 +0200
-+++ linux.dev/include/asm-mips/bootinfo.h	2006-06-18 17:18:16.000000000 +0200
+--- linux.old/include/asm-mips/bootinfo.h	2006-07-29 19:53:20.000000000 +0200
++++ linux.dev/include/asm-mips/bootinfo.h	2006-07-29 19:31:51.000000000 +0200
 @@ -218,6 +218,8 @@
  #define MACH_GROUP_TITAN       22	/* PMC-Sierra Titan		*/
  #define  MACH_TITAN_YOSEMITE	1	/* PMC-Sierra Yosemite		*/
@@ -1898,8 +1902,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 17:31:54.000000000 +0200
-+++ linux.dev/include/asm-mips/cpu.h	2006-06-18 17:18:16.000000000 +0200
+--- linux.old/include/asm-mips/cpu.h	2006-07-29 19:53:20.000000000 +0200
++++ linux.dev/include/asm-mips/cpu.h	2006-07-29 19:31:51.000000000 +0200
 @@ -200,7 +200,8 @@
  #define CPU_SB1A		62
  #define CPU_74K			63
@@ -1912,7 +1916,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-06-18 17:18:16.000000000 +0200
++++ linux.dev/include/asm-mips/rc32434/crom.h	2006-07-29 19:31:51.000000000 +0200
 @@ -0,0 +1,98 @@
 +#ifndef __IDT_CROM_H__
 +#define __IDT_CROM_H__
@@ -2014,7 +2018,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-06-18 17:18:16.000000000 +0200
++++ linux.dev/include/asm-mips/rc32434/ddr.h	2006-07-29 19:31:51.000000000 +0200
 @@ -0,0 +1,175 @@
 +#ifndef __IDT_DDR_H__
 +#define __IDT_DDR_H__
@@ -2193,7 +2197,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-06-18 17:18:16.000000000 +0200
++++ linux.dev/include/asm-mips/rc32434/dev.h	2006-07-29 19:31:51.000000000 +0200
 @@ -0,0 +1,134 @@
 +#ifndef __IDT_DEV_H__
 +#define __IDT_DEV_H__
@@ -2331,7 +2335,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-06-18 17:18:16.000000000 +0200
++++ linux.dev/include/asm-mips/rc32434/dma.h	2006-07-29 19:31:51.000000000 +0200
 @@ -0,0 +1,202 @@
 +#ifndef __IDT_DMA_H__
 +#define __IDT_DMA_H__
@@ -2537,7 +2541,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-06-18 17:18:16.000000000 +0200
++++ linux.dev/include/asm-mips/rc32434/dma_v.h	2006-07-29 19:31:51.000000000 +0200
 @@ -0,0 +1,73 @@
 +#ifndef __IDT_DMA_V_H__
 +#define __IDT_DMA_V_H__
@@ -2614,7 +2618,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-06-18 17:18:16.000000000 +0200
++++ linux.dev/include/asm-mips/rc32434/eth.h	2006-07-29 19:31:51.000000000 +0200
 @@ -0,0 +1,322 @@
 +#ifndef	__IDT_ETH_H__
 +#define	__IDT_ETH_H__
@@ -2940,7 +2944,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-06-18 17:18:16.000000000 +0200
++++ linux.dev/include/asm-mips/rc32434/eth_v.h	2006-07-29 19:31:51.000000000 +0200
 @@ -0,0 +1,64 @@
 +#ifndef	__IDT_ETH_V_H__
 +#define	__IDT_ETH_V_H__
@@ -3008,7 +3012,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-06-18 17:18:16.000000000 +0200
++++ linux.dev/include/asm-mips/rc32434/gpio.h	2006-07-29 19:31:51.000000000 +0200
 @@ -0,0 +1,182 @@
 +#ifndef __IDT_GPIO_H__
 +#define __IDT_GPIO_H__
@@ -3194,7 +3198,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-06-18 17:18:16.000000000 +0200
++++ linux.dev/include/asm-mips/rc32434/i2c.h	2006-07-29 19:31:51.000000000 +0200
 @@ -0,0 +1,147 @@
 +#ifndef __IDT_I2C_H__
 +#define __IDT_I2C_H__
@@ -3345,7 +3349,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-06-18 17:18:16.000000000 +0200
++++ linux.dev/include/asm-mips/rc32434/integ.h	2006-07-29 19:31:51.000000000 +0200
 @@ -0,0 +1,78 @@
 +#ifndef __IDT_INTEG_H__
 +#define __IDT_INTEG_H__
@@ -3427,7 +3431,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-06-18 17:18:16.000000000 +0200
++++ linux.dev/include/asm-mips/rc32434/int.h	2006-07-29 19:31:51.000000000 +0200
 @@ -0,0 +1,167 @@
 +#ifndef __IDT_INT_H__
 +#define __IDT_INT_H__
@@ -3598,7 +3602,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-06-18 17:18:16.000000000 +0200
++++ linux.dev/include/asm-mips/rc32434/iparb.h	2006-07-29 19:31:51.000000000 +0200
 @@ -0,0 +1,95 @@
 +#ifndef __IDT_IPARB_H__
 +#define __IDT_IPARB_H__
@@ -3697,7 +3701,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-06-18 17:18:16.000000000 +0200
++++ linux.dev/include/asm-mips/rc32434/irm.h	2006-07-29 19:31:51.000000000 +0200
 @@ -0,0 +1,55 @@
 +#ifndef __IDT_IRM_H__
 +#define __IDT_IRM_H__
@@ -3756,7 +3760,7 @@ 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-06-18 17:18:16.000000000 +0200
++++ linux.dev/include/asm-mips/rc32434/irq.h	2006-07-29 19:31:51.000000000 +0200
 @@ -0,0 +1,8 @@
 +#ifndef __ASM_MACH_MIPS_IRQ_H
 +#define __ASM_MACH_MIPS_IRQ_H
@@ -3768,7 +3772,7 @@ diff -urN linux.old/include/asm-mips/rc32434/irq.h linux.dev/include/asm-mips/rc
 +#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-06-18 17:18:16.000000000 +0200
++++ linux.dev/include/asm-mips/rc32434/nvram.h	2006-07-29 19:31:51.000000000 +0200
 @@ -0,0 +1,97 @@
 +#ifndef __IDT_NVRAM_H
 +#define __IDT_NVRAM_H
@@ -3869,7 +3873,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-06-18 17:18:16.000000000 +0200
++++ linux.dev/include/asm-mips/rc32434/pci.h	2006-07-29 19:31:51.000000000 +0200
 @@ -0,0 +1,695 @@
 +/**************************************************************************
 + *
@@ -4568,7 +4572,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-06-18 17:18:16.000000000 +0200
++++ linux.dev/include/asm-mips/rc32434/pcikorina.h	2006-07-29 19:31:51.000000000 +0200
 @@ -0,0 +1,209 @@
 +/* $Id: pciacacia.h,v 1.5 2001/05/01 10:09:17 carstenl Exp $
 + *
@@ -4781,7 +4785,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-06-18 17:18:16.000000000 +0200
++++ linux.dev/include/asm-mips/rc32434/pci_regs.h	2006-07-29 19:31:51.000000000 +0200
 @@ -0,0 +1,8 @@
 +/* Override the default address space for this arch
 +*/
@@ -4793,7 +4797,7 @@ 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-06-18 17:18:16.000000000 +0200
++++ linux.dev/include/asm-mips/rc32434/rb.h	2006-07-29 19:31:51.000000000 +0200
 @@ -0,0 +1,69 @@
 +#ifndef __MIPS_RB_H__
 +#define __MIPS_RB_H__
@@ -4866,7 +4870,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-06-18 17:18:16.000000000 +0200
++++ linux.dev/include/asm-mips/rc32434/rc32434.h	2006-07-29 19:31:51.000000000 +0200
 @@ -0,0 +1,126 @@
 +/*
 + ***************************************************************************
@@ -4996,7 +5000,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-06-18 17:18:16.000000000 +0200
++++ linux.dev/include/asm-mips/rc32434/rst.h	2006-07-29 19:31:51.000000000 +0200
 @@ -0,0 +1,105 @@
 +#ifndef __IDT_RST_H__
 +#define __IDT_RST_H__
@@ -5105,7 +5109,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-06-18 17:18:16.000000000 +0200
++++ linux.dev/include/asm-mips/rc32434/spi.h	2006-07-29 19:31:51.000000000 +0200
 @@ -0,0 +1,100 @@
 +#ifndef __IDT_SPI_H__
 +#define __IDT_SPI_H__
@@ -5209,7 +5213,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-06-18 17:18:16.000000000 +0200
++++ linux.dev/include/asm-mips/rc32434/timer.h	2006-07-29 19:31:51.000000000 +0200
 @@ -0,0 +1,91 @@
 +/**************************************************************************
 + *
@@ -5304,7 +5308,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-06-18 17:18:16.000000000 +0200
++++ linux.dev/include/asm-mips/rc32434/tim.h	2006-07-29 19:31:51.000000000 +0200
 @@ -0,0 +1,78 @@
 +#ifndef __IDT_TIM_H__
 +#define __IDT_TIM_H__
@@ -5386,7 +5390,7 @@ 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-06-18 17:18:16.000000000 +0200
++++ linux.dev/include/asm-mips/rc32434/types.h	2006-07-29 19:31:51.000000000 +0200
 @@ -0,0 +1,39 @@
 +#ifndef __IDT_TYPES_H__
 +#define __IDT_TYPES_H__
@@ -5429,7 +5433,7 @@ diff -urN linux.old/include/asm-mips/rc32434/types.h linux.dev/include/asm-mips/
 +#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-06-18 17:18:16.000000000 +0200
++++ linux.dev/include/asm-mips/rc32434/uart.h	2006-07-29 19:31:51.000000000 +0200
 @@ -0,0 +1,178 @@
 +#ifndef __IDT_UART_H__
 +#define __IDT_UART_H__