upgrade kernel, quagga and openvpn, add licensing info to diag module, fix up jffs2

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@650 3c298f89-4303-0410-b956-a3cf2f4a3e73
author: kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73> 2005-04-14 08:39:01 +0000
committer: kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73> 2005-04-14 08:39:01 +0000
commit: 1dcc8eb95bdfca4d0b492f3bdbec2ca632f47c74 (patch)
tree: bbf4dc9e387787dc6aaa3366f3f5978e877031fa /openwrt
parent: 8e6558325dbdff4855cff5ed66235cd624d4c763 (diff)
7 files changed, 3279 insertions, 1749 deletions
diff --git a/openwrt/package/linux/kernel-patches/000-linux-mips-2_4_49.patch b/openwrt/package/linux/kernel-patches/000-linux-mips-2_4_30.patch
index 9d9ce0789..e2ebfce28 100644
--- a/openwrt/package/linux/kernel-patches/000-linux-mips-2_4_49.patch
+++ b/openwrt/package/linux/kernel-patches/000-linux-mips-2_4_30.patch
@@ -1,6 +1,128 @@
-diff -Nur linux-2.4.29/arch/mips/au1000/common/au1xxx_irqmap.c linux-mips/arch/mips/au1000/common/au1xxx_irqmap.c
---- linux-2.4.29/arch/mips/au1000/common/au1xxx_irqmap.c	2005-01-19 15:09:26.000000000 +0100
-+++ linux-mips/arch/mips/au1000/common/au1xxx_irqmap.c	2005-01-30 09:01:27.000000000 +0100
+diff -Nur linux-2.4.30/Makefile linux-2.4.30-mips/Makefile
+--- linux-2.4.30/Makefile	2005-04-04 03:42:20.000000000 +0200
++++ linux-2.4.30-mips/Makefile	2005-04-05 21:09:54.000000000 +0200
+@@ -5,7 +5,7 @@
+ 
+ KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
+ 
+-ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/)
++ARCH = mips
+ KERNELPATH=kernel-$(shell echo $(KERNELRELEASE) | sed -e "s/-//g")
+ 
+ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
+@@ -462,10 +462,11 @@
+ 	$(MAKE) -C Documentation/DocBook mrproper
+ 
+ distclean: mrproper
+-	rm -f core `find . \( -not -type d \) -and \
+-		\( -name '*.orig' -o -name '*.rej' -o -name '*~' \
+-		-o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
+-		-o -name '.*.rej' -o -name '.SUMS' -o -size 0 \) -type f -print` TAGS tags
++	find . \( -not -type d \) -and \
++		\( -name core -o -name '*.orig' -o -name '*.rej' \
++		-o -name '*~' -o -name '*.bak' -o -name '#*#' \
++		-o -name '.*.rej' -o -name '.SUMS' -o -size 0 \
++		-o -name TAGS -o -name tags \) -print | env -i xargs rm -f
+ 
+ backup: mrproper
+ 	cd .. && tar cf - linux/ | gzip -9 > backup.gz
+@@ -492,7 +493,7 @@
+ 	$(MAKE) -C Documentation/DocBook man
+ 
+ sums:
+-	find . -type f -print | sort | xargs sum > .SUMS
++	find . -type f -print | sort | env -i xargs sum > .SUMS
+ 
+ dep-files: scripts/mkdep archdep include/linux/version.h
+ 	rm -f .depend .hdepend
+diff -Nur linux-2.4.30/arch/mips/Makefile linux-2.4.30-mips/arch/mips/Makefile
+--- linux-2.4.30/arch/mips/Makefile	2005-01-19 15:09:26.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/Makefile	2005-01-30 09:01:26.000000000 +0100
+@@ -211,7 +211,7 @@
+ endif
+ 
+ #
+-# Au1000 (Alchemy Semi PB1000) eval board
++# Au1x AMD Alchemy eval boards
+ #
+ ifdef CONFIG_MIPS_PB1000
+ LIBS		+= arch/mips/au1000/pb1000/pb1000.o \
+@@ -220,9 +220,6 @@
+ LOADADDR	:= 0x80100000
+ endif
+ 
+-#
+-# Au1100 (Alchemy Semi PB1100) eval board
+-#
+ ifdef CONFIG_MIPS_PB1100
+ LIBS          += arch/mips/au1000/pb1100/pb1100.o \
+                  arch/mips/au1000/common/au1000.o
+@@ -230,9 +227,6 @@
+ LOADADDR      += 0x80100000
+ endif
+ 
+-#
+-# Au1500 (Alchemy Semi PB1500) eval board
+-#
+ ifdef CONFIG_MIPS_PB1500
+ LIBS		+= arch/mips/au1000/pb1500/pb1500.o \
+ 		   arch/mips/au1000/common/au1000.o
+@@ -240,9 +234,6 @@
+ LOADADDR	:= 0x80100000
+ endif
+ 
+-#
+-# Au1x00 (AMD/Alchemy) eval boards
+-#
+ ifdef CONFIG_MIPS_DB1000
+ LIBS          += arch/mips/au1000/db1x00/db1x00.o \
+                  arch/mips/au1000/common/au1000.o
+@@ -313,6 +304,27 @@
+ LOADADDR      += 0x80100000
+ endif
+ 
++ifdef CONFIG_MIPS_PB1200
++LIBS          += arch/mips/au1000/pb1200/pb1200.o \
++                 arch/mips/au1000/common/au1000.o
++SUBDIRS       += arch/mips/au1000/pb1200 arch/mips/au1000/common
++LOADADDR      += 0x80100000
++endif
++
++ifdef CONFIG_MIPS_DB1200
++LIBS          += arch/mips/au1000/pb1200/pb1200.o \
++                 arch/mips/au1000/common/au1000.o
++SUBDIRS       += arch/mips/au1000/pb1200 arch/mips/au1000/common
++LOADADDR      += 0x80100000
++endif
++
++ifdef CONFIG_MIPS_FICMMP
++LIBS          += arch/mips/au1000/ficmmp/ficmmp.o \
++                 arch/mips/au1000/common/au1000.o
++SUBDIRS       += arch/mips/au1000/ficmmp arch/mips/au1000/common
++LOADADDR      += 0x80100000
++endif
++
+ 
+ #
+ # Cogent CSB250
+diff -Nur linux-2.4.30/arch/mips/au1000/common/Makefile linux-2.4.30-mips/arch/mips/au1000/common/Makefile
+--- linux-2.4.30/arch/mips/au1000/common/Makefile	2005-01-19 15:09:26.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/au1000/common/Makefile	2005-01-30 09:01:27.000000000 +0100
+@@ -19,9 +19,9 @@
+ export-objs		= prom.o clocks.o power.o usbdev.o
+ 
+ obj-y := prom.o int-handler.o irq.o puts.o time.o reset.o cputable.o \
+-	au1xxx_irqmap.o clocks.o power.o setup.o sleeper.o dma.o dbdma.o
++	au1xxx_irqmap.o clocks.o power.o setup.o sleeper.o dma.o dbdma.o gpio.o
+   
+-export-objs += dma.o dbdma.o
++export-objs += dma.o dbdma.o gpio.o
+ 
+ obj-$(CONFIG_AU1X00_USB_DEVICE) += usbdev.o
+ obj-$(CONFIG_KGDB) += dbg_io.o
+diff -Nur linux-2.4.30/arch/mips/au1000/common/au1xxx_irqmap.c linux-2.4.30-mips/arch/mips/au1000/common/au1xxx_irqmap.c
+--- linux-2.4.30/arch/mips/au1000/common/au1xxx_irqmap.c	2005-01-19 15:09:26.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/au1000/common/au1xxx_irqmap.c	2005-01-30 09:01:27.000000000 +0100
 @@ -172,14 +172,14 @@
  	{ AU1550_PSC1_INT, INTC_INT_HIGH_LEVEL, 0},
  	{ AU1550_PSC2_INT, INTC_INT_HIGH_LEVEL, 0},
@@ -47,9 +169,9 @@ diff -Nur linux-2.4.29/arch/mips/au1000/common/au1xxx_irqmap.c linux-mips/arch/m
  	{ AU1200_NAND_INT, INTC_INT_RISE_EDGE, 0},
  	{ AU1200_USB_INT, INTC_INT_HIGH_LEVEL, 0 },
  	{ AU1200_LCD_INT, INTC_INT_HIGH_LEVEL, 0},
-diff -Nur linux-2.4.29/arch/mips/au1000/common/cputable.c linux-mips/arch/mips/au1000/common/cputable.c
---- linux-2.4.29/arch/mips/au1000/common/cputable.c	2005-01-19 15:09:26.000000000 +0100
-+++ linux-mips/arch/mips/au1000/common/cputable.c	2005-01-30 09:01:27.000000000 +0100
+diff -Nur linux-2.4.30/arch/mips/au1000/common/cputable.c linux-2.4.30-mips/arch/mips/au1000/common/cputable.c
+--- linux-2.4.30/arch/mips/au1000/common/cputable.c	2005-01-19 15:09:26.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/au1000/common/cputable.c	2005-01-30 09:01:27.000000000 +0100
 @@ -39,7 +39,8 @@
      { 0xffffffff, 0x02030203, "Au1100 BD", 0, 1 },
      { 0xffffffff, 0x02030204, "Au1100 BE", 0, 1 },
@@ -60,9 +182,9 @@ diff -Nur linux-2.4.29/arch/mips/au1000/common/cputable.c linux-mips/arch/mips/a
      { 0x00000000, 0x00000000, "Unknown Au1xxx", 1, 0 },
  };
  
-diff -Nur linux-2.4.29/arch/mips/au1000/common/dbdma.c linux-mips/arch/mips/au1000/common/dbdma.c
---- linux-2.4.29/arch/mips/au1000/common/dbdma.c	2005-01-19 15:09:26.000000000 +0100
-+++ linux-mips/arch/mips/au1000/common/dbdma.c	2005-02-08 07:28:37.000000000 +0100
+diff -Nur linux-2.4.30/arch/mips/au1000/common/dbdma.c linux-2.4.30-mips/arch/mips/au1000/common/dbdma.c
+--- linux-2.4.30/arch/mips/au1000/common/dbdma.c	2005-01-19 15:09:26.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/au1000/common/dbdma.c	2005-02-08 07:28:37.000000000 +0100
 @@ -41,6 +41,8 @@
  #include <asm/au1xxx_dbdma.h>
  #include <asm/system.h>
@@ -641,9 +763,9 @@ diff -Nur linux-2.4.29/arch/mips/au1000/common/dbdma.c linux-mips/arch/mips/au10
 +
  #endif /* defined(CONFIG_SOC_AU1550) || defined(CONFIG_SOC_AU1200) */
  
-diff -Nur linux-2.4.29/arch/mips/au1000/common/gpio.c linux-mips/arch/mips/au1000/common/gpio.c
---- linux-2.4.29/arch/mips/au1000/common/gpio.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-mips/arch/mips/au1000/common/gpio.c	2005-01-30 09:01:27.000000000 +0100
+diff -Nur linux-2.4.30/arch/mips/au1000/common/gpio.c linux-2.4.30-mips/arch/mips/au1000/common/gpio.c
+--- linux-2.4.30/arch/mips/au1000/common/gpio.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/au1000/common/gpio.c	2005-01-30 09:01:27.000000000 +0100
 @@ -0,0 +1,118 @@
 +/*
 + *  This program is free software; you can redistribute	 it and/or modify it
@@ -763,9 +885,9 @@ diff -Nur linux-2.4.29/arch/mips/au1000/common/gpio.c linux-mips/arch/mips/au100
 +EXPORT_SYMBOL(au1xxx_gpio_tristate);
 +EXPORT_SYMBOL(au1xxx_gpio_write);
 +EXPORT_SYMBOL(au1xxx_gpio_read);
-diff -Nur linux-2.4.29/arch/mips/au1000/common/irq.c linux-mips/arch/mips/au1000/common/irq.c
---- linux-2.4.29/arch/mips/au1000/common/irq.c	2005-01-19 15:09:26.000000000 +0100
-+++ linux-mips/arch/mips/au1000/common/irq.c	2005-03-13 08:56:57.000000000 +0100
+diff -Nur linux-2.4.30/arch/mips/au1000/common/irq.c linux-2.4.30-mips/arch/mips/au1000/common/irq.c
+--- linux-2.4.30/arch/mips/au1000/common/irq.c	2005-01-19 15:09:26.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/au1000/common/irq.c	2005-03-13 08:56:57.000000000 +0100
 @@ -303,8 +303,30 @@
  };
  
@@ -833,24 +955,9 @@ diff -Nur linux-2.4.29/arch/mips/au1000/common/irq.c linux-mips/arch/mips/au1000
  }
  
  
-diff -Nur linux-2.4.29/arch/mips/au1000/common/Makefile linux-mips/arch/mips/au1000/common/Makefile
---- linux-2.4.29/arch/mips/au1000/common/Makefile	2005-01-19 15:09:26.000000000 +0100
-+++ linux-mips/arch/mips/au1000/common/Makefile	2005-01-30 09:01:27.000000000 +0100
-@@ -19,9 +19,9 @@
- export-objs		= prom.o clocks.o power.o usbdev.o
- 
- obj-y := prom.o int-handler.o irq.o puts.o time.o reset.o cputable.o \
--	au1xxx_irqmap.o clocks.o power.o setup.o sleeper.o dma.o dbdma.o
-+	au1xxx_irqmap.o clocks.o power.o setup.o sleeper.o dma.o dbdma.o gpio.o
-   
--export-objs += dma.o dbdma.o
-+export-objs += dma.o dbdma.o gpio.o
- 
- obj-$(CONFIG_AU1X00_USB_DEVICE) += usbdev.o
- obj-$(CONFIG_KGDB) += dbg_io.o
-diff -Nur linux-2.4.29/arch/mips/au1000/common/pci_fixup.c linux-mips/arch/mips/au1000/common/pci_fixup.c
---- linux-2.4.29/arch/mips/au1000/common/pci_fixup.c	2005-01-19 15:09:26.000000000 +0100
-+++ linux-mips/arch/mips/au1000/common/pci_fixup.c	2004-12-03 09:00:32.000000000 +0100
+diff -Nur linux-2.4.30/arch/mips/au1000/common/pci_fixup.c linux-2.4.30-mips/arch/mips/au1000/common/pci_fixup.c
+--- linux-2.4.30/arch/mips/au1000/common/pci_fixup.c	2005-01-19 15:09:26.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/au1000/common/pci_fixup.c	2004-12-03 09:00:32.000000000 +0100
 @@ -75,9 +75,13 @@
  
  #ifdef CONFIG_NONCOHERENT_IO
@@ -867,9 +974,9 @@ diff -Nur linux-2.4.29/arch/mips/au1000/common/pci_fixup.c linux-mips/arch/mips/
  	printk("Non-coherent PCI accesses enabled\n");
  #endif
  
-diff -Nur linux-2.4.29/arch/mips/au1000/common/pci_ops.c linux-mips/arch/mips/au1000/common/pci_ops.c
---- linux-2.4.29/arch/mips/au1000/common/pci_ops.c	2004-02-18 14:36:30.000000000 +0100
-+++ linux-mips/arch/mips/au1000/common/pci_ops.c	2005-02-27 23:14:24.000000000 +0100
+diff -Nur linux-2.4.30/arch/mips/au1000/common/pci_ops.c linux-2.4.30-mips/arch/mips/au1000/common/pci_ops.c
+--- linux-2.4.30/arch/mips/au1000/common/pci_ops.c	2004-02-18 14:36:30.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/au1000/common/pci_ops.c	2005-02-27 23:14:24.000000000 +0100
 @@ -162,6 +162,7 @@
  static int config_access(unsigned char access_type, struct pci_dev *dev, 
  			 unsigned char where, u32 * data)
@@ -911,9 +1018,9 @@ diff -Nur linux-2.4.29/arch/mips/au1000/common/pci_ops.c linux-mips/arch/mips/au
  }
  #endif
  
-diff -Nur linux-2.4.29/arch/mips/au1000/common/power.c linux-mips/arch/mips/au1000/common/power.c
---- linux-2.4.29/arch/mips/au1000/common/power.c	2005-01-19 15:09:26.000000000 +0100
-+++ linux-mips/arch/mips/au1000/common/power.c	2005-01-30 09:01:27.000000000 +0100
+diff -Nur linux-2.4.30/arch/mips/au1000/common/power.c linux-2.4.30-mips/arch/mips/au1000/common/power.c
+--- linux-2.4.30/arch/mips/au1000/common/power.c	2005-01-19 15:09:26.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/au1000/common/power.c	2005-04-07 02:37:19.000000000 +0200
 @@ -50,7 +50,6 @@
  
  static void calibrate_delay(void);
@@ -1003,10 +1110,25 @@ diff -Nur linux-2.4.29/arch/mips/au1000/common/power.c linux-mips/arch/mips/au10
  		au_sleep();
  		retval = pm_send_all(PM_RESUME, (void *) 0);
  	}
-@@ -312,120 +310,9 @@
- }
+@@ -296,7 +294,6 @@
+ 			 void *buffer, size_t * len)
+ {
+ 	int retval = 0;
+-	void	au1k_wait(void);
  
+ 	if (!write) {
+ 		*len = 0;
+@@ -305,119 +302,9 @@
+ 		if (retval)
+ 			return retval;
+ 		suspend_mode = 1;
+-		au1k_wait();
+-		retval = pm_send_all(PM_RESUME, (void *) 0);
+-	}
+-	return retval;
+-}
  
+-
 -static int pm_do_freq(ctl_table * ctl, int write, struct file *file,
 -		      void *buffer, size_t * len)
 -{
@@ -1099,7 +1221,8 @@ diff -Nur linux-2.4.29/arch/mips/au1000/common/power.c linux-mips/arch/mips/au10
 -				au_sync_delay(10);
 -			}
 -		}
--	}
++		retval = pm_send_all(PM_RESUME, (void *) 0);
+ 	}
 -
 -
 -	/* We don't want _any_ interrupts other than
@@ -1113,10 +1236,10 @@ diff -Nur linux-2.4.29/arch/mips/au1000/common/power.c linux-mips/arch/mips/au10
 -	calibrate_delay();
 -	restore_local_and_enable(0, intc0_mask);
 -	restore_local_and_enable(1, intc1_mask);
--	return retval;
--}
--
--
+ 	return retval;
+ }
+ 
+@@ -425,7 +312,6 @@
  static struct ctl_table pm_table[] = {
  	{ACPI_S1_SLP_TYP, "suspend", NULL, 0, 0600, NULL, &pm_do_suspend},
  	{ACPI_SLEEP, "sleep", NULL, 0, 0600, NULL, &pm_do_sleep},
@@ -1124,10 +1247,19 @@ diff -Nur linux-2.4.29/arch/mips/au1000/common/power.c linux-mips/arch/mips/au10
  	{0}
  };
  
-diff -Nur linux-2.4.29/arch/mips/au1000/common/reset.c linux-mips/arch/mips/au1000/common/reset.c
---- linux-2.4.29/arch/mips/au1000/common/reset.c	2005-01-19 15:09:26.000000000 +0100
-+++ linux-mips/arch/mips/au1000/common/reset.c	2005-02-27 23:11:54.000000000 +0100
-@@ -144,6 +144,26 @@
+diff -Nur linux-2.4.30/arch/mips/au1000/common/reset.c linux-2.4.30-mips/arch/mips/au1000/common/reset.c
+--- linux-2.4.30/arch/mips/au1000/common/reset.c	2005-01-19 15:09:26.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/au1000/common/reset.c	2005-03-19 08:17:51.000000000 +0100
+@@ -37,8 +37,6 @@
+ #include <asm/system.h>
+ #include <asm/au1000.h>
+ 
+-extern int au_sleep(void);
+-
+ void au1000_restart(char *command)
+ {
+ 	/* Set all integrated peripherals to disabled states */
+@@ -144,6 +142,26 @@
  		au_writel(0x00, 0xb1900064); /* sys_auxpll */
  		au_writel(0x00, 0xb1900100); /* sys_pininputen */
  		break;
@@ -1154,9 +1286,53 @@ diff -Nur linux-2.4.29/arch/mips/au1000/common/reset.c linux-mips/arch/mips/au10
  
  	default:
  		break;
-diff -Nur linux-2.4.29/arch/mips/au1000/common/setup.c linux-mips/arch/mips/au1000/common/setup.c
---- linux-2.4.29/arch/mips/au1000/common/setup.c	2005-01-19 15:09:26.000000000 +0100
-+++ linux-mips/arch/mips/au1000/common/setup.c	2005-01-30 09:01:27.000000000 +0100
+@@ -163,32 +181,23 @@
+ 
+ void au1000_halt(void)
+ {
+-#if defined(CONFIG_MIPS_PB1550)
+-	/* power off system */
+-	printk("\n** Powering off Pb1550\n");
+-	au_writew(au_readw(0xAF00001C) | (3<<14), 0xAF00001C); 
+-	au_sync();
+-	while(1); /* should not get here */
+-#endif
+-	printk(KERN_NOTICE "\n** You can safely turn off the power\n");
+-#ifdef CONFIG_MIPS_MIRAGE
+-	au_writel((1 << 26) | (1 << 10), GPIO2_OUTPUT);
+-#endif
+-#ifdef CONFIG_PM
+-	au_sleep();
+-
+-	/* should not get here */
+-	printk(KERN_ERR "Unable to put cpu in sleep mode\n");
+-	while(1);
+-#else
+-	while (1)
++	/* Use WAIT in a low-power infinite spin loop */
++	while (1) {
+ 		__asm__(".set\tmips3\n\t"
+ 	                "wait\n\t"
+ 			".set\tmips0");
+-#endif
++	}
+ }
+ 
+ void au1000_power_off(void)
+ {
++	extern void board_power_off (void);
++
++	printk(KERN_NOTICE "\n** You can safely turn off the power\n");
++
++	/* Give board a chance to power-off */
++	board_power_off();
++
++	/* If board can't power-off, spin forever */
+ 	au1000_halt();
+ }
+diff -Nur linux-2.4.30/arch/mips/au1000/common/setup.c linux-2.4.30-mips/arch/mips/au1000/common/setup.c
+--- linux-2.4.30/arch/mips/au1000/common/setup.c	2005-01-19 15:09:26.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/au1000/common/setup.c	2005-01-30 09:01:27.000000000 +0100
 @@ -174,6 +174,40 @@
  	initrd_end = (unsigned long)&__rd_end;
  #endif
@@ -1251,9 +1427,9 @@ diff -Nur linux-2.4.29/arch/mips/au1000/common/setup.c linux-mips/arch/mips/au10
  	if ((ide_ops == NULL) || (ide_ops == &no_ide_ops))
  		ide_ops = &std_ide_ops;
  #endif
-diff -Nur linux-2.4.29/arch/mips/au1000/common/sleeper.S linux-mips/arch/mips/au1000/common/sleeper.S
---- linux-2.4.29/arch/mips/au1000/common/sleeper.S	2004-02-18 14:36:30.000000000 +0100
-+++ linux-mips/arch/mips/au1000/common/sleeper.S	2005-01-30 09:01:27.000000000 +0100
+diff -Nur linux-2.4.30/arch/mips/au1000/common/sleeper.S linux-2.4.30-mips/arch/mips/au1000/common/sleeper.S
+--- linux-2.4.30/arch/mips/au1000/common/sleeper.S	2004-02-18 14:36:30.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/au1000/common/sleeper.S	2005-01-30 09:01:27.000000000 +0100
 @@ -15,17 +15,48 @@
  #include <asm/addrspace.h>
  #include <asm/regdef.h>
@@ -1522,9 +1698,9 @@ diff -Nur linux-2.4.29/arch/mips/au1000/common/sleeper.S linux-mips/arch/mips/au
 +	.set reorder
  END(save_and_sleep)
 +
-diff -Nur linux-2.4.29/arch/mips/au1000/common/time.c linux-mips/arch/mips/au1000/common/time.c
---- linux-2.4.29/arch/mips/au1000/common/time.c	2005-01-19 15:09:26.000000000 +0100
-+++ linux-mips/arch/mips/au1000/common/time.c	2005-03-13 08:56:57.000000000 +0100
+diff -Nur linux-2.4.30/arch/mips/au1000/common/time.c linux-2.4.30-mips/arch/mips/au1000/common/time.c
+--- linux-2.4.30/arch/mips/au1000/common/time.c	2005-01-19 15:09:26.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/au1000/common/time.c	2005-04-08 10:33:17.000000000 +0200
 @@ -50,7 +50,6 @@
  #include <linux/mc146818rtc.h>
  #include <linux/timex.h>
@@ -1533,7 +1709,15 @@ diff -Nur linux-2.4.29/arch/mips/au1000/common/time.c linux-mips/arch/mips/au100
  extern void do_softirq(void);
  extern volatile unsigned long wall_jiffies;
  unsigned long missed_heart_beats = 0;
-@@ -66,7 +65,7 @@
+@@ -59,14 +58,14 @@
+ static unsigned long r4k_cur;    /* What counter should be at next timer irq */
+ extern rwlock_t xtime_lock;
+ int	no_au1xxx_32khz;
+-void	(*au1k_wait_ptr)(void);
++extern int allow_au1k_wait; 	/* default off for CP0 Counter */
+ 
+ /* Cycle counter value at the previous timer interrupt.. */
+ static unsigned int timerhi = 0, timerlo = 0;
  
  #ifdef CONFIG_PM
  #define MATCH20_INC 328
@@ -1542,7 +1726,15 @@ diff -Nur linux-2.4.29/arch/mips/au1000/common/time.c linux-mips/arch/mips/au100
  static unsigned long last_pc0, last_match20;
  #endif
  
-@@ -437,9 +436,6 @@
+@@ -385,7 +384,6 @@
+ {
+         unsigned int est_freq;
+ 	extern unsigned long (*do_gettimeoffset)(void);
+-	extern void au1k_wait(void);
+ 
+ 	printk("calculating r4koff... ");
+ 	r4k_offset = cal_r4koff();
+@@ -437,9 +435,6 @@
  		au_writel(0, SYS_TOYWRITE);
  		while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_C0S);
  
@@ -1552,7 +1744,7 @@ diff -Nur linux-2.4.29/arch/mips/au1000/common/time.c linux-mips/arch/mips/au100
  		while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_M20);
  
  		/* setup match20 to interrupt once every 10ms */
-@@ -447,7 +443,7 @@
+@@ -447,13 +442,13 @@
  		au_writel(last_match20 + MATCH20_INC, SYS_TOYMATCH2);
  		au_sync();
  		while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_M20);
@@ -1561,9 +1753,31 @@ diff -Nur linux-2.4.29/arch/mips/au1000/common/time.c linux-mips/arch/mips/au100
  
  		do_gettimeoffset = do_fast_pm_gettimeoffset;
  
-diff -Nur linux-2.4.29/arch/mips/au1000/db1x00/board_setup.c linux-mips/arch/mips/au1000/db1x00/board_setup.c
---- linux-2.4.29/arch/mips/au1000/db1x00/board_setup.c	2005-01-19 15:09:26.000000000 +0100
-+++ linux-mips/arch/mips/au1000/db1x00/board_setup.c	2005-01-30 09:06:19.000000000 +0100
+ 		/* We can use the real 'wait' instruction.
+ 		*/
+-		au1k_wait_ptr = au1k_wait;
++		allow_au1k_wait = 1;
+ 	}
+ 
+ #else
+diff -Nur linux-2.4.30/arch/mips/au1000/db1x00/Makefile linux-2.4.30-mips/arch/mips/au1000/db1x00/Makefile
+--- linux-2.4.30/arch/mips/au1000/db1x00/Makefile	2005-01-19 15:09:26.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/au1000/db1x00/Makefile	2005-01-30 09:06:19.000000000 +0100
+@@ -17,4 +17,11 @@
+ obj-y := init.o board_setup.o irqmap.o
+ obj-$(CONFIG_WM97XX_COMODULE) += mirage_ts.o
+ 
++ifdef CONFIG_MIPS_DB1100
++ifdef CONFIG_MMC
++obj-y += mmc_support.o
++export-objs += mmc_support.o
++endif
++endif
++
+ include $(TOPDIR)/Rules.make
+diff -Nur linux-2.4.30/arch/mips/au1000/db1x00/board_setup.c linux-2.4.30-mips/arch/mips/au1000/db1x00/board_setup.c
+--- linux-2.4.30/arch/mips/au1000/db1x00/board_setup.c	2005-01-19 15:09:26.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/au1000/db1x00/board_setup.c	2005-03-19 08:17:51.000000000 +0100
 @@ -46,10 +46,22 @@
  #include <asm/au1000.h>
  #include <asm/db1x00.h>
@@ -1590,7 +1804,21 @@ diff -Nur linux-2.4.29/arch/mips/au1000/db1x00/board_setup.c linux-mips/arch/mip
  
  void board_reset (void)
  {
-@@ -108,8 +120,42 @@
+@@ -57,6 +69,13 @@
+ 	au_writel(0x00000000, 0xAE00001C);
+ }
+ 
++void board_power_off (void)
++{
++#ifdef CONFIG_MIPS_MIRAGE
++	au_writel((1 << 26) | (1 << 10), GPIO2_OUTPUT);
++#endif
++}
++
+ void __init board_setup(void)
+ {
+ 	u32 pin_func;
+@@ -108,8 +127,42 @@
  	au_writel(0x02000200, GPIO2_OUTPUT);
  #endif
  
@@ -1633,9 +1861,9 @@ diff -Nur linux-2.4.29/arch/mips/au1000/db1x00/board_setup.c linux-mips/arch/mip
  #ifdef CONFIG_MIPS_DB1000
      printk("AMD Alchemy Au1000/Db1000 Board\n");
  #endif
-diff -Nur linux-2.4.29/arch/mips/au1000/db1x00/irqmap.c linux-mips/arch/mips/au1000/db1x00/irqmap.c
---- linux-2.4.29/arch/mips/au1000/db1x00/irqmap.c	2005-01-19 15:09:26.000000000 +0100
-+++ linux-mips/arch/mips/au1000/db1x00/irqmap.c	2005-01-30 09:06:19.000000000 +0100
+diff -Nur linux-2.4.30/arch/mips/au1000/db1x00/irqmap.c linux-2.4.30-mips/arch/mips/au1000/db1x00/irqmap.c
+--- linux-2.4.30/arch/mips/au1000/db1x00/irqmap.c	2005-01-19 15:09:26.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/au1000/db1x00/irqmap.c	2005-01-30 09:06:19.000000000 +0100
 @@ -53,6 +53,7 @@
  #ifdef CONFIG_MIPS_DB1550
  	{ AU1000_GPIO_3, INTC_INT_LOW_LEVEL, 0 }, // PCMCIA Card 0 IRQ#
@@ -1644,24 +1872,9 @@ diff -Nur linux-2.4.29/arch/mips/au1000/db1x00/irqmap.c linux-mips/arch/mips/au1
  #else
  	{ AU1000_GPIO_0, INTC_INT_LOW_LEVEL, 0 }, // PCMCIA Card 0 Fully_Interted#
  	{ AU1000_GPIO_1, INTC_INT_LOW_LEVEL, 0 }, // PCMCIA Card 0 STSCHG#
-diff -Nur linux-2.4.29/arch/mips/au1000/db1x00/Makefile linux-mips/arch/mips/au1000/db1x00/Makefile
---- linux-2.4.29/arch/mips/au1000/db1x00/Makefile	2005-01-19 15:09:26.000000000 +0100
-+++ linux-mips/arch/mips/au1000/db1x00/Makefile	2005-01-30 09:06:19.000000000 +0100
-@@ -17,4 +17,11 @@
- obj-y := init.o board_setup.o irqmap.o
- obj-$(CONFIG_WM97XX_COMODULE) += mirage_ts.o
- 
-+ifdef CONFIG_MIPS_DB1100
-+ifdef CONFIG_MMC
-+obj-y += mmc_support.o
-+export-objs += mmc_support.o
-+endif
-+endif
-+
- include $(TOPDIR)/Rules.make
-diff -Nur linux-2.4.29/arch/mips/au1000/db1x00/mmc_support.c linux-mips/arch/mips/au1000/db1x00/mmc_support.c
---- linux-2.4.29/arch/mips/au1000/db1x00/mmc_support.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-mips/arch/mips/au1000/db1x00/mmc_support.c	2005-01-30 09:07:01.000000000 +0100
+diff -Nur linux-2.4.30/arch/mips/au1000/db1x00/mmc_support.c linux-2.4.30-mips/arch/mips/au1000/db1x00/mmc_support.c
+--- linux-2.4.30/arch/mips/au1000/db1x00/mmc_support.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/au1000/db1x00/mmc_support.c	2005-01-30 09:07:01.000000000 +0100
 @@ -0,0 +1,126 @@
 +/*
 + * BRIEF MODULE DESCRIPTION
@@ -1789,9 +2002,38 @@ diff -Nur linux-2.4.29/arch/mips/au1000/db1x00/mmc_support.c linux-mips/arch/mip
 +EXPORT_SYMBOL(mmc_power_on);
 +EXPORT_SYMBOL(mmc_power_off);
 +
-diff -Nur linux-2.4.29/arch/mips/au1000/ficmmp/au1200_ibutton.c linux-mips/arch/mips/au1000/ficmmp/au1200_ibutton.c
---- linux-2.4.29/arch/mips/au1000/ficmmp/au1200_ibutton.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-mips/arch/mips/au1000/ficmmp/au1200_ibutton.c	2005-02-03 07:35:29.000000000 +0100
+diff -Nur linux-2.4.30/arch/mips/au1000/ficmmp/Makefile linux-2.4.30-mips/arch/mips/au1000/ficmmp/Makefile
+--- linux-2.4.30/arch/mips/au1000/ficmmp/Makefile	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/au1000/ficmmp/Makefile	2005-01-30 09:01:27.000000000 +0100
+@@ -0,0 +1,25 @@
++#
++#  Copyright 2000 MontaVista Software Inc.
++#  Author: MontaVista Software, Inc.
++#     	ppopov@mvista.com or source@mvista.com
++#
++# Makefile for the Alchemy Semiconductor FIC board.
++#
++# Note! Dependencies are done automagically by 'make dep', which also
++# removes any old dependencies. DON'T put your own dependencies here
++# unless it's something special (ie not a .c file).
++#
++
++USE_STANDARD_AS_RULE := true
++
++O_TARGET := ficmmp.o
++
++obj-y := init.o board_setup.o irqmap.o au1200_ibutton.o au1xxx_dock.o
++
++ifdef CONFIG_MMC
++obj-y += mmc_support.o
++export-objs +=mmc_support.o
++endif
++
++
++include $(TOPDIR)/Rules.make
+diff -Nur linux-2.4.30/arch/mips/au1000/ficmmp/au1200_ibutton.c linux-2.4.30-mips/arch/mips/au1000/ficmmp/au1200_ibutton.c
+--- linux-2.4.30/arch/mips/au1000/ficmmp/au1200_ibutton.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/au1000/ficmmp/au1200_ibutton.c	2005-02-03 07:35:29.000000000 +0100
 @@ -0,0 +1,270 @@
 +/* ---------------------------------------------------------------------- 
 + *  mtwilson_keys.c
@@ -2063,9 +2305,9 @@ diff -Nur linux-2.4.29/arch/mips/au1000/ficmmp/au1200_ibutton.c linux-mips/arch/
 +MODULE_AUTHOR( DRIVER_AUTHOR );
 +MODULE_DESCRIPTION( DRIVER_DESC );
 +MODULE_LICENSE("GPL");
-diff -Nur linux-2.4.29/arch/mips/au1000/ficmmp/au1xxx_dock.c linux-mips/arch/mips/au1000/ficmmp/au1xxx_dock.c
---- linux-2.4.29/arch/mips/au1000/ficmmp/au1xxx_dock.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-mips/arch/mips/au1000/ficmmp/au1xxx_dock.c	2005-01-30 09:01:27.000000000 +0100
+diff -Nur linux-2.4.30/arch/mips/au1000/ficmmp/au1xxx_dock.c linux-2.4.30-mips/arch/mips/au1000/ficmmp/au1xxx_dock.c
+--- linux-2.4.30/arch/mips/au1000/ficmmp/au1xxx_dock.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/au1000/ficmmp/au1xxx_dock.c	2005-01-30 09:01:27.000000000 +0100
 @@ -0,0 +1,261 @@
 +/*
 + *  Copyright (C) 2003 Metrowerks, All Rights Reserved.
@@ -2328,10 +2570,10 @@ diff -Nur linux-2.4.29/arch/mips/au1000/ficmmp/au1xxx_dock.c linux-mips/arch/mip
 +
 +module_init(au1xxx_dock_init);
 +module_exit(au1xxx_dock_exit);
-diff -Nur linux-2.4.29/arch/mips/au1000/ficmmp/board_setup.c linux-mips/arch/mips/au1000/ficmmp/board_setup.c
---- linux-2.4.29/arch/mips/au1000/ficmmp/board_setup.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-mips/arch/mips/au1000/ficmmp/board_setup.c	2005-03-13 09:04:16.000000000 +0100
-@@ -0,0 +1,222 @@
+diff -Nur linux-2.4.30/arch/mips/au1000/ficmmp/board_setup.c linux-2.4.30-mips/arch/mips/au1000/ficmmp/board_setup.c
+--- linux-2.4.30/arch/mips/au1000/ficmmp/board_setup.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/au1000/ficmmp/board_setup.c	2005-03-19 08:17:51.000000000 +0100
+@@ -0,0 +1,226 @@
 +/*
 + *
 + * BRIEF MODULE DESCRIPTION
@@ -2408,6 +2650,10 @@ diff -Nur linux-2.4.29/arch/mips/au1000/ficmmp/board_setup.c linux-mips/arch/mip
 +	au_writel(0, 0xAD80001C);
 +}
 +
++void board_power_off (void)
++{
++}
++
 +void __init board_setup(void)
 +{
 +	char *argptr = NULL;
@@ -2554,9 +2800,9 @@ diff -Nur linux-2.4.29/arch/mips/au1000/ficmmp/board_setup.c linux-mips/arch/mip
 +	return 0;
 +}
 +
-diff -Nur linux-2.4.29/arch/mips/au1000/ficmmp/init.c linux-mips/arch/mips/au1000/ficmmp/init.c
---- linux-2.4.29/arch/mips/au1000/ficmmp/init.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-mips/arch/mips/au1000/ficmmp/init.c	2005-01-30 09:01:27.000000000 +0100
+diff -Nur linux-2.4.30/arch/mips/au1000/ficmmp/init.c linux-2.4.30-mips/arch/mips/au1000/ficmmp/init.c
+--- linux-2.4.30/arch/mips/au1000/ficmmp/init.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/au1000/ficmmp/init.c	2005-01-30 09:01:27.000000000 +0100
 @@ -0,0 +1,76 @@
 +/*
 + *
@@ -2634,9 +2880,9 @@ diff -Nur linux-2.4.29/arch/mips/au1000/ficmmp/init.c linux-mips/arch/mips/au100
 +	return 0;
 +}
 +
-diff -Nur linux-2.4.29/arch/mips/au1000/ficmmp/irqmap.c linux-mips/arch/mips/au1000/ficmmp/irqmap.c
---- linux-2.4.29/arch/mips/au1000/ficmmp/irqmap.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-mips/arch/mips/au1000/ficmmp/irqmap.c	2005-01-30 09:01:27.000000000 +0100
+diff -Nur linux-2.4.30/arch/mips/au1000/ficmmp/irqmap.c linux-2.4.30-mips/arch/mips/au1000/ficmmp/irqmap.c
+--- linux-2.4.30/arch/mips/au1000/ficmmp/irqmap.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/au1000/ficmmp/irqmap.c	2005-01-30 09:01:27.000000000 +0100
 @@ -0,0 +1,61 @@
 +/*
 + * BRIEF MODULE DESCRIPTION
@@ -2699,39 +2945,36 @@ diff -Nur linux-2.4.29/arch/mips/au1000/ficmmp/irqmap.c linux-mips/arch/mips/au1
 +
 +int au1xxx_nr_irqs = sizeof(au1xxx_irq_map)/sizeof(au1xxx_irq_map_t);
 +
-diff -Nur linux-2.4.29/arch/mips/au1000/ficmmp/Makefile linux-mips/arch/mips/au1000/ficmmp/Makefile
---- linux-2.4.29/arch/mips/au1000/ficmmp/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ linux-mips/arch/mips/au1000/ficmmp/Makefile	2005-01-30 09:01:27.000000000 +0100
-@@ -0,0 +1,25 @@
-+#
-+#  Copyright 2000 MontaVista Software Inc.
-+#  Author: MontaVista Software, Inc.
-+#     	ppopov@mvista.com or source@mvista.com
-+#
-+# Makefile for the Alchemy Semiconductor FIC board.
-+#
-+# Note! Dependencies are done automagically by 'make dep', which also
-+# removes any old dependencies. DON'T put your own dependencies here
-+# unless it's something special (ie not a .c file).
-+#
-+
-+USE_STANDARD_AS_RULE := true
-+
-+O_TARGET := ficmmp.o
-+
-+obj-y := init.o board_setup.o irqmap.o au1200_ibutton.o au1xxx_dock.o
+diff -Nur linux-2.4.30/arch/mips/au1000/hydrogen3/Makefile linux-2.4.30-mips/arch/mips/au1000/hydrogen3/Makefile
+--- linux-2.4.30/arch/mips/au1000/hydrogen3/Makefile	2005-01-19 15:09:26.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/au1000/hydrogen3/Makefile	2005-02-11 22:09:55.000000000 +0100
+@@ -14,6 +14,11 @@
+ 
+ O_TARGET := hydrogen3.o
+ 
+-obj-y := init.o board_setup.o irqmap.o
++obj-y := init.o board_setup.o irqmap.o buttons.o
 +
 +ifdef CONFIG_MMC
 +obj-y += mmc_support.o
 +export-objs +=mmc_support.o
 +endif
+ 
+ include $(TOPDIR)/Rules.make
+diff -Nur linux-2.4.30/arch/mips/au1000/hydrogen3/board_setup.c linux-2.4.30-mips/arch/mips/au1000/hydrogen3/board_setup.c
+--- linux-2.4.30/arch/mips/au1000/hydrogen3/board_setup.c	2005-01-19 15:09:26.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/au1000/hydrogen3/board_setup.c	2005-03-19 08:17:51.000000000 +0100
+@@ -51,12 +51,19 @@
+ {
+ }
+ 
++void board_power_off (void)
++{
++}
 +
-+
-+include $(TOPDIR)/Rules.make
-diff -Nur linux-2.4.29/arch/mips/au1000/hydrogen3/board_setup.c linux-mips/arch/mips/au1000/hydrogen3/board_setup.c
---- linux-2.4.29/arch/mips/au1000/hydrogen3/board_setup.c	2005-01-19 15:09:26.000000000 +0100
-+++ linux-mips/arch/mips/au1000/hydrogen3/board_setup.c	2005-01-30 09:07:57.000000000 +0100
-@@ -57,6 +57,9 @@
+ void __init board_setup(void)
+ {
+ 	u32 pin_func;
  
  	rtc_ops = &no_rtc_ops;
  
@@ -2741,9 +2984,9 @@ diff -Nur linux-2.4.29/arch/mips/au1000/hydrogen3/board_setup.c linux-mips/arch/
  #ifdef CONFIG_AU1X00_USB_DEVICE
  	// 2nd USB port is USB device
  	pin_func = au_readl(SYS_PINFUNC) & (u32)(~0x8000);
-diff -Nur linux-2.4.29/arch/mips/au1000/hydrogen3/buttons.c linux-mips/arch/mips/au1000/hydrogen3/buttons.c
---- linux-2.4.29/arch/mips/au1000/hydrogen3/buttons.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-mips/arch/mips/au1000/hydrogen3/buttons.c	2005-02-11 22:09:55.000000000 +0100
+diff -Nur linux-2.4.30/arch/mips/au1000/hydrogen3/buttons.c linux-2.4.30-mips/arch/mips/au1000/hydrogen3/buttons.c
+--- linux-2.4.30/arch/mips/au1000/hydrogen3/buttons.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/au1000/hydrogen3/buttons.c	2005-02-11 22:09:55.000000000 +0100
 @@ -0,0 +1,308 @@
 +/*
 + *  Copyright (C) 2003 Metrowerks, All Rights Reserved.
@@ -3053,25 +3296,9 @@ diff -Nur linux-2.4.29/arch/mips/au1000/hydrogen3/buttons.c linux-mips/arch/mips
 +
 +module_init(hydrogen3_buttons_init);
 +module_exit(hydrogen3_buttons_exit);
-diff -Nur linux-2.4.29/arch/mips/au1000/hydrogen3/Makefile linux-mips/arch/mips/au1000/hydrogen3/Makefile
---- linux-2.4.29/arch/mips/au1000/hydrogen3/Makefile	2005-01-19 15:09:26.000000000 +0100
-+++ linux-mips/arch/mips/au1000/hydrogen3/Makefile	2005-02-11 22:09:55.000000000 +0100
-@@ -14,6 +14,11 @@
- 
- O_TARGET := hydrogen3.o
- 
--obj-y := init.o board_setup.o irqmap.o
-+obj-y := init.o board_setup.o irqmap.o buttons.o
-+
-+ifdef CONFIG_MMC
-+obj-y += mmc_support.o
-+export-objs +=mmc_support.o
-+endif
- 
- include $(TOPDIR)/Rules.make
-diff -Nur linux-2.4.29/arch/mips/au1000/hydrogen3/mmc_support.c linux-mips/arch/mips/au1000/hydrogen3/mmc_support.c
---- linux-2.4.29/arch/mips/au1000/hydrogen3/mmc_support.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-mips/arch/mips/au1000/hydrogen3/mmc_support.c	2005-02-02 05:27:06.000000000 +0100
+diff -Nur linux-2.4.30/arch/mips/au1000/hydrogen3/mmc_support.c linux-2.4.30-mips/arch/mips/au1000/hydrogen3/mmc_support.c
+--- linux-2.4.30/arch/mips/au1000/hydrogen3/mmc_support.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/au1000/hydrogen3/mmc_support.c	2005-02-02 05:27:06.000000000 +0100
 @@ -0,0 +1,89 @@
 +/*
 + * BRIEF MODULE DESCRIPTION
@@ -3162,9 +3389,9 @@ diff -Nur linux-2.4.29/arch/mips/au1000/hydrogen3/mmc_support.c linux-mips/arch/
 +EXPORT_SYMBOL(mmc_power_on);
 +EXPORT_SYMBOL(mmc_power_off);
 +
-diff -Nur linux-2.4.29/arch/mips/au1000/mtx-1/board_setup.c linux-mips/arch/mips/au1000/mtx-1/board_setup.c
---- linux-2.4.29/arch/mips/au1000/mtx-1/board_setup.c	2004-02-18 14:36:30.000000000 +0100
-+++ linux-mips/arch/mips/au1000/mtx-1/board_setup.c	2004-11-26 09:37:16.000000000 +0100
+diff -Nur linux-2.4.30/arch/mips/au1000/mtx-1/board_setup.c linux-2.4.30-mips/arch/mips/au1000/mtx-1/board_setup.c
+--- linux-2.4.30/arch/mips/au1000/mtx-1/board_setup.c	2004-02-18 14:36:30.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/au1000/mtx-1/board_setup.c	2004-11-26 09:37:16.000000000 +0100
 @@ -48,6 +48,12 @@
  
  extern struct rtc_ops no_rtc_ops;
@@ -3178,9 +3405,9 @@ diff -Nur linux-2.4.29/arch/mips/au1000/mtx-1/board_setup.c linux-mips/arch/mips
  void __init board_setup(void)
  {
  	rtc_ops = &no_rtc_ops;
-diff -Nur linux-2.4.29/arch/mips/au1000/mtx-1/irqmap.c linux-mips/arch/mips/au1000/mtx-1/irqmap.c
---- linux-2.4.29/arch/mips/au1000/mtx-1/irqmap.c	2005-01-19 15:09:26.000000000 +0100
-+++ linux-mips/arch/mips/au1000/mtx-1/irqmap.c	2004-11-26 09:37:16.000000000 +0100
+diff -Nur linux-2.4.30/arch/mips/au1000/mtx-1/irqmap.c linux-2.4.30-mips/arch/mips/au1000/mtx-1/irqmap.c
+--- linux-2.4.30/arch/mips/au1000/mtx-1/irqmap.c	2005-01-19 15:09:26.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/au1000/mtx-1/irqmap.c	2004-11-26 09:37:16.000000000 +0100
 @@ -72,10 +72,10 @@
  	 *	A       B       C       D
  	 */
@@ -3196,9 +3423,23 @@ diff -Nur linux-2.4.29/arch/mips/au1000/mtx-1/irqmap.c linux-mips/arch/mips/au10
  	};
  	const long min_idsel = 0, max_idsel = 3, irqs_per_slot = 4;
  	return PCI_IRQ_TABLE_LOOKUP;
-diff -Nur linux-2.4.29/arch/mips/au1000/pb1100/Makefile linux-mips/arch/mips/au1000/pb1100/Makefile
---- linux-2.4.29/arch/mips/au1000/pb1100/Makefile	2003-08-25 13:44:39.000000000 +0200
-+++ linux-mips/arch/mips/au1000/pb1100/Makefile	2005-01-30 09:10:29.000000000 +0100
+diff -Nur linux-2.4.30/arch/mips/au1000/pb1000/board_setup.c linux-2.4.30-mips/arch/mips/au1000/pb1000/board_setup.c
+--- linux-2.4.30/arch/mips/au1000/pb1000/board_setup.c	2005-01-19 15:09:26.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/au1000/pb1000/board_setup.c	2005-03-19 08:17:51.000000000 +0100
+@@ -58,6 +58,10 @@
+ {
+ }
+ 
++void board_power_off (void)
++{
++}
++
+ void __init board_setup(void)
+ {
+ 	u32 pin_func, static_cfg0;
+diff -Nur linux-2.4.30/arch/mips/au1000/pb1100/Makefile linux-2.4.30-mips/arch/mips/au1000/pb1100/Makefile
+--- linux-2.4.30/arch/mips/au1000/pb1100/Makefile	2003-08-25 13:44:39.000000000 +0200
++++ linux-2.4.30-mips/arch/mips/au1000/pb1100/Makefile	2005-01-30 09:10:29.000000000 +0100
 @@ -16,4 +16,10 @@
  
  obj-y := init.o board_setup.o irqmap.o
@@ -3210,9 +3451,23 @@ diff -Nur linux-2.4.29/arch/mips/au1000/pb1100/Makefile linux-mips/arch/mips/au1
 +endif
 +
  include $(TOPDIR)/Rules.make
-diff -Nur linux-2.4.29/arch/mips/au1000/pb1100/mmc_support.c linux-mips/arch/mips/au1000/pb1100/mmc_support.c
---- linux-2.4.29/arch/mips/au1000/pb1100/mmc_support.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-mips/arch/mips/au1000/pb1100/mmc_support.c	2005-01-30 09:10:29.000000000 +0100
+diff -Nur linux-2.4.30/arch/mips/au1000/pb1100/board_setup.c linux-2.4.30-mips/arch/mips/au1000/pb1100/board_setup.c
+--- linux-2.4.30/arch/mips/au1000/pb1100/board_setup.c	2005-01-19 15:09:26.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/au1000/pb1100/board_setup.c	2005-03-19 08:17:51.000000000 +0100
+@@ -62,6 +62,10 @@
+     au_writel(0x00000000, 0xAE00001C);
+ }
+ 
++void board_power_off (void)
++{
++}
++
+ void __init board_setup(void)
+ {
+ 	u32 pin_func;
+diff -Nur linux-2.4.30/arch/mips/au1000/pb1100/mmc_support.c linux-2.4.30-mips/arch/mips/au1000/pb1100/mmc_support.c
+--- linux-2.4.30/arch/mips/au1000/pb1100/mmc_support.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/au1000/pb1100/mmc_support.c	2005-01-30 09:10:29.000000000 +0100
 @@ -0,0 +1,126 @@
 +/*
 + * BRIEF MODULE DESCRIPTION
@@ -3340,10 +3595,39 @@ diff -Nur linux-2.4.29/arch/mips/au1000/pb1100/mmc_support.c linux-mips/arch/mip
 +EXPORT_SYMBOL(mmc_power_on);
 +EXPORT_SYMBOL(mmc_power_off);
 +
-diff -Nur linux-2.4.29/arch/mips/au1000/pb1200/board_setup.c linux-mips/arch/mips/au1000/pb1200/board_setup.c
---- linux-2.4.29/arch/mips/au1000/pb1200/board_setup.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-mips/arch/mips/au1000/pb1200/board_setup.c	2005-03-13 09:04:16.000000000 +0100
-@@ -0,0 +1,216 @@
+diff -Nur linux-2.4.30/arch/mips/au1000/pb1200/Makefile linux-2.4.30-mips/arch/mips/au1000/pb1200/Makefile
+--- linux-2.4.30/arch/mips/au1000/pb1200/Makefile	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/au1000/pb1200/Makefile	2005-01-30 09:01:27.000000000 +0100
+@@ -0,0 +1,25 @@
++#
++#  Copyright 2000 MontaVista Software Inc.
++#  Author: MontaVista Software, Inc.
++#     	ppopov@mvista.com or source@mvista.com
++#
++# Makefile for the Alchemy Semiconductor PB1000 board.
++#
++# Note! Dependencies are done automagically by 'make dep', which also
++# removes any old dependencies. DON'T put your own dependencies here
++# unless it's something special (ie not a .c file).
++#
++
++USE_STANDARD_AS_RULE := true
++
++O_TARGET := pb1200.o
++
++obj-y := init.o board_setup.o irqmap.o
++
++ifdef CONFIG_MMC
++obj-y += mmc_support.o
++export-objs +=mmc_support.o
++endif
++
++
++include $(TOPDIR)/Rules.make
+diff -Nur linux-2.4.30/arch/mips/au1000/pb1200/board_setup.c linux-2.4.30-mips/arch/mips/au1000/pb1200/board_setup.c
+--- linux-2.4.30/arch/mips/au1000/pb1200/board_setup.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/au1000/pb1200/board_setup.c	2005-03-19 08:17:51.000000000 +0100
+@@ -0,0 +1,221 @@
 +/*
 + *
 + * BRIEF MODULE DESCRIPTION
@@ -3427,6 +3711,11 @@ diff -Nur linux-2.4.29/arch/mips/au1000/pb1200/board_setup.c linux-mips/arch/mip
 +	bcsr->resets = 0;
 +}
 +
++void board_power_off (void)
++{
++	bcsr->resets = 0xC000;
++}
++
 +void __init board_setup(void)
 +{
 +	char *argptr = NULL;
@@ -3560,9 +3849,9 @@ diff -Nur linux-2.4.29/arch/mips/au1000/pb1200/board_setup.c linux-mips/arch/mip
 +	return 0;
 +}
 +
-diff -Nur linux-2.4.29/arch/mips/au1000/pb1200/init.c linux-mips/arch/mips/au1000/pb1200/init.c
---- linux-2.4.29/arch/mips/au1000/pb1200/init.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-mips/arch/mips/au1000/pb1200/init.c	2005-01-30 09:01:28.000000000 +0100
+diff -Nur linux-2.4.30/arch/mips/au1000/pb1200/init.c linux-2.4.30-mips/arch/mips/au1000/pb1200/init.c
+--- linux-2.4.30/arch/mips/au1000/pb1200/init.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/au1000/pb1200/init.c	2005-01-30 09:01:28.000000000 +0100
 @@ -0,0 +1,72 @@
 +/*
 + *
@@ -3636,9 +3925,9 @@ diff -Nur linux-2.4.29/arch/mips/au1000/pb1200/init.c linux-mips/arch/mips/au100
 +	return 0;
 +}
 +
-diff -Nur linux-2.4.29/arch/mips/au1000/pb1200/irqmap.c linux-mips/arch/mips/au1000/pb1200/irqmap.c
---- linux-2.4.29/arch/mips/au1000/pb1200/irqmap.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-mips/arch/mips/au1000/pb1200/irqmap.c	2005-01-30 09:01:28.000000000 +0100
+diff -Nur linux-2.4.30/arch/mips/au1000/pb1200/irqmap.c linux-2.4.30-mips/arch/mips/au1000/pb1200/irqmap.c
+--- linux-2.4.30/arch/mips/au1000/pb1200/irqmap.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/au1000/pb1200/irqmap.c	2005-01-30 09:01:28.000000000 +0100
 @@ -0,0 +1,180 @@
 +/*
 + * BRIEF MODULE DESCRIPTION
@@ -3820,38 +4109,9 @@ diff -Nur linux-2.4.29/arch/mips/au1000/pb1200/irqmap.c linux-mips/arch/mips/au1
 +	request of any source attached to the cascade */
 +}
 +
-diff -Nur linux-2.4.29/arch/mips/au1000/pb1200/Makefile linux-mips/arch/mips/au1000/pb1200/Makefile
---- linux-2.4.29/arch/mips/au1000/pb1200/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ linux-mips/arch/mips/au1000/pb1200/Makefile	2005-01-30 09:01:27.000000000 +0100
-@@ -0,0 +1,25 @@
-+#
-+#  Copyright 2000 MontaVista Software Inc.
-+#  Author: MontaVista Software, Inc.
-+#     	ppopov@mvista.com or source@mvista.com
-+#
-+# Makefile for the Alchemy Semiconductor PB1000 board.
-+#
-+# Note! Dependencies are done automagically by 'make dep', which also
-+# removes any old dependencies. DON'T put your own dependencies here
-+# unless it's something special (ie not a .c file).
-+#
-+
-+USE_STANDARD_AS_RULE := true
-+
-+O_TARGET := pb1200.o
-+
-+obj-y := init.o board_setup.o irqmap.o
-+
-+ifdef CONFIG_MMC
-+obj-y += mmc_support.o
-+export-objs +=mmc_support.o
-+endif
-+
-+
-+include $(TOPDIR)/Rules.make
-diff -Nur linux-2.4.29/arch/mips/au1000/pb1200/mmc_support.c linux-mips/arch/mips/au1000/pb1200/mmc_support.c
---- linux-2.4.29/arch/mips/au1000/pb1200/mmc_support.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-mips/arch/mips/au1000/pb1200/mmc_support.c	2005-01-30 09:01:28.000000000 +0100
+diff -Nur linux-2.4.30/arch/mips/au1000/pb1200/mmc_support.c linux-2.4.30-mips/arch/mips/au1000/pb1200/mmc_support.c
+--- linux-2.4.30/arch/mips/au1000/pb1200/mmc_support.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/au1000/pb1200/mmc_support.c	2005-01-30 09:01:28.000000000 +0100
 @@ -0,0 +1,141 @@
 +/*
 + * BRIEF MODULE DESCRIPTION
@@ -3994,10 +4254,24 @@ diff -Nur linux-2.4.29/arch/mips/au1000/pb1200/mmc_support.c linux-mips/arch/mip
 +EXPORT_SYMBOL(mmc_power_on);
 +EXPORT_SYMBOL(mmc_power_off);
 +
-diff -Nur linux-2.4.29/arch/mips/au1000/pb1550/board_setup.c linux-mips/arch/mips/au1000/pb1550/board_setup.c
---- linux-2.4.29/arch/mips/au1000/pb1550/board_setup.c	2005-01-19 15:09:26.000000000 +0100
-+++ linux-mips/arch/mips/au1000/pb1550/board_setup.c	2005-01-30 09:01:28.000000000 +0100
-@@ -48,6 +48,16 @@
+diff -Nur linux-2.4.30/arch/mips/au1000/pb1500/board_setup.c linux-2.4.30-mips/arch/mips/au1000/pb1500/board_setup.c
+--- linux-2.4.30/arch/mips/au1000/pb1500/board_setup.c	2005-01-19 15:09:26.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/au1000/pb1500/board_setup.c	2005-03-19 08:17:51.000000000 +0100
+@@ -62,6 +62,10 @@
+     au_writel(0x00000000, 0xAE00001C);
+ }
+ 
++void board_power_off (void)
++{
++}
++
+ void __init board_setup(void)
+ {
+ 	u32 pin_func;
+diff -Nur linux-2.4.30/arch/mips/au1000/pb1550/board_setup.c linux-2.4.30-mips/arch/mips/au1000/pb1550/board_setup.c
+--- linux-2.4.30/arch/mips/au1000/pb1550/board_setup.c	2005-01-19 15:09:26.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/au1000/pb1550/board_setup.c	2005-03-19 08:17:51.000000000 +0100
+@@ -48,12 +48,31 @@
  
  extern struct rtc_ops no_rtc_ops;
  
@@ -4014,7 +4288,22 @@ diff -Nur linux-2.4.29/arch/mips/au1000/pb1550/board_setup.c linux-mips/arch/mip
  void board_reset (void)
  {
      /* Hit BCSR.SYSTEM_CONTROL[SW_RST] */
-@@ -78,5 +88,36 @@
+ 	au_writew(au_readw(0xAF00001C) & ~(1<<15), 0xAF00001C);
+ }
+ 
++void board_power_off (void)
++{
++	/* power off system */
++	printk("\n** Powering off Pb1550\n");
++	au_writew(au_readw(0xAF00001C) | (3<<14), 0xAF00001C); 
++	au_sync();
++	while(1); /* should not get here */
++}
++
+ void __init board_setup(void)
+ {
+ 	u32 pin_func;
+@@ -78,5 +97,36 @@
  	au_writel(0, (u32)bcsr|0x10); /* turn off pcmcia power */
  	au_sync();
  
@@ -4051,9 +4340,9 @@ diff -Nur linux-2.4.29/arch/mips/au1000/pb1550/board_setup.c linux-mips/arch/mip
 +#endif
  	printk("AMD Alchemy Pb1550 Board\n");
  }
-diff -Nur linux-2.4.29/arch/mips/au1000/pb1550/irqmap.c linux-mips/arch/mips/au1000/pb1550/irqmap.c
---- linux-2.4.29/arch/mips/au1000/pb1550/irqmap.c	2005-01-19 15:09:26.000000000 +0100
-+++ linux-mips/arch/mips/au1000/pb1550/irqmap.c	2005-01-30 09:01:28.000000000 +0100
+diff -Nur linux-2.4.30/arch/mips/au1000/pb1550/irqmap.c linux-2.4.30-mips/arch/mips/au1000/pb1550/irqmap.c
+--- linux-2.4.30/arch/mips/au1000/pb1550/irqmap.c	2005-01-19 15:09:26.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/au1000/pb1550/irqmap.c	2005-01-30 09:01:28.000000000 +0100
 @@ -50,6 +50,9 @@
  au1xxx_irq_map_t au1xxx_irq_map[] = {
  	{ AU1000_GPIO_0, INTC_INT_LOW_LEVEL, 0 },
@@ -4064,9 +4353,9 @@ diff -Nur linux-2.4.29/arch/mips/au1000/pb1550/irqmap.c linux-mips/arch/mips/au1
  };
  
  int au1xxx_nr_irqs = sizeof(au1xxx_irq_map)/sizeof(au1xxx_irq_map_t);
-diff -Nur linux-2.4.29/arch/mips/config-shared.in linux-mips/arch/mips/config-shared.in
---- linux-2.4.29/arch/mips/config-shared.in	2005-01-19 15:09:27.000000000 +0100
-+++ linux-mips/arch/mips/config-shared.in	2005-01-30 09:01:26.000000000 +0100
+diff -Nur linux-2.4.30/arch/mips/config-shared.in linux-2.4.30-mips/arch/mips/config-shared.in
+--- linux-2.4.30/arch/mips/config-shared.in	2005-01-19 15:09:27.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/config-shared.in	2005-01-30 09:01:26.000000000 +0100
 @@ -21,16 +21,19 @@
  comment 'Machine selection'
  dep_bool 'Support for Acer PICA 1 chipset (EXPERIMENTAL)' CONFIG_ACER_PICA_61 $CONFIG_EXPERIMENTAL
@@ -4187,9 +4476,19 @@ diff -Nur linux-2.4.29/arch/mips/config-shared.in linux-mips/arch/mips/config-sh
       "$CONFIG_NEC_OSPREY" = "y" -o \
       "$CONFIG_NEC_EAGLE" = "y" -o \
       "$CONFIG_NINO" = "y" -o \
-diff -Nur linux-2.4.29/arch/mips/defconfig linux-mips/arch/mips/defconfig
---- linux-2.4.29/arch/mips/defconfig	2005-01-19 15:09:27.000000000 +0100
-+++ linux-mips/arch/mips/defconfig	2005-01-09 20:33:59.000000000 +0100
+diff -Nur linux-2.4.30/arch/mips/defconfig linux-2.4.30-mips/arch/mips/defconfig
+--- linux-2.4.30/arch/mips/defconfig	2005-01-19 15:09:27.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/defconfig	2005-03-18 13:13:21.000000000 +0100
+@@ -30,8 +30,8 @@
+ # CONFIG_MIPS_PB1000 is not set
+ # CONFIG_MIPS_PB1100 is not set
+ # CONFIG_MIPS_PB1500 is not set
+-# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_PB1550 is not set
++# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_XXS1500 is not set
+ # CONFIG_MIPS_MTX1 is not set
+ # CONFIG_COGENT_CSB250 is not set
 @@ -235,11 +235,6 @@
  #
  # CONFIG_IPX is not set
@@ -4202,7 +4501,7 @@ diff -Nur linux-2.4.29/arch/mips/defconfig linux-mips/arch/mips/defconfig
  # CONFIG_DECNET is not set
  # CONFIG_BRIDGE is not set
  # CONFIG_X25 is not set
-@@ -319,6 +314,7 @@
+@@ -319,9 +314,11 @@
  # CONFIG_SCSI_MEGARAID is not set
  # CONFIG_SCSI_MEGARAID2 is not set
  # CONFIG_SCSI_SATA is not set
@@ -4210,9 +4509,31 @@ diff -Nur linux-2.4.29/arch/mips/defconfig linux-mips/arch/mips/defconfig
  # CONFIG_SCSI_SATA_SVW is not set
  # CONFIG_SCSI_ATA_PIIX is not set
  # CONFIG_SCSI_SATA_NV is not set
-diff -Nur linux-2.4.29/arch/mips/defconfig-atlas linux-mips/arch/mips/defconfig-atlas
---- linux-2.4.29/arch/mips/defconfig-atlas	2005-01-19 15:09:27.000000000 +0100
-+++ linux-mips/arch/mips/defconfig-atlas	2005-01-09 20:33:59.000000000 +0100
++# CONFIG_SCSI_SATA_QSTOR is not set
+ # CONFIG_SCSI_SATA_PROMISE is not set
+ # CONFIG_SCSI_SATA_SX4 is not set
+ # CONFIG_SCSI_SATA_SIL is not set
+@@ -465,7 +462,6 @@
+ # CONFIG_SERIAL is not set
+ # CONFIG_SERIAL_EXTENDED is not set
+ # CONFIG_SERIAL_NONSTANDARD is not set
+-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
+ CONFIG_UNIX98_PTYS=y
+ CONFIG_UNIX98_PTY_COUNT=256
+ 
+diff -Nur linux-2.4.30/arch/mips/defconfig-atlas linux-2.4.30-mips/arch/mips/defconfig-atlas
+--- linux-2.4.30/arch/mips/defconfig-atlas	2005-01-19 15:09:27.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/defconfig-atlas	2005-03-18 13:13:21.000000000 +0100
+@@ -28,8 +28,8 @@
+ # CONFIG_MIPS_PB1000 is not set
+ # CONFIG_MIPS_PB1100 is not set
+ # CONFIG_MIPS_PB1500 is not set
+-# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_PB1550 is not set
++# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_XXS1500 is not set
+ # CONFIG_MIPS_MTX1 is not set
+ # CONFIG_COGENT_CSB250 is not set
 @@ -235,11 +235,6 @@
  #
  # CONFIG_IPX is not set
@@ -4225,7 +4546,7 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-atlas linux-mips/arch/mips/defconfig-
  # CONFIG_DECNET is not set
  # CONFIG_BRIDGE is not set
  # CONFIG_X25 is not set
-@@ -317,6 +312,7 @@
+@@ -317,9 +312,11 @@
  # CONFIG_SCSI_MEGARAID is not set
  # CONFIG_SCSI_MEGARAID2 is not set
  # CONFIG_SCSI_SATA is not set
@@ -4233,10 +4554,50 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-atlas linux-mips/arch/mips/defconfig-
  # CONFIG_SCSI_SATA_SVW is not set
  # CONFIG_SCSI_ATA_PIIX is not set
  # CONFIG_SCSI_SATA_NV is not set
-diff -Nur linux-2.4.29/arch/mips/defconfig-bosporus linux-mips/arch/mips/defconfig-bosporus
---- linux-2.4.29/arch/mips/defconfig-bosporus	2005-01-19 15:09:27.000000000 +0100
-+++ linux-mips/arch/mips/defconfig-bosporus	2005-01-30 09:01:26.000000000 +0100
-@@ -373,11 +373,6 @@
++# CONFIG_SCSI_SATA_QSTOR is not set
+ # CONFIG_SCSI_SATA_PROMISE is not set
+ # CONFIG_SCSI_SATA_SX4 is not set
+ # CONFIG_SCSI_SATA_SIL is not set
+@@ -528,7 +525,6 @@
+ CONFIG_SERIAL_CONSOLE=y
+ # CONFIG_SERIAL_EXTENDED is not set
+ # CONFIG_SERIAL_NONSTANDARD is not set
+-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
+ CONFIG_UNIX98_PTYS=y
+ CONFIG_UNIX98_PTY_COUNT=256
+ 
+diff -Nur linux-2.4.30/arch/mips/defconfig-bosporus linux-2.4.30-mips/arch/mips/defconfig-bosporus
+--- linux-2.4.30/arch/mips/defconfig-bosporus	2005-01-19 15:09:27.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/defconfig-bosporus	2005-03-18 13:13:21.000000000 +0100
+@@ -30,8 +30,8 @@
+ # CONFIG_MIPS_PB1000 is not set
+ # CONFIG_MIPS_PB1100 is not set
+ # CONFIG_MIPS_PB1500 is not set
+-# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_PB1550 is not set
++# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_XXS1500 is not set
+ # CONFIG_MIPS_MTX1 is not set
+ # CONFIG_COGENT_CSB250 is not set
+@@ -208,9 +208,7 @@
+ CONFIG_MTD_BOSPORUS=y
+ # CONFIG_MTD_XXS1500 is not set
+ # CONFIG_MTD_MTX1 is not set
+-# CONFIG_MTD_DB1X00 is not set
+ # CONFIG_MTD_PB1550 is not set
+-# CONFIG_MTD_HYDROGEN3 is not set
+ # CONFIG_MTD_MIRAGE is not set
+ # CONFIG_MTD_CSTM_MIPS_IXX is not set
+ # CONFIG_MTD_OCELOT is not set
+@@ -229,7 +227,6 @@
+ #
+ # Disk-On-Chip Device Drivers
+ #
+-# CONFIG_MTD_DOC1000 is not set
+ # CONFIG_MTD_DOC2000 is not set
+ # CONFIG_MTD_DOC2001 is not set
+ # CONFIG_MTD_DOCPROBE is not set
+@@ -373,11 +370,6 @@
  #
  # CONFIG_IPX is not set
  # CONFIG_ATALK is not set
@@ -4248,7 +4609,7 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-bosporus linux-mips/arch/mips/defconf
  # CONFIG_DECNET is not set
  # CONFIG_BRIDGE is not set
  # CONFIG_X25 is not set
-@@ -457,6 +452,7 @@
+@@ -457,9 +449,11 @@
  # CONFIG_SCSI_MEGARAID is not set
  # CONFIG_SCSI_MEGARAID2 is not set
  # CONFIG_SCSI_SATA is not set
@@ -4256,18 +4617,31 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-bosporus linux-mips/arch/mips/defconf
  # CONFIG_SCSI_SATA_SVW is not set
  # CONFIG_SCSI_ATA_PIIX is not set
  # CONFIG_SCSI_SATA_NV is not set
-@@ -899,7 +895,7 @@
- # CONFIG_USB_UHCI is not set
- # CONFIG_USB_UHCI_ALT is not set
- CONFIG_USB_OHCI=y
--
-+CONFIG_USB_NON_PCI_OHCI=y
- #
- # USB Device Class drivers
- #
-diff -Nur linux-2.4.29/arch/mips/defconfig-capcella linux-mips/arch/mips/defconfig-capcella
---- linux-2.4.29/arch/mips/defconfig-capcella	2005-01-19 15:09:27.000000000 +0100
-+++ linux-mips/arch/mips/defconfig-capcella	2005-01-09 20:33:59.000000000 +0100
++# CONFIG_SCSI_SATA_QSTOR is not set
+ # CONFIG_SCSI_SATA_PROMISE is not set
+ # CONFIG_SCSI_SATA_SX4 is not set
+ # CONFIG_SCSI_SATA_SIL is not set
+@@ -681,7 +675,6 @@
+ # CONFIG_AU1X00_USB_TTY is not set
+ # CONFIG_AU1X00_USB_RAW is not set
+ # CONFIG_TXX927_SERIAL is not set
+-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
+ CONFIG_UNIX98_PTYS=y
+ CONFIG_UNIX98_PTY_COUNT=256
+ 
+diff -Nur linux-2.4.30/arch/mips/defconfig-capcella linux-2.4.30-mips/arch/mips/defconfig-capcella
+--- linux-2.4.30/arch/mips/defconfig-capcella	2005-01-19 15:09:27.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/defconfig-capcella	2005-03-18 13:13:21.000000000 +0100
+@@ -30,8 +30,8 @@
+ # CONFIG_MIPS_PB1000 is not set
+ # CONFIG_MIPS_PB1100 is not set
+ # CONFIG_MIPS_PB1500 is not set
+-# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_PB1550 is not set
++# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_XXS1500 is not set
+ # CONFIG_MIPS_MTX1 is not set
+ # CONFIG_COGENT_CSB250 is not set
 @@ -228,11 +228,6 @@
  #
  # CONFIG_IPX is not set
@@ -4280,9 +4654,27 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-capcella linux-mips/arch/mips/defconf
  # CONFIG_DECNET is not set
  # CONFIG_BRIDGE is not set
  # CONFIG_X25 is not set
-diff -Nur linux-2.4.29/arch/mips/defconfig-cobalt linux-mips/arch/mips/defconfig-cobalt
---- linux-2.4.29/arch/mips/defconfig-cobalt	2005-01-19 15:09:28.000000000 +0100
-+++ linux-mips/arch/mips/defconfig-cobalt	2005-01-09 20:33:59.000000000 +0100
+@@ -472,7 +467,6 @@
+ CONFIG_SERIAL_CONSOLE=y
+ # CONFIG_SERIAL_EXTENDED is not set
+ # CONFIG_SERIAL_NONSTANDARD is not set
+-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
+ # CONFIG_VR41XX_KIU is not set
+ CONFIG_UNIX98_PTYS=y
+ CONFIG_UNIX98_PTY_COUNT=256
+diff -Nur linux-2.4.30/arch/mips/defconfig-cobalt linux-2.4.30-mips/arch/mips/defconfig-cobalt
+--- linux-2.4.30/arch/mips/defconfig-cobalt	2005-01-19 15:09:28.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/defconfig-cobalt	2005-03-18 13:13:21.000000000 +0100
+@@ -28,8 +28,8 @@
+ # CONFIG_MIPS_PB1000 is not set
+ # CONFIG_MIPS_PB1100 is not set
+ # CONFIG_MIPS_PB1500 is not set
+-# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_PB1550 is not set
++# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_XXS1500 is not set
+ # CONFIG_MIPS_MTX1 is not set
+ # CONFIG_COGENT_CSB250 is not set
 @@ -222,11 +222,6 @@
  #
  # CONFIG_IPX is not set
@@ -4295,9 +4687,27 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-cobalt linux-mips/arch/mips/defconfig
  # CONFIG_DECNET is not set
  # CONFIG_BRIDGE is not set
  # CONFIG_X25 is not set
-diff -Nur linux-2.4.29/arch/mips/defconfig-csb250 linux-mips/arch/mips/defconfig-csb250
---- linux-2.4.29/arch/mips/defconfig-csb250	2005-01-19 15:09:28.000000000 +0100
-+++ linux-mips/arch/mips/defconfig-csb250	2005-01-09 20:33:59.000000000 +0100
+@@ -505,7 +500,6 @@
+ CONFIG_SERIAL_CONSOLE=y
+ # CONFIG_SERIAL_EXTENDED is not set
+ # CONFIG_SERIAL_NONSTANDARD is not set
+-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
+ CONFIG_UNIX98_PTYS=y
+ CONFIG_UNIX98_PTY_COUNT=16
+ 
+diff -Nur linux-2.4.30/arch/mips/defconfig-csb250 linux-2.4.30-mips/arch/mips/defconfig-csb250
+--- linux-2.4.30/arch/mips/defconfig-csb250	2005-01-19 15:09:28.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/defconfig-csb250	2005-03-18 13:13:21.000000000 +0100
+@@ -30,8 +30,8 @@
+ # CONFIG_MIPS_PB1000 is not set
+ # CONFIG_MIPS_PB1100 is not set
+ # CONFIG_MIPS_PB1500 is not set
+-# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_PB1550 is not set
++# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_XXS1500 is not set
+ # CONFIG_MIPS_MTX1 is not set
+ CONFIG_COGENT_CSB250=y
 @@ -268,11 +268,6 @@
  #
  # CONFIG_IPX is not set
@@ -4310,31 +4720,48 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-csb250 linux-mips/arch/mips/defconfig
  # CONFIG_DECNET is not set
  # CONFIG_BRIDGE is not set
  # CONFIG_X25 is not set
-diff -Nur linux-2.4.29/arch/mips/defconfig-db1000 linux-mips/arch/mips/defconfig-db1000
---- linux-2.4.29/arch/mips/defconfig-db1000	2005-01-19 15:09:28.000000000 +0100
-+++ linux-mips/arch/mips/defconfig-db1000	2005-02-03 07:35:29.000000000 +0100
-@@ -22,16 +22,19 @@
- #
- # CONFIG_ACER_PICA_61 is not set
- # CONFIG_MIPS_BOSPORUS is not set
-+# CONFIG_MIPS_FICMMP is not set
- # CONFIG_MIPS_MIRAGE is not set
- CONFIG_MIPS_DB1000=y
- # CONFIG_MIPS_DB1100 is not set
- # CONFIG_MIPS_DB1500 is not set
- # CONFIG_MIPS_DB1550 is not set
-+# CONFIG_MIPS_DB1200 is not set
+@@ -556,7 +551,6 @@
+ # CONFIG_AU1X00_USB_TTY is not set
+ # CONFIG_AU1X00_USB_RAW is not set
+ # CONFIG_TXX927_SERIAL is not set
+-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
+ CONFIG_UNIX98_PTYS=y
+ CONFIG_UNIX98_PTY_COUNT=256
+ 
+diff -Nur linux-2.4.30/arch/mips/defconfig-db1000 linux-2.4.30-mips/arch/mips/defconfig-db1000
+--- linux-2.4.30/arch/mips/defconfig-db1000	2005-01-19 15:09:28.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/defconfig-db1000	2005-03-18 13:13:21.000000000 +0100
+@@ -30,8 +30,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 is not set
  # CONFIG_MIPS_PB1500 is not set
 -# CONFIG_MIPS_HYDROGEN3 is not set
  # CONFIG_MIPS_PB1550 is not set
-+# CONFIG_MIPS_PB1200 is not set
 +# CONFIG_MIPS_HYDROGEN3 is not set
  # CONFIG_MIPS_XXS1500 is not set
  # CONFIG_MIPS_MTX1 is not set
  # CONFIG_COGENT_CSB250 is not set
-@@ -342,11 +345,6 @@
+@@ -214,11 +214,7 @@
+ # CONFIG_MTD_BOSPORUS is not set
+ # CONFIG_MTD_XXS1500 is not set
+ # CONFIG_MTD_MTX1 is not set
+-CONFIG_MTD_DB1X00=y
+-CONFIG_MTD_DB1X00_BOOT=y
+-CONFIG_MTD_DB1X00_USER=y
+ # CONFIG_MTD_PB1550 is not set
+-# CONFIG_MTD_HYDROGEN3 is not set
+ # CONFIG_MTD_MIRAGE is not set
+ # CONFIG_MTD_CSTM_MIPS_IXX is not set
+ # CONFIG_MTD_OCELOT is not set
+@@ -237,7 +233,6 @@
+ #
+ # Disk-On-Chip Device Drivers
+ #
+-# CONFIG_MTD_DOC1000 is not set
+ # CONFIG_MTD_DOC2000 is not set
+ # CONFIG_MTD_DOC2001 is not set
+ # CONFIG_MTD_DOCPROBE is not set
+@@ -342,11 +337,6 @@
  #
  # CONFIG_IPX is not set
  # CONFIG_ATALK is not set
@@ -4346,31 +4773,48 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-db1000 linux-mips/arch/mips/defconfig
  # CONFIG_DECNET is not set
  # CONFIG_BRIDGE is not set
  # CONFIG_X25 is not set
-diff -Nur linux-2.4.29/arch/mips/defconfig-db1100 linux-mips/arch/mips/defconfig-db1100
---- linux-2.4.29/arch/mips/defconfig-db1100	2005-01-19 15:09:28.000000000 +0100
-+++ linux-mips/arch/mips/defconfig-db1100	2005-02-03 07:35:29.000000000 +0100
-@@ -22,16 +22,19 @@
- #
- # CONFIG_ACER_PICA_61 is not set
- # CONFIG_MIPS_BOSPORUS is not set
-+# CONFIG_MIPS_FICMMP is not set
- # CONFIG_MIPS_MIRAGE is not set
- # CONFIG_MIPS_DB1000 is not set
- CONFIG_MIPS_DB1100=y
- # CONFIG_MIPS_DB1500 is not set
- # CONFIG_MIPS_DB1550 is not set
-+# CONFIG_MIPS_DB1200 is not set
+@@ -636,7 +626,6 @@
+ # CONFIG_AU1X00_USB_TTY is not set
+ # CONFIG_AU1X00_USB_RAW is not set
+ # CONFIG_TXX927_SERIAL is not set
+-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
+ CONFIG_UNIX98_PTYS=y
+ CONFIG_UNIX98_PTY_COUNT=256
+ 
+diff -Nur linux-2.4.30/arch/mips/defconfig-db1100 linux-2.4.30-mips/arch/mips/defconfig-db1100
+--- linux-2.4.30/arch/mips/defconfig-db1100	2005-01-19 15:09:28.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/defconfig-db1100	2005-03-18 13:13:21.000000000 +0100
+@@ -30,8 +30,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 is not set
  # CONFIG_MIPS_PB1500 is not set
 -# CONFIG_MIPS_HYDROGEN3 is not set
  # CONFIG_MIPS_PB1550 is not set
-+# CONFIG_MIPS_PB1200 is not set
 +# CONFIG_MIPS_HYDROGEN3 is not set
  # CONFIG_MIPS_XXS1500 is not set
  # CONFIG_MIPS_MTX1 is not set
  # CONFIG_COGENT_CSB250 is not set
-@@ -342,11 +345,6 @@
+@@ -214,11 +214,7 @@
+ # CONFIG_MTD_BOSPORUS is not set
+ # CONFIG_MTD_XXS1500 is not set
+ # CONFIG_MTD_MTX1 is not set
+-CONFIG_MTD_DB1X00=y
+-# CONFIG_MTD_DB1X00_BOOT is not set
+-CONFIG_MTD_DB1X00_USER=y
+ # CONFIG_MTD_PB1550 is not set
+-# CONFIG_MTD_HYDROGEN3 is not set
+ # CONFIG_MTD_MIRAGE is not set
+ # CONFIG_MTD_CSTM_MIPS_IXX is not set
+ # CONFIG_MTD_OCELOT is not set
+@@ -237,7 +233,6 @@
+ #
+ # Disk-On-Chip Device Drivers
+ #
+-# CONFIG_MTD_DOC1000 is not set
+ # CONFIG_MTD_DOC2000 is not set
+ # CONFIG_MTD_DOC2001 is not set
+ # CONFIG_MTD_DOCPROBE is not set
+@@ -342,11 +337,6 @@
  #
  # CONFIG_IPX is not set
  # CONFIG_ATALK is not set
@@ -4382,10 +4826,34 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-db1100 linux-mips/arch/mips/defconfig
  # CONFIG_DECNET is not set
  # CONFIG_BRIDGE is not set
  # CONFIG_X25 is not set
-diff -Nur linux-2.4.29/arch/mips/defconfig-db1200 linux-mips/arch/mips/defconfig-db1200
---- linux-2.4.29/arch/mips/defconfig-db1200	1970-01-01 01:00:00.000000000 +0100
-+++ linux-mips/arch/mips/defconfig-db1200	2005-01-30 09:01:26.000000000 +0100
-@@ -0,0 +1,1051 @@
+@@ -636,7 +626,6 @@
+ # CONFIG_AU1X00_USB_TTY is not set
+ # CONFIG_AU1X00_USB_RAW is not set
+ # CONFIG_TXX927_SERIAL is not set
+-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
+ CONFIG_UNIX98_PTYS=y
+ CONFIG_UNIX98_PTY_COUNT=256
+ 
+@@ -884,6 +873,7 @@
+ # CONFIG_FB_PM2 is not set
+ # CONFIG_FB_PM3 is not set
+ # CONFIG_FB_CYBER2000 is not set
++CONFIG_FB_AU1100=y
+ # CONFIG_FB_MATROX is not set
+ # CONFIG_FB_ATY is not set
+ # CONFIG_FB_RADEON is not set
+@@ -895,7 +885,6 @@
+ # CONFIG_FB_VOODOO1 is not set
+ # CONFIG_FB_TRIDENT is not set
+ # CONFIG_FB_E1356 is not set
+-CONFIG_FB_AU1100=y
+ # CONFIG_FB_IT8181 is not set
+ # CONFIG_FB_VIRTUAL is not set
+ CONFIG_FBCON_ADVANCED=y
+diff -Nur linux-2.4.30/arch/mips/defconfig-db1200 linux-2.4.30-mips/arch/mips/defconfig-db1200
+--- linux-2.4.30/arch/mips/defconfig-db1200	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/defconfig-db1200	2005-03-18 13:13:21.000000000 +0100
+@@ -0,0 +1,1032 @@
 +#
 +# Automatically generated make config: don't edit
 +#
@@ -4410,18 +4878,15 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-db1200 linux-mips/arch/mips/defconfig
 +#
 +# CONFIG_ACER_PICA_61 is not set
 +# CONFIG_MIPS_BOSPORUS is not set
-+# CONFIG_MIPS_FICMMP is not set
 +# CONFIG_MIPS_MIRAGE is not set
 +# CONFIG_MIPS_DB1000 is not set
 +# CONFIG_MIPS_DB1100 is not set
 +# CONFIG_MIPS_DB1500 is not set
 +# CONFIG_MIPS_DB1550 is not set
-+CONFIG_MIPS_DB1200=y
 +# CONFIG_MIPS_PB1000 is not set
 +# CONFIG_MIPS_PB1100 is not set
 +# CONFIG_MIPS_PB1500 is not set
 +# CONFIG_MIPS_PB1550 is not set
-+# CONFIG_MIPS_PB1200 is not set
 +# CONFIG_MIPS_HYDROGEN3 is not set
 +# CONFIG_MIPS_XXS1500 is not set
 +# CONFIG_MIPS_MTX1 is not set
@@ -4468,10 +4933,6 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-db1200 linux-mips/arch/mips/defconfig
 +# CONFIG_HIGHMEM is not set
 +CONFIG_RWSEM_GENERIC_SPINLOCK=y
 +# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
-+CONFIG_SOC_AU1X00=y
-+CONFIG_SOC_AU1200=y
-+CONFIG_NONCOHERENT_IO=y
-+CONFIG_PC_KEYB=y
 +# CONFIG_MIPS_AU1000 is not set
 +
 +#
@@ -4530,7 +4991,6 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-db1200 linux-mips/arch/mips/defconfig
 +# CONFIG_TCIC is not set
 +# CONFIG_I82092 is not set
 +# CONFIG_I82365 is not set
-+CONFIG_PCMCIA_AU1X00=m
 +
 +#
 +# PCI Hotplug Support
@@ -4557,7 +5017,6 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-db1200 linux-mips/arch/mips/defconfig
 +# CONFIG_OOM_KILLER is not set
 +CONFIG_CMDLINE_BOOL=y
 +CONFIG_CMDLINE="mem=96M"
-+# CONFIG_PM is not set
 +
 +#
 +# Memory Technology Devices (MTD)
@@ -4779,6 +5238,7 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-db1200 linux-mips/arch/mips/defconfig
 +# CONFIG_SCSI_SATA_SVW is not set
 +# CONFIG_SCSI_ATA_PIIX is not set
 +# CONFIG_SCSI_SATA_NV is not set
++# CONFIG_SCSI_SATA_QSTOR is not set
 +# CONFIG_SCSI_SATA_PROMISE is not set
 +# CONFIG_SCSI_SATA_SX4 is not set
 +# CONFIG_SCSI_SATA_SIL is not set
@@ -4867,7 +5327,6 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-db1200 linux-mips/arch/mips/defconfig
 +# Ethernet (10 or 100Mbit)
 +#
 +CONFIG_NET_ETHERNET=y
-+# CONFIG_MIPS_AU1X00_ENET is not set
 +# CONFIG_SUNLANCE is not set
 +# CONFIG_HAPPYMEAL is not set
 +# CONFIG_SUNBMAC is not set
@@ -4980,12 +5439,7 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-db1200 linux-mips/arch/mips/defconfig
 +# CONFIG_SERIAL_TX3912_CONSOLE is not set
 +# CONFIG_SERIAL_TXX9 is not set
 +# CONFIG_SERIAL_TXX9_CONSOLE is not set
-+CONFIG_AU1X00_UART=y
-+CONFIG_AU1X00_SERIAL_CONSOLE=y
-+# CONFIG_AU1X00_USB_TTY is not set
-+# CONFIG_AU1X00_USB_RAW is not set
 +# CONFIG_TXX927_SERIAL is not set
-+# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
 +CONFIG_UNIX98_PTYS=y
 +CONFIG_UNIX98_PTY_COUNT=256
 +
@@ -5070,8 +5524,6 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-db1200 linux-mips/arch/mips/defconfig
 +#
 +# CONFIG_PCMCIA_SERIAL_CS is not set
 +# CONFIG_SYNCLINK_CS is not set
-+# CONFIG_AU1X00_GPIO is not set
-+# CONFIG_TS_AU1X00_ADS7846 is not set
 +
 +#
 +# File systems
@@ -5293,9 +5745,6 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-db1200 linux-mips/arch/mips/defconfig
 +# CONFIG_SOUND_ICH is not set
 +# CONFIG_SOUND_RME96XX is not set
 +# CONFIG_SOUND_SONICVIBES is not set
-+# CONFIG_SOUND_AU1X00 is not set
-+CONFIG_SOUND_AU1550_PSC=y
-+# CONFIG_SOUND_AU1550_I2S is not set
 +# CONFIG_SOUND_TRIDENT is not set
 +# CONFIG_SOUND_MSNDCLAS is not set
 +# CONFIG_SOUND_MSNDPIN is not set
@@ -5437,31 +5886,20 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-db1200 linux-mips/arch/mips/defconfig
 +CONFIG_ZLIB_INFLATE=m
 +CONFIG_ZLIB_DEFLATE=m
 +# CONFIG_FW_LOADER is not set
-diff -Nur linux-2.4.29/arch/mips/defconfig-db1500 linux-mips/arch/mips/defconfig-db1500
---- linux-2.4.29/arch/mips/defconfig-db1500	2005-01-19 15:09:28.000000000 +0100
-+++ linux-mips/arch/mips/defconfig-db1500	2005-02-03 07:35:29.000000000 +0100
-@@ -22,16 +22,19 @@
- #
- # CONFIG_ACER_PICA_61 is not set
- # CONFIG_MIPS_BOSPORUS is not set
-+# CONFIG_MIPS_FICMMP is not set
- # CONFIG_MIPS_MIRAGE is not set
- # CONFIG_MIPS_DB1000 is not set
- # CONFIG_MIPS_DB1100 is not set
- CONFIG_MIPS_DB1500=y
- # CONFIG_MIPS_DB1550 is not set
-+# CONFIG_MIPS_DB1200 is not set
+diff -Nur linux-2.4.30/arch/mips/defconfig-db1500 linux-2.4.30-mips/arch/mips/defconfig-db1500
+--- linux-2.4.30/arch/mips/defconfig-db1500	2005-01-19 15:09:28.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/defconfig-db1500	2005-03-18 13:13:21.000000000 +0100
+@@ -30,8 +30,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 is not set
  # CONFIG_MIPS_PB1500 is not set
 -# CONFIG_MIPS_HYDROGEN3 is not set
  # CONFIG_MIPS_PB1550 is not set
-+# CONFIG_MIPS_PB1200 is not set
 +# CONFIG_MIPS_HYDROGEN3 is not set
  # CONFIG_MIPS_XXS1500 is not set
  # CONFIG_MIPS_MTX1 is not set
  # CONFIG_COGENT_CSB250 is not set
-@@ -267,11 +270,6 @@
+@@ -267,11 +267,6 @@
  #
  # CONFIG_IPX is not set
  # CONFIG_ATALK is not set
@@ -5473,31 +5911,48 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-db1500 linux-mips/arch/mips/defconfig
  # CONFIG_DECNET is not set
  # CONFIG_BRIDGE is not set
  # CONFIG_X25 is not set
-diff -Nur linux-2.4.29/arch/mips/defconfig-db1550 linux-mips/arch/mips/defconfig-db1550
---- linux-2.4.29/arch/mips/defconfig-db1550	2005-01-19 15:09:28.000000000 +0100
-+++ linux-mips/arch/mips/defconfig-db1550	2005-02-03 07:35:29.000000000 +0100
-@@ -22,16 +22,19 @@
- #
- # CONFIG_ACER_PICA_61 is not set
- # CONFIG_MIPS_BOSPORUS is not set
-+# CONFIG_MIPS_FICMMP is not set
- # CONFIG_MIPS_MIRAGE is not set
- # CONFIG_MIPS_DB1000 is not set
- # CONFIG_MIPS_DB1100 is not set
- # CONFIG_MIPS_DB1500 is not set
- CONFIG_MIPS_DB1550=y
-+# CONFIG_MIPS_DB1200 is not set
+@@ -555,7 +550,6 @@
+ # CONFIG_AU1X00_USB_TTY is not set
+ # CONFIG_AU1X00_USB_RAW is not set
+ # CONFIG_TXX927_SERIAL is not set
+-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
+ CONFIG_UNIX98_PTYS=y
+ CONFIG_UNIX98_PTY_COUNT=256
+ 
+diff -Nur linux-2.4.30/arch/mips/defconfig-db1550 linux-2.4.30-mips/arch/mips/defconfig-db1550
+--- linux-2.4.30/arch/mips/defconfig-db1550	2005-01-19 15:09:28.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/defconfig-db1550	2005-03-18 13:13:21.000000000 +0100
+@@ -30,8 +30,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 is not set
  # CONFIG_MIPS_PB1500 is not set
 -# CONFIG_MIPS_HYDROGEN3 is not set
  # CONFIG_MIPS_PB1550 is not set
-+# CONFIG_MIPS_PB1200 is not set
 +# CONFIG_MIPS_HYDROGEN3 is not set
  # CONFIG_MIPS_XXS1500 is not set
  # CONFIG_MIPS_MTX1 is not set
  # CONFIG_COGENT_CSB250 is not set
-@@ -343,11 +346,6 @@
+@@ -213,11 +213,9 @@
+ # CONFIG_MTD_BOSPORUS is not set
+ # CONFIG_MTD_XXS1500 is not set
+ # CONFIG_MTD_MTX1 is not set
+-# CONFIG_MTD_DB1X00 is not set
+ CONFIG_MTD_PB1550=y
+ CONFIG_MTD_PB1550_BOOT=y
+ CONFIG_MTD_PB1550_USER=y
+-# CONFIG_MTD_HYDROGEN3 is not set
+ # CONFIG_MTD_MIRAGE is not set
+ # CONFIG_MTD_CSTM_MIPS_IXX is not set
+ # CONFIG_MTD_OCELOT is not set
+@@ -236,7 +234,6 @@
+ #
+ # Disk-On-Chip Device Drivers
+ #
+-# CONFIG_MTD_DOC1000 is not set
+ # CONFIG_MTD_DOC2000 is not set
+ # CONFIG_MTD_DOC2001 is not set
+ # CONFIG_MTD_DOCPROBE is not set
+@@ -343,11 +340,6 @@
  #
  # CONFIG_IPX is not set
  # CONFIG_ATALK is not set
@@ -5509,9 +5964,27 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-db1550 linux-mips/arch/mips/defconfig
  # CONFIG_DECNET is not set
  # CONFIG_BRIDGE is not set
  # CONFIG_X25 is not set
-diff -Nur linux-2.4.29/arch/mips/defconfig-ddb5476 linux-mips/arch/mips/defconfig-ddb5476
---- linux-2.4.29/arch/mips/defconfig-ddb5476	2005-01-19 15:09:28.000000000 +0100
-+++ linux-mips/arch/mips/defconfig-ddb5476	2005-01-09 20:33:59.000000000 +0100
+@@ -633,7 +625,6 @@
+ # CONFIG_AU1X00_USB_TTY is not set
+ # CONFIG_AU1X00_USB_RAW is not set
+ # CONFIG_TXX927_SERIAL is not set
+-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
+ CONFIG_UNIX98_PTYS=y
+ CONFIG_UNIX98_PTY_COUNT=256
+ 
+diff -Nur linux-2.4.30/arch/mips/defconfig-ddb5476 linux-2.4.30-mips/arch/mips/defconfig-ddb5476
+--- linux-2.4.30/arch/mips/defconfig-ddb5476	2005-01-19 15:09:28.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/defconfig-ddb5476	2005-03-18 13:13:21.000000000 +0100
+@@ -28,8 +28,8 @@
+ # CONFIG_MIPS_PB1000 is not set
+ # CONFIG_MIPS_PB1100 is not set
+ # CONFIG_MIPS_PB1500 is not set
+-# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_PB1550 is not set
++# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_XXS1500 is not set
+ # CONFIG_MIPS_MTX1 is not set
+ # CONFIG_COGENT_CSB250 is not set
 @@ -226,11 +226,6 @@
  #
  # CONFIG_IPX is not set
@@ -5524,9 +5997,27 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-ddb5476 linux-mips/arch/mips/defconfi
  # CONFIG_DECNET is not set
  # CONFIG_BRIDGE is not set
  # CONFIG_X25 is not set
-diff -Nur linux-2.4.29/arch/mips/defconfig-ddb5477 linux-mips/arch/mips/defconfig-ddb5477
---- linux-2.4.29/arch/mips/defconfig-ddb5477	2005-01-19 15:09:28.000000000 +0100
-+++ linux-mips/arch/mips/defconfig-ddb5477	2005-01-09 20:33:59.000000000 +0100
+@@ -517,7 +512,6 @@
+ CONFIG_SERIAL_CONSOLE=y
+ # CONFIG_SERIAL_EXTENDED is not set
+ # CONFIG_SERIAL_NONSTANDARD is not set
+-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
+ CONFIG_UNIX98_PTYS=y
+ CONFIG_UNIX98_PTY_COUNT=256
+ 
+diff -Nur linux-2.4.30/arch/mips/defconfig-ddb5477 linux-2.4.30-mips/arch/mips/defconfig-ddb5477
+--- linux-2.4.30/arch/mips/defconfig-ddb5477	2005-01-19 15:09:28.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/defconfig-ddb5477	2005-03-18 13:13:21.000000000 +0100
+@@ -28,8 +28,8 @@
+ # CONFIG_MIPS_PB1000 is not set
+ # CONFIG_MIPS_PB1100 is not set
+ # CONFIG_MIPS_PB1500 is not set
+-# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_PB1550 is not set
++# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_XXS1500 is not set
+ # CONFIG_MIPS_MTX1 is not set
+ # CONFIG_COGENT_CSB250 is not set
 @@ -226,11 +226,6 @@
  #
  # CONFIG_IPX is not set
@@ -5539,9 +6030,27 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-ddb5477 linux-mips/arch/mips/defconfi
  # CONFIG_DECNET is not set
  # CONFIG_BRIDGE is not set
  # CONFIG_X25 is not set
-diff -Nur linux-2.4.29/arch/mips/defconfig-decstation linux-mips/arch/mips/defconfig-decstation
---- linux-2.4.29/arch/mips/defconfig-decstation	2005-01-19 15:09:28.000000000 +0100
-+++ linux-mips/arch/mips/defconfig-decstation	2005-01-09 20:33:59.000000000 +0100
+@@ -434,7 +429,6 @@
+ CONFIG_SERIAL_CONSOLE=y
+ # CONFIG_SERIAL_EXTENDED is not set
+ # CONFIG_SERIAL_NONSTANDARD is not set
+-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
+ CONFIG_UNIX98_PTYS=y
+ CONFIG_UNIX98_PTY_COUNT=256
+ 
+diff -Nur linux-2.4.30/arch/mips/defconfig-decstation linux-2.4.30-mips/arch/mips/defconfig-decstation
+--- linux-2.4.30/arch/mips/defconfig-decstation	2005-01-19 15:09:28.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/defconfig-decstation	2005-03-18 13:13:21.000000000 +0100
+@@ -30,8 +30,8 @@
+ # CONFIG_MIPS_PB1000 is not set
+ # CONFIG_MIPS_PB1100 is not set
+ # CONFIG_MIPS_PB1500 is not set
+-# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_PB1550 is not set
++# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_XXS1500 is not set
+ # CONFIG_MIPS_MTX1 is not set
+ # CONFIG_COGENT_CSB250 is not set
 @@ -223,11 +223,6 @@
  #
  # CONFIG_IPX is not set
@@ -5554,7 +6063,7 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-decstation linux-mips/arch/mips/defco
  # CONFIG_DECNET is not set
  # CONFIG_BRIDGE is not set
  # CONFIG_X25 is not set
-@@ -306,6 +301,7 @@
+@@ -306,9 +301,11 @@
  # CONFIG_SCSI_MEGARAID is not set
  # CONFIG_SCSI_MEGARAID2 is not set
  # CONFIG_SCSI_SATA is not set
@@ -5562,9 +6071,31 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-decstation linux-mips/arch/mips/defco
  # CONFIG_SCSI_SATA_SVW is not set
  # CONFIG_SCSI_ATA_PIIX is not set
  # CONFIG_SCSI_SATA_NV is not set
-diff -Nur linux-2.4.29/arch/mips/defconfig-e55 linux-mips/arch/mips/defconfig-e55
---- linux-2.4.29/arch/mips/defconfig-e55	2005-01-19 15:09:28.000000000 +0100
-+++ linux-mips/arch/mips/defconfig-e55	2005-01-09 20:33:59.000000000 +0100
++# CONFIG_SCSI_SATA_QSTOR is not set
+ # CONFIG_SCSI_SATA_PROMISE is not set
+ # CONFIG_SCSI_SATA_SX4 is not set
+ # CONFIG_SCSI_SATA_SIL is not set
+@@ -477,7 +474,6 @@
+ CONFIG_SERIAL_DEC_CONSOLE=y
+ CONFIG_DZ=y
+ CONFIG_ZS=y
+-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
+ CONFIG_UNIX98_PTYS=y
+ CONFIG_UNIX98_PTY_COUNT=256
+ 
+diff -Nur linux-2.4.30/arch/mips/defconfig-e55 linux-2.4.30-mips/arch/mips/defconfig-e55
+--- linux-2.4.30/arch/mips/defconfig-e55	2005-01-19 15:09:28.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/defconfig-e55	2005-03-18 13:13:21.000000000 +0100
+@@ -30,8 +30,8 @@
+ # CONFIG_MIPS_PB1000 is not set
+ # CONFIG_MIPS_PB1100 is not set
+ # CONFIG_MIPS_PB1500 is not set
+-# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_PB1550 is not set
++# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_XXS1500 is not set
+ # CONFIG_MIPS_MTX1 is not set
+ # CONFIG_COGENT_CSB250 is not set
 @@ -222,11 +222,6 @@
  #
  # CONFIG_IPX is not set
@@ -5577,10 +6108,57 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-e55 linux-mips/arch/mips/defconfig-e5
  # CONFIG_DECNET is not set
  # CONFIG_BRIDGE is not set
  # CONFIG_X25 is not set
-diff -Nur linux-2.4.29/arch/mips/defconfig-eagle linux-mips/arch/mips/defconfig-eagle
---- linux-2.4.29/arch/mips/defconfig-eagle	2005-01-19 15:09:28.000000000 +0100
-+++ linux-mips/arch/mips/defconfig-eagle	2005-01-09 20:33:59.000000000 +0100
-@@ -327,11 +327,6 @@
+@@ -426,7 +421,6 @@
+ # CONFIG_SERIAL_MULTIPORT is not set
+ # CONFIG_HUB6 is not set
+ # CONFIG_SERIAL_NONSTANDARD is not set
+-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
+ # CONFIG_VR41XX_KIU is not set
+ CONFIG_UNIX98_PTYS=y
+ CONFIG_UNIX98_PTY_COUNT=256
+diff -Nur linux-2.4.30/arch/mips/defconfig-eagle linux-2.4.30-mips/arch/mips/defconfig-eagle
+--- linux-2.4.30/arch/mips/defconfig-eagle	2005-01-19 15:09:28.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/defconfig-eagle	2005-03-18 13:13:21.000000000 +0100
+@@ -30,8 +30,8 @@
+ # CONFIG_MIPS_PB1000 is not set
+ # CONFIG_MIPS_PB1100 is not set
+ # CONFIG_MIPS_PB1500 is not set
+-# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_PB1550 is not set
++# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_XXS1500 is not set
+ # CONFIG_MIPS_MTX1 is not set
+ # CONFIG_COGENT_CSB250 is not set
+@@ -208,8 +208,8 @@
+ # Mapping drivers for chip access
+ #
+ CONFIG_MTD_PHYSMAP=y
+-CONFIG_MTD_PHYSMAP_START=1c000000
+-CONFIG_MTD_PHYSMAP_LEN=2000000
++CONFIG_MTD_PHYSMAP_START=0x1c000000
++CONFIG_MTD_PHYSMAP_LEN=0x2000000
+ CONFIG_MTD_PHYSMAP_BUSWIDTH=4
+ # CONFIG_MTD_PB1000 is not set
+ # CONFIG_MTD_PB1500 is not set
+@@ -217,9 +217,7 @@
+ # CONFIG_MTD_BOSPORUS is not set
+ # CONFIG_MTD_XXS1500 is not set
+ # CONFIG_MTD_MTX1 is not set
+-# CONFIG_MTD_DB1X00 is not set
+ # CONFIG_MTD_PB1550 is not set
+-# CONFIG_MTD_HYDROGEN3 is not set
+ # CONFIG_MTD_MIRAGE is not set
+ # CONFIG_MTD_CSTM_MIPS_IXX is not set
+ # CONFIG_MTD_OCELOT is not set
+@@ -238,7 +236,6 @@
+ #
+ # Disk-On-Chip Device Drivers
+ #
+-# CONFIG_MTD_DOC1000 is not set
+ # CONFIG_MTD_DOC2000 is not set
+ # CONFIG_MTD_DOC2001 is not set
+ # CONFIG_MTD_DOCPROBE is not set
+@@ -327,11 +324,6 @@
  #
  # CONFIG_IPX is not set
  # CONFIG_ATALK is not set
@@ -5592,9 +6170,27 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-eagle linux-mips/arch/mips/defconfig-
  # CONFIG_DECNET is not set
  # CONFIG_BRIDGE is not set
  # CONFIG_X25 is not set
-diff -Nur linux-2.4.29/arch/mips/defconfig-ev64120 linux-mips/arch/mips/defconfig-ev64120
---- linux-2.4.29/arch/mips/defconfig-ev64120	2005-01-19 15:09:28.000000000 +0100
-+++ linux-mips/arch/mips/defconfig-ev64120	2005-01-09 20:33:59.000000000 +0100
+@@ -587,7 +579,6 @@
+ CONFIG_SERIAL_CONSOLE=y
+ # CONFIG_SERIAL_EXTENDED is not set
+ # CONFIG_SERIAL_NONSTANDARD is not set
+-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
+ # CONFIG_VR41XX_KIU is not set
+ CONFIG_UNIX98_PTYS=y
+ CONFIG_UNIX98_PTY_COUNT=256
+diff -Nur linux-2.4.30/arch/mips/defconfig-ev64120 linux-2.4.30-mips/arch/mips/defconfig-ev64120
+--- linux-2.4.30/arch/mips/defconfig-ev64120	2005-01-19 15:09:28.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/defconfig-ev64120	2005-03-18 13:13:21.000000000 +0100
+@@ -30,8 +30,8 @@
+ # CONFIG_MIPS_PB1000 is not set
+ # CONFIG_MIPS_PB1100 is not set
+ # CONFIG_MIPS_PB1500 is not set
+-# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_PB1550 is not set
++# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_XXS1500 is not set
+ # CONFIG_MIPS_MTX1 is not set
+ # CONFIG_COGENT_CSB250 is not set
 @@ -230,11 +230,6 @@
  #
  # CONFIG_IPX is not set
@@ -5607,9 +6203,27 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-ev64120 linux-mips/arch/mips/defconfi
  # CONFIG_DECNET is not set
  # CONFIG_BRIDGE is not set
  # CONFIG_X25 is not set
-diff -Nur linux-2.4.29/arch/mips/defconfig-ev96100 linux-mips/arch/mips/defconfig-ev96100
---- linux-2.4.29/arch/mips/defconfig-ev96100	2005-01-19 15:09:28.000000000 +0100
-+++ linux-mips/arch/mips/defconfig-ev96100	2005-01-09 20:33:59.000000000 +0100
+@@ -443,7 +438,6 @@
+ # CONFIG_SERIAL_CONSOLE is not set
+ # CONFIG_SERIAL_EXTENDED is not set
+ # CONFIG_SERIAL_NONSTANDARD is not set
+-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
+ CONFIG_UNIX98_PTYS=y
+ CONFIG_UNIX98_PTY_COUNT=256
+ 
+diff -Nur linux-2.4.30/arch/mips/defconfig-ev96100 linux-2.4.30-mips/arch/mips/defconfig-ev96100
+--- linux-2.4.30/arch/mips/defconfig-ev96100	2005-01-19 15:09:28.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/defconfig-ev96100	2005-03-18 13:13:21.000000000 +0100
+@@ -30,8 +30,8 @@
+ # CONFIG_MIPS_PB1000 is not set
+ # CONFIG_MIPS_PB1100 is not set
+ # CONFIG_MIPS_PB1500 is not set
+-# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_PB1550 is not set
++# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_XXS1500 is not set
+ # CONFIG_MIPS_MTX1 is not set
+ # CONFIG_COGENT_CSB250 is not set
 @@ -232,11 +232,6 @@
  #
  # CONFIG_IPX is not set
@@ -5622,10 +6236,18 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-ev96100 linux-mips/arch/mips/defconfi
  # CONFIG_DECNET is not set
  # CONFIG_BRIDGE is not set
  # CONFIG_X25 is not set
-diff -Nur linux-2.4.29/arch/mips/defconfig-ficmmp linux-mips/arch/mips/defconfig-ficmmp
---- linux-2.4.29/arch/mips/defconfig-ficmmp	1970-01-01 01:00:00.000000000 +0100
-+++ linux-mips/arch/mips/defconfig-ficmmp	2005-02-03 07:35:29.000000000 +0100
-@@ -0,0 +1,880 @@
+@@ -441,7 +436,6 @@
+ CONFIG_SERIAL_CONSOLE=y
+ # CONFIG_SERIAL_EXTENDED is not set
+ # CONFIG_SERIAL_NONSTANDARD is not set
+-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
+ CONFIG_UNIX98_PTYS=y
+ CONFIG_UNIX98_PTY_COUNT=256
+ 
+diff -Nur linux-2.4.30/arch/mips/defconfig-ficmmp linux-2.4.30-mips/arch/mips/defconfig-ficmmp
+--- linux-2.4.30/arch/mips/defconfig-ficmmp	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/defconfig-ficmmp	2005-03-18 13:13:21.000000000 +0100
+@@ -0,0 +1,862 @@
 +#
 +# Automatically generated make config: don't edit
 +#
@@ -5650,18 +6272,15 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-ficmmp linux-mips/arch/mips/defconfig
 +#
 +# CONFIG_ACER_PICA_61 is not set
 +# CONFIG_MIPS_BOSPORUS is not set
-+CONFIG_MIPS_FICMMP=y
 +# CONFIG_MIPS_MIRAGE is not set
 +# CONFIG_MIPS_DB1000 is not set
 +# CONFIG_MIPS_DB1100 is not set
 +# CONFIG_MIPS_DB1500 is not set
 +# CONFIG_MIPS_DB1550 is not set
-+# CONFIG_MIPS_DB1200 is not set
 +# CONFIG_MIPS_PB1000 is not set
 +# CONFIG_MIPS_PB1100 is not set
 +# CONFIG_MIPS_PB1500 is not set
 +# CONFIG_MIPS_PB1550 is not set
-+# CONFIG_MIPS_PB1200 is not set
 +# CONFIG_MIPS_HYDROGEN3 is not set
 +# CONFIG_MIPS_XXS1500 is not set
 +# CONFIG_MIPS_MTX1 is not set
@@ -5708,10 +6327,6 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-ficmmp linux-mips/arch/mips/defconfig
 +# CONFIG_HIGHMEM is not set
 +CONFIG_RWSEM_GENERIC_SPINLOCK=y
 +# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
-+CONFIG_SOC_AU1X00=y
-+CONFIG_SOC_AU1200=y
-+CONFIG_NONCOHERENT_IO=y
-+CONFIG_PC_KEYB=y
 +# CONFIG_MIPS_AU1000 is not set
 +
 +#
@@ -5777,7 +6392,6 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-ficmmp linux-mips/arch/mips/defconfig
 +# CONFIG_OOM_KILLER is not set
 +CONFIG_CMDLINE_BOOL=y
 +CONFIG_CMDLINE="ide3=dma mem=96M root=/dev/hda2 rootflags=data=journal"
-+# CONFIG_PM is not set
 +
 +#
 +# Memory Technology Devices (MTD)
@@ -5994,6 +6608,7 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-ficmmp linux-mips/arch/mips/defconfig
 +# CONFIG_SCSI_SATA_SVW is not set
 +# CONFIG_SCSI_ATA_PIIX is not set
 +# CONFIG_SCSI_SATA_NV is not set
++# CONFIG_SCSI_SATA_QSTOR is not set
 +# CONFIG_SCSI_SATA_PROMISE is not set
 +# CONFIG_SCSI_SATA_SX4 is not set
 +# CONFIG_SCSI_SATA_SIL is not set
@@ -6054,7 +6669,6 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-ficmmp linux-mips/arch/mips/defconfig
 +# Ethernet (10 or 100Mbit)
 +#
 +CONFIG_NET_ETHERNET=y
-+# CONFIG_MIPS_AU1X00_ENET is not set
 +# CONFIG_SUNLANCE is not set
 +# CONFIG_SUNBMAC is not set
 +# CONFIG_SUNQE is not set
@@ -6160,12 +6774,7 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-ficmmp linux-mips/arch/mips/defconfig
 +# CONFIG_SERIAL_TX3912_CONSOLE is not set
 +# CONFIG_SERIAL_TXX9 is not set
 +# CONFIG_SERIAL_TXX9_CONSOLE is not set
-+CONFIG_AU1X00_UART=y
-+CONFIG_AU1X00_SERIAL_CONSOLE=y
-+# CONFIG_AU1X00_USB_TTY is not set
-+# CONFIG_AU1X00_USB_RAW is not set
 +# CONFIG_TXX927_SERIAL is not set
-+# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
 +CONFIG_UNIX98_PTYS=y
 +CONFIG_UNIX98_PTY_COUNT=256
 +
@@ -6249,8 +6858,6 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-ficmmp linux-mips/arch/mips/defconfig
 +# Direct Rendering Manager (XFree86 DRI support)
 +#
 +# CONFIG_DRM is not set
-+# CONFIG_AU1X00_GPIO is not set
-+# CONFIG_TS_AU1X00_ADS7846 is not set
 +
 +#
 +# File systems
@@ -6455,9 +7062,6 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-ficmmp linux-mips/arch/mips/defconfig
 +# CONFIG_SOUND_ICH is not set
 +# CONFIG_SOUND_RME96XX is not set
 +# CONFIG_SOUND_SONICVIBES is not set
-+# CONFIG_SOUND_AU1X00 is not set
-+# CONFIG_SOUND_AU1550_PSC is not set
-+# CONFIG_SOUND_AU1550_I2S is not set
 +# CONFIG_SOUND_TRIDENT is not set
 +# CONFIG_SOUND_MSNDCLAS is not set
 +# CONFIG_SOUND_MSNDPIN is not set
@@ -6506,10 +7110,49 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-ficmmp linux-mips/arch/mips/defconfig
 +# CONFIG_CRC32 is not set
 +CONFIG_ZLIB_INFLATE=m
 +CONFIG_ZLIB_DEFLATE=m
-diff -Nur linux-2.4.29/arch/mips/defconfig-hp-lj linux-mips/arch/mips/defconfig-hp-lj
---- linux-2.4.29/arch/mips/defconfig-hp-lj	2005-01-19 15:09:28.000000000 +0100
-+++ linux-mips/arch/mips/defconfig-hp-lj	2005-01-09 20:33:59.000000000 +0100
-@@ -304,11 +304,6 @@
+diff -Nur linux-2.4.30/arch/mips/defconfig-hp-lj linux-2.4.30-mips/arch/mips/defconfig-hp-lj
+--- linux-2.4.30/arch/mips/defconfig-hp-lj	2005-01-19 15:09:28.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/defconfig-hp-lj	2005-03-18 13:13:21.000000000 +0100
+@@ -30,8 +30,8 @@
+ # CONFIG_MIPS_PB1000 is not set
+ # CONFIG_MIPS_PB1100 is not set
+ # CONFIG_MIPS_PB1500 is not set
+-# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_PB1550 is not set
++# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_XXS1500 is not set
+ # CONFIG_MIPS_MTX1 is not set
+ # CONFIG_COGENT_CSB250 is not set
+@@ -184,8 +184,8 @@
+ # Mapping drivers for chip access
+ #
+ CONFIG_MTD_PHYSMAP=y
+-CONFIG_MTD_PHYSMAP_START=10040000
+-CONFIG_MTD_PHYSMAP_LEN=00fc0000
++CONFIG_MTD_PHYSMAP_START=0x10040000
++CONFIG_MTD_PHYSMAP_LEN=0x00fc0000
+ CONFIG_MTD_PHYSMAP_BUSWIDTH=4
+ # CONFIG_MTD_PB1000 is not set
+ # CONFIG_MTD_PB1500 is not set
+@@ -193,9 +193,7 @@
+ # CONFIG_MTD_BOSPORUS is not set
+ # CONFIG_MTD_XXS1500 is not set
+ # CONFIG_MTD_MTX1 is not set
+-# CONFIG_MTD_DB1X00 is not set
+ # CONFIG_MTD_PB1550 is not set
+-# CONFIG_MTD_HYDROGEN3 is not set
+ # CONFIG_MTD_MIRAGE is not set
+ # CONFIG_MTD_CSTM_MIPS_IXX is not set
+ # CONFIG_MTD_OCELOT is not set
+@@ -214,7 +212,6 @@
+ #
+ # Disk-On-Chip Device Drivers
+ #
+-# CONFIG_MTD_DOC1000 is not set
+ # CONFIG_MTD_DOC2000 is not set
+ # CONFIG_MTD_DOC2001 is not set
+ # CONFIG_MTD_DOCPROBE is not set
+@@ -304,11 +301,6 @@
  #
  # CONFIG_IPX is not set
  # CONFIG_ATALK is not set
@@ -6521,80 +7164,46 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-hp-lj linux-mips/arch/mips/defconfig-
  # CONFIG_DECNET is not set
  # CONFIG_BRIDGE is not set
  # CONFIG_X25 is not set
-diff -Nur linux-2.4.29/arch/mips/defconfig-hydrogen3 linux-mips/arch/mips/defconfig-hydrogen3
---- linux-2.4.29/arch/mips/defconfig-hydrogen3	2005-01-19 15:09:28.000000000 +0100
-+++ linux-mips/arch/mips/defconfig-hydrogen3	2005-01-30 09:01:26.000000000 +0100
-@@ -22,6 +22,7 @@
+@@ -604,7 +596,6 @@
+ CONFIG_SERIAL_CONSOLE=y
+ # CONFIG_SERIAL_EXTENDED is not set
+ # CONFIG_SERIAL_NONSTANDARD is not set
+-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
+ # CONFIG_UNIX98_PTYS is not set
+ 
  #
- # CONFIG_ACER_PICA_61 is not set
- # CONFIG_MIPS_BOSPORUS is not set
-+# CONFIG_MIPS_FICMMP is not set
- # CONFIG_MIPS_MIRAGE is not set
- # CONFIG_MIPS_DB1000 is not set
- # CONFIG_MIPS_DB1100 is not set
-@@ -30,9 +31,11 @@
+diff -Nur linux-2.4.30/arch/mips/defconfig-hydrogen3 linux-2.4.30-mips/arch/mips/defconfig-hydrogen3
+--- linux-2.4.30/arch/mips/defconfig-hydrogen3	2005-01-19 15:09:28.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/defconfig-hydrogen3	2005-03-18 13:13:21.000000000 +0100
+@@ -30,8 +30,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 is not set
  # CONFIG_MIPS_PB1500 is not set
 -CONFIG_MIPS_HYDROGEN3=y
  # CONFIG_MIPS_PB1550 is not set
-+# CONFIG_MIPS_PB1200 is not set
 +CONFIG_MIPS_HYDROGEN3=y
  # CONFIG_MIPS_XXS1500 is not set
-+# CONFIG_MIPS_EP1000 is not set
  # CONFIG_MIPS_MTX1 is not set
  # CONFIG_COGENT_CSB250 is not set
- # CONFIG_BAGET_MIPS is not set
-@@ -185,6 +188,7 @@
- CONFIG_MTD_BLOCK=y
- # CONFIG_FTL is not set
- # CONFIG_NFTL is not set
-+# CONFIG_INFTL is not set
- 
- #
- # RAM/ROM/Flash chip drivers
-@@ -196,6 +200,7 @@
- # CONFIG_MTD_CFI_INTELEXT is not set
- CONFIG_MTD_CFI_AMDSTD=y
- # CONFIG_MTD_CFI_STAA is not set
-+CONFIG_MTD_CFI_UTIL=y
- # CONFIG_MTD_RAM is not set
- # CONFIG_MTD_ROM is not set
- # CONFIG_MTD_ABSENT is not set
-@@ -207,17 +212,12 @@
- #
- # Mapping drivers for chip access
- #
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
- # CONFIG_MTD_PHYSMAP is not set
--# CONFIG_MTD_PB1000 is not set
--# CONFIG_MTD_PB1500 is not set
--# CONFIG_MTD_PB1100 is not set
--# CONFIG_MTD_BOSPORUS is not set
--# CONFIG_MTD_XXS1500 is not set
--# CONFIG_MTD_MTX1 is not set
+@@ -214,9 +214,7 @@
+ # CONFIG_MTD_BOSPORUS is not set
+ # CONFIG_MTD_XXS1500 is not set
+ # CONFIG_MTD_MTX1 is not set
 -# CONFIG_MTD_DB1X00 is not set
  # CONFIG_MTD_PB1550 is not set
 -CONFIG_MTD_HYDROGEN3=y
--# CONFIG_MTD_MIRAGE is not set
-+# CONFIG_MTD_DB1550 is not set
-+# CONFIG_MTD_PB1200 is not set
-+# CONFIG_MTD_XXS1500 is not set
+ # CONFIG_MTD_MIRAGE is not set
  # CONFIG_MTD_CSTM_MIPS_IXX is not set
  # CONFIG_MTD_OCELOT is not set
- # CONFIG_MTD_LASAT is not set
-@@ -235,9 +235,9 @@
+@@ -235,7 +233,6 @@
  #
  # Disk-On-Chip Device Drivers
  #
 -# CONFIG_MTD_DOC1000 is not set
  # CONFIG_MTD_DOC2000 is not set
  # CONFIG_MTD_DOC2001 is not set
-+# CONFIG_MTD_DOC2001PLUS is not set
  # CONFIG_MTD_DOCPROBE is not set
- 
- #
-@@ -340,11 +340,6 @@
+@@ -340,11 +337,6 @@
  #
  # CONFIG_IPX is not set
  # CONFIG_ATALK is not set
@@ -6606,23 +7215,7 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-hydrogen3 linux-mips/arch/mips/defcon
  # CONFIG_DECNET is not set
  # CONFIG_BRIDGE is not set
  # CONFIG_X25 is not set
-@@ -386,6 +381,7 @@
- #
- # Please see Documentation/ide.txt for help/info on IDE drives
- #
-+# CONFIG_BLK_DEV_IDE_AU1XXX is not set
- # CONFIG_BLK_DEV_HD_IDE is not set
- # CONFIG_BLK_DEV_HD is not set
- # CONFIG_BLK_DEV_IDE_SATA is not set
-@@ -403,6 +399,7 @@
- #
- # IDE chipset support/bugfixes
- #
-+# CONFIG_BLK_DEV_IDE_AU1XXX is not set
- # CONFIG_BLK_DEV_CMD640 is not set
- # CONFIG_BLK_DEV_CMD640_ENHANCED is not set
- # CONFIG_BLK_DEV_ISAPNP is not set
-@@ -590,7 +587,6 @@
+@@ -590,7 +582,6 @@
  # CONFIG_AU1X00_USB_TTY is not set
  # CONFIG_AU1X00_USB_RAW is not set
  # CONFIG_TXX927_SERIAL is not set
@@ -6630,34 +7223,15 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-hydrogen3 linux-mips/arch/mips/defcon
  CONFIG_UNIX98_PTYS=y
  CONFIG_UNIX98_PTY_COUNT=256
  
-@@ -677,6 +673,12 @@
- # CONFIG_SYNCLINK_CS is not set
- # CONFIG_AU1X00_GPIO is not set
- # CONFIG_TS_AU1X00_ADS7846 is not set
-+# CONFIG_AU1550_PSC_SPI is not set
-+# CONFIG_AU1XXX_MAE is not set
-+# CONFIG_AU1XXX_AES is not set
-+# CONFIG_AU1XXX_CIM is not set
-+# CONFIG_AU1XXX_AES_TEST is not set
-+CONFIG_AU1XXX_BUTTONS=y
- 
- #
- # File systems
-@@ -838,18 +840,20 @@
+@@ -838,6 +829,7 @@
  # CONFIG_FB_PM2 is not set
  # CONFIG_FB_PM3 is not set
  # CONFIG_FB_CYBER2000 is not set
 +CONFIG_FB_AU1100=y
-+# CONFIG_FOCUS_ENHANCEMENTS is not set
  # CONFIG_FB_MATROX is not set
  # CONFIG_FB_ATY is not set
  # CONFIG_FB_RADEON is not set
- # CONFIG_FB_ATY128 is not set
- # CONFIG_FB_INTEL is not set
- # CONFIG_FB_SIS is not set
-+# CONFIG_FB_SMI501 is not set
- # CONFIG_FB_NEOMAGIC is not set
- # CONFIG_FB_3DFX is not set
+@@ -849,7 +841,6 @@
  # CONFIG_FB_VOODOO1 is not set
  # CONFIG_FB_TRIDENT is not set
  # CONFIG_FB_E1356 is not set
@@ -6665,21 +7239,19 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-hydrogen3 linux-mips/arch/mips/defcon
  # CONFIG_FB_IT8181 is not set
  # CONFIG_FB_VIRTUAL is not set
  CONFIG_FBCON_ADVANCED=y
-@@ -923,9 +927,11 @@
- # USB Host Controller Drivers
- #
- # CONFIG_USB_EHCI_HCD is not set
-+# CONFIG_USB_NON_PCI_EHCI is not set
- # CONFIG_USB_UHCI is not set
- # CONFIG_USB_UHCI_ALT is not set
- CONFIG_USB_OHCI=y
-+CONFIG_USB_NON_PCI_OHCI=y
- 
- #
- # USB Device Class drivers
-diff -Nur linux-2.4.29/arch/mips/defconfig-ip22 linux-mips/arch/mips/defconfig-ip22
---- linux-2.4.29/arch/mips/defconfig-ip22	2005-01-19 15:09:28.000000000 +0100
-+++ linux-mips/arch/mips/defconfig-ip22	2005-01-09 20:33:59.000000000 +0100
+diff -Nur linux-2.4.30/arch/mips/defconfig-ip22 linux-2.4.30-mips/arch/mips/defconfig-ip22
+--- linux-2.4.30/arch/mips/defconfig-ip22	2005-01-19 15:09:28.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/defconfig-ip22	2005-03-18 13:13:21.000000000 +0100
+@@ -30,8 +30,8 @@
+ # CONFIG_MIPS_PB1000 is not set
+ # CONFIG_MIPS_PB1100 is not set
+ # CONFIG_MIPS_PB1500 is not set
+-# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_PB1550 is not set
++# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_XXS1500 is not set
+ # CONFIG_MIPS_MTX1 is not set
+ # CONFIG_COGENT_CSB250 is not set
 @@ -235,11 +235,6 @@
  #
  # CONFIG_IPX is not set
@@ -6692,7 +7264,7 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-ip22 linux-mips/arch/mips/defconfig-i
  # CONFIG_DECNET is not set
  # CONFIG_BRIDGE is not set
  # CONFIG_X25 is not set
-@@ -319,6 +314,7 @@
+@@ -319,9 +314,11 @@
  # CONFIG_SCSI_MEGARAID is not set
  # CONFIG_SCSI_MEGARAID2 is not set
  # CONFIG_SCSI_SATA is not set
@@ -6700,10 +7272,61 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-ip22 linux-mips/arch/mips/defconfig-i
  # CONFIG_SCSI_SATA_SVW is not set
  # CONFIG_SCSI_ATA_PIIX is not set
  # CONFIG_SCSI_SATA_NV is not set
-diff -Nur linux-2.4.29/arch/mips/defconfig-it8172 linux-mips/arch/mips/defconfig-it8172
---- linux-2.4.29/arch/mips/defconfig-it8172	2005-01-19 15:09:28.000000000 +0100
-+++ linux-mips/arch/mips/defconfig-it8172	2005-01-09 20:33:59.000000000 +0100
-@@ -304,11 +304,6 @@
++# CONFIG_SCSI_SATA_QSTOR is not set
+ # CONFIG_SCSI_SATA_PROMISE is not set
+ # CONFIG_SCSI_SATA_SX4 is not set
+ # CONFIG_SCSI_SATA_SIL is not set
+@@ -465,7 +462,6 @@
+ # CONFIG_SERIAL is not set
+ # CONFIG_SERIAL_EXTENDED is not set
+ # CONFIG_SERIAL_NONSTANDARD is not set
+-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
+ CONFIG_UNIX98_PTYS=y
+ CONFIG_UNIX98_PTY_COUNT=256
+ 
+diff -Nur linux-2.4.30/arch/mips/defconfig-it8172 linux-2.4.30-mips/arch/mips/defconfig-it8172
+--- linux-2.4.30/arch/mips/defconfig-it8172	2005-01-19 15:09:28.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/defconfig-it8172	2005-03-18 13:13:21.000000000 +0100
+@@ -30,8 +30,8 @@
+ # CONFIG_MIPS_PB1000 is not set
+ # CONFIG_MIPS_PB1100 is not set
+ # CONFIG_MIPS_PB1500 is not set
+-# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_PB1550 is not set
++# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_XXS1500 is not set
+ # CONFIG_MIPS_MTX1 is not set
+ # CONFIG_COGENT_CSB250 is not set
+@@ -186,8 +186,8 @@
+ # Mapping drivers for chip access
+ #
+ CONFIG_MTD_PHYSMAP=y
+-CONFIG_MTD_PHYSMAP_START=8000000
+-CONFIG_MTD_PHYSMAP_LEN=2000000
++CONFIG_MTD_PHYSMAP_START=0x8000000
++CONFIG_MTD_PHYSMAP_LEN=0x2000000
+ CONFIG_MTD_PHYSMAP_BUSWIDTH=4
+ # CONFIG_MTD_PB1000 is not set
+ # CONFIG_MTD_PB1500 is not set
+@@ -195,9 +195,7 @@
+ # CONFIG_MTD_BOSPORUS is not set
+ # CONFIG_MTD_XXS1500 is not set
+ # CONFIG_MTD_MTX1 is not set
+-# CONFIG_MTD_DB1X00 is not set
+ # CONFIG_MTD_PB1550 is not set
+-# CONFIG_MTD_HYDROGEN3 is not set
+ # CONFIG_MTD_MIRAGE is not set
+ # CONFIG_MTD_CSTM_MIPS_IXX is not set
+ # CONFIG_MTD_OCELOT is not set
+@@ -216,7 +214,6 @@
+ #
+ # Disk-On-Chip Device Drivers
+ #
+-# CONFIG_MTD_DOC1000 is not set
+ # CONFIG_MTD_DOC2000 is not set
+ # CONFIG_MTD_DOC2001 is not set
+ # CONFIG_MTD_DOCPROBE is not set
+@@ -304,11 +301,6 @@
  #
  # CONFIG_IPX is not set
  # CONFIG_ATALK is not set
@@ -6715,9 +7338,27 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-it8172 linux-mips/arch/mips/defconfig
  # CONFIG_DECNET is not set
  # CONFIG_BRIDGE is not set
  # CONFIG_X25 is not set
-diff -Nur linux-2.4.29/arch/mips/defconfig-ivr linux-mips/arch/mips/defconfig-ivr
---- linux-2.4.29/arch/mips/defconfig-ivr	2005-01-19 15:09:28.000000000 +0100
-+++ linux-mips/arch/mips/defconfig-ivr	2005-01-09 20:33:59.000000000 +0100
+@@ -592,7 +584,6 @@
+ CONFIG_PC_KEYB=y
+ # CONFIG_IT8172_SCR0 is not set
+ # CONFIG_IT8172_SCR1 is not set
+-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
+ CONFIG_UNIX98_PTYS=y
+ CONFIG_UNIX98_PTY_COUNT=256
+ 
+diff -Nur linux-2.4.30/arch/mips/defconfig-ivr linux-2.4.30-mips/arch/mips/defconfig-ivr
+--- linux-2.4.30/arch/mips/defconfig-ivr	2005-01-19 15:09:28.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/defconfig-ivr	2005-03-18 13:13:21.000000000 +0100
+@@ -30,8 +30,8 @@
+ # CONFIG_MIPS_PB1000 is not set
+ # CONFIG_MIPS_PB1100 is not set
+ # CONFIG_MIPS_PB1500 is not set
+-# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_PB1550 is not set
++# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_XXS1500 is not set
+ # CONFIG_MIPS_MTX1 is not set
+ # CONFIG_COGENT_CSB250 is not set
 @@ -226,11 +226,6 @@
  #
  # CONFIG_IPX is not set
@@ -6730,9 +7371,27 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-ivr linux-mips/arch/mips/defconfig-iv
  # CONFIG_DECNET is not set
  # CONFIG_BRIDGE is not set
  # CONFIG_X25 is not set
-diff -Nur linux-2.4.29/arch/mips/defconfig-jmr3927 linux-mips/arch/mips/defconfig-jmr3927
---- linux-2.4.29/arch/mips/defconfig-jmr3927	2005-01-19 15:09:28.000000000 +0100
-+++ linux-mips/arch/mips/defconfig-jmr3927	2005-01-09 20:33:59.000000000 +0100
+@@ -516,7 +511,6 @@
+ CONFIG_QTRONIX_KEYBOARD=y
+ CONFIG_IT8172_CIR=y
+ # CONFIG_IT8172_SCR0 is not set
+-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
+ CONFIG_UNIX98_PTYS=y
+ CONFIG_UNIX98_PTY_COUNT=256
+ 
+diff -Nur linux-2.4.30/arch/mips/defconfig-jmr3927 linux-2.4.30-mips/arch/mips/defconfig-jmr3927
+--- linux-2.4.30/arch/mips/defconfig-jmr3927	2005-01-19 15:09:28.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/defconfig-jmr3927	2005-03-18 13:13:21.000000000 +0100
+@@ -28,8 +28,8 @@
+ # CONFIG_MIPS_PB1000 is not set
+ # CONFIG_MIPS_PB1100 is not set
+ # CONFIG_MIPS_PB1500 is not set
+-# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_PB1550 is not set
++# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_XXS1500 is not set
+ # CONFIG_MIPS_MTX1 is not set
+ # CONFIG_COGENT_CSB250 is not set
 @@ -225,11 +225,6 @@
  #
  # CONFIG_IPX is not set
@@ -6745,10 +7404,46 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-jmr3927 linux-mips/arch/mips/defconfi
  # CONFIG_DECNET is not set
  # CONFIG_BRIDGE is not set
  # CONFIG_X25 is not set
-diff -Nur linux-2.4.29/arch/mips/defconfig-lasat linux-mips/arch/mips/defconfig-lasat
---- linux-2.4.29/arch/mips/defconfig-lasat	2005-01-19 15:09:28.000000000 +0100
-+++ linux-mips/arch/mips/defconfig-lasat	2005-01-09 20:33:59.000000000 +0100
-@@ -303,11 +303,6 @@
+@@ -454,7 +449,6 @@
+ # CONFIG_SERIAL_TXX9_CONSOLE is not set
+ CONFIG_TXX927_SERIAL=y
+ CONFIG_TXX927_SERIAL_CONSOLE=y
+-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
+ # CONFIG_UNIX98_PTYS is not set
+ 
+ #
+diff -Nur linux-2.4.30/arch/mips/defconfig-lasat linux-2.4.30-mips/arch/mips/defconfig-lasat
+--- linux-2.4.30/arch/mips/defconfig-lasat	2005-01-19 15:09:28.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/defconfig-lasat	2005-03-18 13:13:21.000000000 +0100
+@@ -30,8 +30,8 @@
+ # CONFIG_MIPS_PB1000 is not set
+ # CONFIG_MIPS_PB1100 is not set
+ # CONFIG_MIPS_PB1500 is not set
+-# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_PB1550 is not set
++# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_XXS1500 is not set
+ # CONFIG_MIPS_MTX1 is not set
+ # CONFIG_COGENT_CSB250 is not set
+@@ -198,9 +198,7 @@
+ # CONFIG_MTD_BOSPORUS is not set
+ # CONFIG_MTD_XXS1500 is not set
+ # CONFIG_MTD_MTX1 is not set
+-# CONFIG_MTD_DB1X00 is not set
+ # CONFIG_MTD_PB1550 is not set
+-# CONFIG_MTD_HYDROGEN3 is not set
+ # CONFIG_MTD_MIRAGE is not set
+ # CONFIG_MTD_CSTM_MIPS_IXX is not set
+ # CONFIG_MTD_OCELOT is not set
+@@ -219,7 +217,6 @@
+ #
+ # Disk-On-Chip Device Drivers
+ #
+-# CONFIG_MTD_DOC1000 is not set
+ # CONFIG_MTD_DOC2000 is not set
+ # CONFIG_MTD_DOC2001 is not set
+ # CONFIG_MTD_DOCPROBE is not set
+@@ -303,11 +300,6 @@
  #
  # CONFIG_IPX is not set
  # CONFIG_ATALK is not set
@@ -6760,9 +7455,27 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-lasat linux-mips/arch/mips/defconfig-
  # CONFIG_DECNET is not set
  # CONFIG_BRIDGE is not set
  # CONFIG_X25 is not set
-diff -Nur linux-2.4.29/arch/mips/defconfig-malta linux-mips/arch/mips/defconfig-malta
---- linux-2.4.29/arch/mips/defconfig-malta	2005-01-19 15:09:28.000000000 +0100
-+++ linux-mips/arch/mips/defconfig-malta	2005-01-09 20:33:59.000000000 +0100
+@@ -584,7 +576,6 @@
+ CONFIG_SERIAL_CONSOLE=y
+ # CONFIG_SERIAL_EXTENDED is not set
+ # CONFIG_SERIAL_NONSTANDARD is not set
+-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
+ CONFIG_UNIX98_PTYS=y
+ CONFIG_UNIX98_PTY_COUNT=256
+ 
+diff -Nur linux-2.4.30/arch/mips/defconfig-malta linux-2.4.30-mips/arch/mips/defconfig-malta
+--- linux-2.4.30/arch/mips/defconfig-malta	2005-01-19 15:09:28.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/defconfig-malta	2005-03-18 13:13:21.000000000 +0100
+@@ -30,8 +30,8 @@
+ # CONFIG_MIPS_PB1000 is not set
+ # CONFIG_MIPS_PB1100 is not set
+ # CONFIG_MIPS_PB1500 is not set
+-# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_PB1550 is not set
++# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_XXS1500 is not set
+ # CONFIG_MIPS_MTX1 is not set
+ # CONFIG_COGENT_CSB250 is not set
 @@ -237,11 +237,6 @@
  #
  # CONFIG_IPX is not set
@@ -6775,7 +7488,7 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-malta linux-mips/arch/mips/defconfig-
  # CONFIG_DECNET is not set
  # CONFIG_BRIDGE is not set
  # CONFIG_X25 is not set
-@@ -319,6 +314,7 @@
+@@ -319,9 +314,11 @@
  # CONFIG_SCSI_MEGARAID is not set
  # CONFIG_SCSI_MEGARAID2 is not set
  # CONFIG_SCSI_SATA is not set
@@ -6783,10 +7496,50 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-malta linux-mips/arch/mips/defconfig-
  # CONFIG_SCSI_SATA_SVW is not set
  # CONFIG_SCSI_ATA_PIIX is not set
  # CONFIG_SCSI_SATA_NV is not set
-diff -Nur linux-2.4.29/arch/mips/defconfig-mirage linux-mips/arch/mips/defconfig-mirage
---- linux-2.4.29/arch/mips/defconfig-mirage	2005-01-19 15:09:28.000000000 +0100
-+++ linux-mips/arch/mips/defconfig-mirage	2005-01-30 09:01:26.000000000 +0100
-@@ -335,11 +335,6 @@
++# CONFIG_SCSI_SATA_QSTOR is not set
+ # CONFIG_SCSI_SATA_PROMISE is not set
+ # CONFIG_SCSI_SATA_SX4 is not set
+ # CONFIG_SCSI_SATA_SIL is not set
+@@ -524,7 +521,6 @@
+ CONFIG_SERIAL_CONSOLE=y
+ # CONFIG_SERIAL_EXTENDED is not set
+ # CONFIG_SERIAL_NONSTANDARD is not set
+-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
+ CONFIG_UNIX98_PTYS=y
+ CONFIG_UNIX98_PTY_COUNT=256
+ 
+diff -Nur linux-2.4.30/arch/mips/defconfig-mirage linux-2.4.30-mips/arch/mips/defconfig-mirage
+--- linux-2.4.30/arch/mips/defconfig-mirage	2005-01-19 15:09:28.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/defconfig-mirage	2005-03-18 13:13:21.000000000 +0100
+@@ -30,8 +30,8 @@
+ # CONFIG_MIPS_PB1000 is not set
+ # CONFIG_MIPS_PB1100 is not set
+ # CONFIG_MIPS_PB1500 is not set
+-# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_PB1550 is not set
++# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_XXS1500 is not set
+ # CONFIG_MIPS_MTX1 is not set
+ # CONFIG_COGENT_CSB250 is not set
+@@ -209,9 +209,7 @@
+ # CONFIG_MTD_BOSPORUS is not set
+ # CONFIG_MTD_XXS1500 is not set
+ # CONFIG_MTD_MTX1 is not set
+-# CONFIG_MTD_DB1X00 is not set
+ # CONFIG_MTD_PB1550 is not set
+-# CONFIG_MTD_HYDROGEN3 is not set
+ CONFIG_MTD_MIRAGE=y
+ # CONFIG_MTD_CSTM_MIPS_IXX is not set
+ # CONFIG_MTD_OCELOT is not set
+@@ -230,7 +228,6 @@
+ #
+ # Disk-On-Chip Device Drivers
+ #
+-# CONFIG_MTD_DOC1000 is not set
+ # CONFIG_MTD_DOC2000 is not set
+ # CONFIG_MTD_DOC2001 is not set
+ # CONFIG_MTD_DOCPROBE is not set
+@@ -335,11 +332,6 @@
  #
  # CONFIG_IPX is not set
  # CONFIG_ATALK is not set
@@ -6798,18 +7551,27 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-mirage linux-mips/arch/mips/defconfig
  # CONFIG_DECNET is not set
  # CONFIG_BRIDGE is not set
  # CONFIG_X25 is not set
-@@ -863,7 +858,7 @@
- # CONFIG_USB_UHCI is not set
- # CONFIG_USB_UHCI_ALT is not set
- CONFIG_USB_OHCI=y
--
-+CONFIG_USB_NON_PCI_OHCI=y
- #
- # USB Device Class drivers
- #
-diff -Nur linux-2.4.29/arch/mips/defconfig-mpc30x linux-mips/arch/mips/defconfig-mpc30x
---- linux-2.4.29/arch/mips/defconfig-mpc30x	2005-01-19 15:09:28.000000000 +0100
-+++ linux-mips/arch/mips/defconfig-mpc30x	2005-01-09 20:33:59.000000000 +0100
+@@ -560,7 +552,6 @@
+ # CONFIG_AU1X00_USB_TTY is not set
+ # CONFIG_AU1X00_USB_RAW is not set
+ # CONFIG_TXX927_SERIAL is not set
+-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
+ CONFIG_UNIX98_PTYS=y
+ CONFIG_UNIX98_PTY_COUNT=256
+ 
+diff -Nur linux-2.4.30/arch/mips/defconfig-mpc30x linux-2.4.30-mips/arch/mips/defconfig-mpc30x
+--- linux-2.4.30/arch/mips/defconfig-mpc30x	2005-01-19 15:09:28.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/defconfig-mpc30x	2005-03-18 13:13:21.000000000 +0100
+@@ -30,8 +30,8 @@
+ # CONFIG_MIPS_PB1000 is not set
+ # CONFIG_MIPS_PB1100 is not set
+ # CONFIG_MIPS_PB1500 is not set
+-# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_PB1550 is not set
++# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_XXS1500 is not set
+ # CONFIG_MIPS_MTX1 is not set
+ # CONFIG_COGENT_CSB250 is not set
 @@ -228,11 +228,6 @@
  #
  # CONFIG_IPX is not set
@@ -6822,10 +7584,46 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-mpc30x linux-mips/arch/mips/defconfig
  # CONFIG_DECNET is not set
  # CONFIG_BRIDGE is not set
  # CONFIG_X25 is not set
-diff -Nur linux-2.4.29/arch/mips/defconfig-mtx-1 linux-mips/arch/mips/defconfig-mtx-1
---- linux-2.4.29/arch/mips/defconfig-mtx-1	2005-01-19 15:09:28.000000000 +0100
-+++ linux-mips/arch/mips/defconfig-mtx-1	2005-01-20 03:19:22.000000000 +0100
-@@ -371,11 +371,6 @@
+@@ -400,7 +395,6 @@
+ CONFIG_SERIAL_CONSOLE=y
+ # CONFIG_SERIAL_EXTENDED is not set
+ # CONFIG_SERIAL_NONSTANDARD is not set
+-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
+ # CONFIG_VR41XX_KIU is not set
+ CONFIG_UNIX98_PTYS=y
+ CONFIG_UNIX98_PTY_COUNT=256
+diff -Nur linux-2.4.30/arch/mips/defconfig-mtx-1 linux-2.4.30-mips/arch/mips/defconfig-mtx-1
+--- linux-2.4.30/arch/mips/defconfig-mtx-1	2005-01-19 15:09:28.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/defconfig-mtx-1	2005-03-18 13:13:21.000000000 +0100
+@@ -30,8 +30,8 @@
+ # CONFIG_MIPS_PB1000 is not set
+ # CONFIG_MIPS_PB1100 is not set
+ # CONFIG_MIPS_PB1500 is not set
+-# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_PB1550 is not set
++# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_XXS1500 is not set
+ CONFIG_MIPS_MTX1=y
+ # CONFIG_COGENT_CSB250 is not set
+@@ -193,9 +193,7 @@
+ # CONFIG_MTD_BOSPORUS is not set
+ # CONFIG_MTD_XXS1500 is not set
+ CONFIG_MTD_MTX1=y
+-# CONFIG_MTD_DB1X00 is not set
+ # CONFIG_MTD_PB1550 is not set
+-# CONFIG_MTD_HYDROGEN3 is not set
+ # CONFIG_MTD_MIRAGE is not set
+ # CONFIG_MTD_CSTM_MIPS_IXX is not set
+ # CONFIG_MTD_OCELOT is not set
+@@ -214,7 +212,6 @@
+ #
+ # Disk-On-Chip Device Drivers
+ #
+-# CONFIG_MTD_DOC1000 is not set
+ # CONFIG_MTD_DOC2000 is not set
+ # CONFIG_MTD_DOC2001 is not set
+ # CONFIG_MTD_DOCPROBE is not set
+@@ -371,11 +368,6 @@
  #
  # CONFIG_IPX is not set
  # CONFIG_ATALK is not set
@@ -6837,7 +7635,7 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-mtx-1 linux-mips/arch/mips/defconfig-
  # CONFIG_DECNET is not set
  CONFIG_BRIDGE=m
  # CONFIG_X25 is not set
-@@ -479,6 +474,7 @@
+@@ -479,9 +471,11 @@
  # CONFIG_SCSI_MEGARAID is not set
  # CONFIG_SCSI_MEGARAID2 is not set
  # CONFIG_SCSI_SATA is not set
@@ -6845,9 +7643,31 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-mtx-1 linux-mips/arch/mips/defconfig-
  # CONFIG_SCSI_SATA_SVW is not set
  # CONFIG_SCSI_ATA_PIIX is not set
  # CONFIG_SCSI_SATA_NV is not set
-diff -Nur linux-2.4.29/arch/mips/defconfig-nino linux-mips/arch/mips/defconfig-nino
---- linux-2.4.29/arch/mips/defconfig-nino	2005-01-19 15:09:28.000000000 +0100
-+++ linux-mips/arch/mips/defconfig-nino	2005-01-09 20:33:59.000000000 +0100
++# CONFIG_SCSI_SATA_QSTOR is not set
+ # CONFIG_SCSI_SATA_PROMISE is not set
+ # CONFIG_SCSI_SATA_SX4 is not set
+ # CONFIG_SCSI_SATA_SIL is not set
+@@ -700,7 +694,6 @@
+ # CONFIG_AU1X00_USB_TTY is not set
+ # CONFIG_AU1X00_USB_RAW is not set
+ # CONFIG_TXX927_SERIAL is not set
+-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
+ CONFIG_UNIX98_PTYS=y
+ CONFIG_UNIX98_PTY_COUNT=256
+ 
+diff -Nur linux-2.4.30/arch/mips/defconfig-nino linux-2.4.30-mips/arch/mips/defconfig-nino
+--- linux-2.4.30/arch/mips/defconfig-nino	2005-01-19 15:09:28.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/defconfig-nino	2005-03-18 13:13:21.000000000 +0100
+@@ -30,8 +30,8 @@
+ # CONFIG_MIPS_PB1000 is not set
+ # CONFIG_MIPS_PB1100 is not set
+ # CONFIG_MIPS_PB1500 is not set
+-# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_PB1550 is not set
++# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_XXS1500 is not set
+ # CONFIG_MIPS_MTX1 is not set
+ # CONFIG_COGENT_CSB250 is not set
 @@ -226,11 +226,6 @@
  #
  # CONFIG_IPX is not set
@@ -6860,10 +7680,46 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-nino linux-mips/arch/mips/defconfig-n
  # CONFIG_DECNET is not set
  # CONFIG_BRIDGE is not set
  # CONFIG_X25 is not set
-diff -Nur linux-2.4.29/arch/mips/defconfig-ocelot linux-mips/arch/mips/defconfig-ocelot
---- linux-2.4.29/arch/mips/defconfig-ocelot	2005-01-19 15:09:28.000000000 +0100
-+++ linux-mips/arch/mips/defconfig-ocelot	2005-01-09 20:33:59.000000000 +0100
-@@ -307,11 +307,6 @@
+@@ -339,7 +334,6 @@
+ # CONFIG_SERIAL_TXX9 is not set
+ # CONFIG_SERIAL_TXX9_CONSOLE is not set
+ # CONFIG_TXX927_SERIAL is not set
+-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
+ # CONFIG_UNIX98_PTYS is not set
+ 
+ #
+diff -Nur linux-2.4.30/arch/mips/defconfig-ocelot linux-2.4.30-mips/arch/mips/defconfig-ocelot
+--- linux-2.4.30/arch/mips/defconfig-ocelot	2005-01-19 15:09:28.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/defconfig-ocelot	2005-03-18 13:13:21.000000000 +0100
+@@ -28,8 +28,8 @@
+ # CONFIG_MIPS_PB1000 is not set
+ # CONFIG_MIPS_PB1100 is not set
+ # CONFIG_MIPS_PB1500 is not set
+-# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_PB1550 is not set
++# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_XXS1500 is not set
+ # CONFIG_MIPS_MTX1 is not set
+ # CONFIG_COGENT_CSB250 is not set
+@@ -194,9 +194,7 @@
+ # CONFIG_MTD_BOSPORUS is not set
+ # CONFIG_MTD_XXS1500 is not set
+ # CONFIG_MTD_MTX1 is not set
+-# CONFIG_MTD_DB1X00 is not set
+ # CONFIG_MTD_PB1550 is not set
+-# CONFIG_MTD_HYDROGEN3 is not set
+ # CONFIG_MTD_MIRAGE is not set
+ # CONFIG_MTD_CSTM_MIPS_IXX is not set
+ CONFIG_MTD_OCELOT=y
+@@ -215,7 +213,6 @@
+ #
+ # Disk-On-Chip Device Drivers
+ #
+-# CONFIG_MTD_DOC1000 is not set
+ CONFIG_MTD_DOC2000=y
+ # CONFIG_MTD_DOC2001 is not set
+ CONFIG_MTD_DOCPROBE=y
+@@ -307,11 +304,6 @@
  #
  # CONFIG_IPX is not set
  # CONFIG_ATALK is not set
@@ -6875,9 +7731,27 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-ocelot linux-mips/arch/mips/defconfig
  # CONFIG_DECNET is not set
  # CONFIG_BRIDGE is not set
  # CONFIG_X25 is not set
-diff -Nur linux-2.4.29/arch/mips/defconfig-osprey linux-mips/arch/mips/defconfig-osprey
---- linux-2.4.29/arch/mips/defconfig-osprey	2005-01-19 15:09:28.000000000 +0100
-+++ linux-mips/arch/mips/defconfig-osprey	2005-01-09 20:33:59.000000000 +0100
+@@ -513,7 +505,6 @@
+ CONFIG_SERIAL_CONSOLE=y
+ # CONFIG_SERIAL_EXTENDED is not set
+ # CONFIG_SERIAL_NONSTANDARD is not set
+-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
+ CONFIG_UNIX98_PTYS=y
+ CONFIG_UNIX98_PTY_COUNT=256
+ 
+diff -Nur linux-2.4.30/arch/mips/defconfig-osprey linux-2.4.30-mips/arch/mips/defconfig-osprey
+--- linux-2.4.30/arch/mips/defconfig-osprey	2005-01-19 15:09:28.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/defconfig-osprey	2005-03-18 13:13:21.000000000 +0100
+@@ -30,8 +30,8 @@
+ # CONFIG_MIPS_PB1000 is not set
+ # CONFIG_MIPS_PB1100 is not set
+ # CONFIG_MIPS_PB1500 is not set
+-# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_PB1550 is not set
++# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_XXS1500 is not set
+ # CONFIG_MIPS_MTX1 is not set
+ # CONFIG_COGENT_CSB250 is not set
 @@ -227,11 +227,6 @@
  #
  # CONFIG_IPX is not set
@@ -6890,31 +7764,46 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-osprey linux-mips/arch/mips/defconfig
  # CONFIG_DECNET is not set
  # CONFIG_BRIDGE is not set
  # CONFIG_X25 is not set
-diff -Nur linux-2.4.29/arch/mips/defconfig-pb1000 linux-mips/arch/mips/defconfig-pb1000
---- linux-2.4.29/arch/mips/defconfig-pb1000	2005-01-19 15:09:28.000000000 +0100
-+++ linux-mips/arch/mips/defconfig-pb1000	2005-02-03 07:35:29.000000000 +0100
-@@ -22,16 +22,19 @@
- #
- # CONFIG_ACER_PICA_61 is not set
- # CONFIG_MIPS_BOSPORUS is not set
-+# CONFIG_MIPS_FICMMP is not set
- # CONFIG_MIPS_MIRAGE is not set
- # CONFIG_MIPS_DB1000 is not set
- # CONFIG_MIPS_DB1100 is not set
- # CONFIG_MIPS_DB1500 is not set
- # CONFIG_MIPS_DB1550 is not set
-+# CONFIG_MIPS_DB1200 is not set
+@@ -388,7 +383,6 @@
+ # CONFIG_SERIAL_MULTIPORT is not set
+ # CONFIG_HUB6 is not set
+ # CONFIG_SERIAL_NONSTANDARD is not set
+-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
+ # CONFIG_VR41XX_KIU is not set
+ CONFIG_UNIX98_PTYS=y
+ CONFIG_UNIX98_PTY_COUNT=256
+diff -Nur linux-2.4.30/arch/mips/defconfig-pb1000 linux-2.4.30-mips/arch/mips/defconfig-pb1000
+--- linux-2.4.30/arch/mips/defconfig-pb1000	2005-01-19 15:09:28.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/defconfig-pb1000	2005-03-18 13:13:21.000000000 +0100
+@@ -30,8 +30,8 @@
  CONFIG_MIPS_PB1000=y
  # CONFIG_MIPS_PB1100 is not set
  # CONFIG_MIPS_PB1500 is not set
 -# CONFIG_MIPS_HYDROGEN3 is not set
  # CONFIG_MIPS_PB1550 is not set
-+# CONFIG_MIPS_PB1200 is not set
 +# CONFIG_MIPS_HYDROGEN3 is not set
  # CONFIG_MIPS_XXS1500 is not set
  # CONFIG_MIPS_MTX1 is not set
  # CONFIG_COGENT_CSB250 is not set
-@@ -324,11 +327,6 @@
+@@ -215,9 +215,7 @@
+ # CONFIG_MTD_BOSPORUS is not set
+ # CONFIG_MTD_XXS1500 is not set
+ # CONFIG_MTD_MTX1 is not set
+-# CONFIG_MTD_DB1X00 is not set
+ # CONFIG_MTD_PB1550 is not set
+-# CONFIG_MTD_HYDROGEN3 is not set
+ # CONFIG_MTD_MIRAGE is not set
+ # CONFIG_MTD_CSTM_MIPS_IXX is not set
+ # CONFIG_MTD_OCELOT is not set
+@@ -236,7 +234,6 @@
+ #
+ # Disk-On-Chip Device Drivers
+ #
+-# CONFIG_MTD_DOC1000 is not set
+ # CONFIG_MTD_DOC2000 is not set
+ # CONFIG_MTD_DOC2001 is not set
+ # CONFIG_MTD_DOCPROBE is not set
+@@ -324,11 +321,6 @@
  #
  # CONFIG_IPX is not set
  # CONFIG_ATALK is not set
@@ -6926,7 +7815,15 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-pb1000 linux-mips/arch/mips/defconfig
  # CONFIG_DECNET is not set
  # CONFIG_BRIDGE is not set
  # CONFIG_X25 is not set
-@@ -707,7 +705,7 @@
+@@ -622,7 +614,6 @@
+ # CONFIG_AU1X00_USB_TTY is not set
+ # CONFIG_AU1X00_USB_RAW is not set
+ # CONFIG_TXX927_SERIAL is not set
+-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
+ CONFIG_UNIX98_PTYS=y
+ CONFIG_UNIX98_PTY_COUNT=256
+ 
+@@ -707,7 +698,7 @@
  #
  # CONFIG_PCMCIA_SERIAL_CS is not set
  # CONFIG_SYNCLINK_CS is not set
@@ -6935,31 +7832,38 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-pb1000 linux-mips/arch/mips/defconfig
  # CONFIG_TS_AU1X00_ADS7846 is not set
  
  #
-diff -Nur linux-2.4.29/arch/mips/defconfig-pb1100 linux-mips/arch/mips/defconfig-pb1100
---- linux-2.4.29/arch/mips/defconfig-pb1100	2005-01-19 15:09:28.000000000 +0100
-+++ linux-mips/arch/mips/defconfig-pb1100	2005-02-03 07:35:29.000000000 +0100
-@@ -22,16 +22,19 @@
- #
- # CONFIG_ACER_PICA_61 is not set
- # CONFIG_MIPS_BOSPORUS is not set
-+# CONFIG_MIPS_FICMMP is not set
- # CONFIG_MIPS_MIRAGE is not set
- # CONFIG_MIPS_DB1000 is not set
- # CONFIG_MIPS_DB1100 is not set
- # CONFIG_MIPS_DB1500 is not set
- # CONFIG_MIPS_DB1550 is not set
-+# CONFIG_MIPS_DB1200 is not set
+diff -Nur linux-2.4.30/arch/mips/defconfig-pb1100 linux-2.4.30-mips/arch/mips/defconfig-pb1100
+--- linux-2.4.30/arch/mips/defconfig-pb1100	2005-01-19 15:09:28.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/defconfig-pb1100	2005-03-18 13:13:21.000000000 +0100
+@@ -30,8 +30,8 @@
  # CONFIG_MIPS_PB1000 is not set
  CONFIG_MIPS_PB1100=y
  # CONFIG_MIPS_PB1500 is not set
 -# CONFIG_MIPS_HYDROGEN3 is not set
  # CONFIG_MIPS_PB1550 is not set
-+# CONFIG_MIPS_PB1200 is not set
 +# CONFIG_MIPS_HYDROGEN3 is not set
  # CONFIG_MIPS_XXS1500 is not set
  # CONFIG_MIPS_MTX1 is not set
  # CONFIG_COGENT_CSB250 is not set
-@@ -324,11 +327,6 @@
+@@ -198,9 +198,7 @@
+ # CONFIG_MTD_MTX1 is not set
+ CONFIG_MTD_PB1500_BOOT=y
+ CONFIG_MTD_PB1500_USER=y
+-# CONFIG_MTD_DB1X00 is not set
+ # CONFIG_MTD_PB1550 is not set
+-# CONFIG_MTD_HYDROGEN3 is not set
+ # CONFIG_MTD_MIRAGE is not set
+ # CONFIG_MTD_CSTM_MIPS_IXX is not set
+ # CONFIG_MTD_OCELOT is not set
+@@ -219,7 +217,6 @@
+ #
+ # Disk-On-Chip Device Drivers
+ #
+-# CONFIG_MTD_DOC1000 is not set
+ # CONFIG_MTD_DOC2000 is not set
+ # CONFIG_MTD_DOC2001 is not set
+ # CONFIG_MTD_DOCPROBE is not set
+@@ -324,11 +321,6 @@
  #
  # CONFIG_IPX is not set
  # CONFIG_ATALK is not set
@@ -6971,10 +7875,34 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-pb1100 linux-mips/arch/mips/defconfig
  # CONFIG_DECNET is not set
  # CONFIG_BRIDGE is not set
  # CONFIG_X25 is not set
-diff -Nur linux-2.4.29/arch/mips/defconfig-pb1200 linux-mips/arch/mips/defconfig-pb1200
---- linux-2.4.29/arch/mips/defconfig-pb1200	1970-01-01 01:00:00.000000000 +0100
-+++ linux-mips/arch/mips/defconfig-pb1200	2005-01-30 09:01:27.000000000 +0100
-@@ -0,0 +1,1063 @@
+@@ -613,7 +605,6 @@
+ # CONFIG_AU1X00_USB_TTY is not set
+ # CONFIG_AU1X00_USB_RAW is not set
+ # CONFIG_TXX927_SERIAL is not set
+-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
+ CONFIG_UNIX98_PTYS=y
+ CONFIG_UNIX98_PTY_COUNT=256
+ 
+@@ -859,6 +850,7 @@
+ # CONFIG_FB_PM2 is not set
+ # CONFIG_FB_PM3 is not set
+ # CONFIG_FB_CYBER2000 is not set
++CONFIG_FB_AU1100=y
+ # CONFIG_FB_MATROX is not set
+ # CONFIG_FB_ATY is not set
+ # CONFIG_FB_RADEON is not set
+@@ -870,7 +862,6 @@
+ # CONFIG_FB_VOODOO1 is not set
+ # CONFIG_FB_TRIDENT is not set
+ # CONFIG_FB_E1356 is not set
+-CONFIG_FB_AU1100=y
+ # CONFIG_FB_IT8181 is not set
+ # CONFIG_FB_VIRTUAL is not set
+ CONFIG_FBCON_ADVANCED=y
+diff -Nur linux-2.4.30/arch/mips/defconfig-pb1200 linux-2.4.30-mips/arch/mips/defconfig-pb1200
+--- linux-2.4.30/arch/mips/defconfig-pb1200	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/defconfig-pb1200	2005-03-18 13:13:21.000000000 +0100
+@@ -0,0 +1,1060 @@
 +#
 +# Automatically generated make config: don't edit
 +#
@@ -6999,18 +7927,15 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-pb1200 linux-mips/arch/mips/defconfig
 +#
 +# CONFIG_ACER_PICA_61 is not set
 +# CONFIG_MIPS_BOSPORUS is not set
-+# CONFIG_MIPS_FICMMP is not set
 +# CONFIG_MIPS_MIRAGE is not set
 +# CONFIG_MIPS_DB1000 is not set
 +# CONFIG_MIPS_DB1100 is not set
 +# CONFIG_MIPS_DB1500 is not set
 +# CONFIG_MIPS_DB1550 is not set
-+# CONFIG_MIPS_DB1200 is not set
 +# CONFIG_MIPS_PB1000 is not set
 +# CONFIG_MIPS_PB1100 is not set
 +# CONFIG_MIPS_PB1500 is not set
 +# CONFIG_MIPS_PB1550 is not set
-+CONFIG_MIPS_PB1200=y
 +# CONFIG_MIPS_HYDROGEN3 is not set
 +# CONFIG_MIPS_XXS1500 is not set
 +# CONFIG_MIPS_MTX1 is not set
@@ -7368,6 +8293,7 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-pb1200 linux-mips/arch/mips/defconfig
 +# CONFIG_SCSI_SATA_SVW is not set
 +# CONFIG_SCSI_ATA_PIIX is not set
 +# CONFIG_SCSI_SATA_NV is not set
++# CONFIG_SCSI_SATA_QSTOR is not set
 +# CONFIG_SCSI_SATA_PROMISE is not set
 +# CONFIG_SCSI_SATA_SX4 is not set
 +# CONFIG_SCSI_SATA_SIL is not set
@@ -7581,7 +8507,6 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-pb1200 linux-mips/arch/mips/defconfig
 +# CONFIG_AU1X00_USB_TTY is not set
 +# CONFIG_AU1X00_USB_RAW is not set
 +# CONFIG_TXX927_SERIAL is not set
-+# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
 +CONFIG_UNIX98_PTYS=y
 +CONFIG_UNIX98_PTY_COUNT=256
 +
@@ -8038,31 +8963,38 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-pb1200 linux-mips/arch/mips/defconfig
 +CONFIG_ZLIB_INFLATE=m
 +CONFIG_ZLIB_DEFLATE=m
 +# CONFIG_FW_LOADER is not set
-diff -Nur linux-2.4.29/arch/mips/defconfig-pb1500 linux-mips/arch/mips/defconfig-pb1500
---- linux-2.4.29/arch/mips/defconfig-pb1500	2005-01-19 15:09:28.000000000 +0100
-+++ linux-mips/arch/mips/defconfig-pb1500	2005-02-03 07:35:29.000000000 +0100
-@@ -22,16 +22,19 @@
- #
- # CONFIG_ACER_PICA_61 is not set
- # CONFIG_MIPS_BOSPORUS is not set
-+# CONFIG_MIPS_FICMMP is not set
- # CONFIG_MIPS_MIRAGE is not set
- # CONFIG_MIPS_DB1000 is not set
- # CONFIG_MIPS_DB1100 is not set
- # CONFIG_MIPS_DB1500 is not set
- # CONFIG_MIPS_DB1550 is not set
-+# CONFIG_MIPS_DB1200 is not set
+diff -Nur linux-2.4.30/arch/mips/defconfig-pb1500 linux-2.4.30-mips/arch/mips/defconfig-pb1500
+--- linux-2.4.30/arch/mips/defconfig-pb1500	2005-01-19 15:09:28.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/defconfig-pb1500	2005-03-18 13:13:21.000000000 +0100
+@@ -30,8 +30,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 is not set
  CONFIG_MIPS_PB1500=y
 -# CONFIG_MIPS_HYDROGEN3 is not set
  # CONFIG_MIPS_PB1550 is not set
-+# CONFIG_MIPS_PB1200 is not set
 +# CONFIG_MIPS_HYDROGEN3 is not set
  # CONFIG_MIPS_XXS1500 is not set
  # CONFIG_MIPS_MTX1 is not set
  # CONFIG_COGENT_CSB250 is not set
-@@ -341,11 +344,6 @@
+@@ -215,9 +215,7 @@
+ # CONFIG_MTD_MTX1 is not set
+ CONFIG_MTD_PB1500_BOOT=y
+ # CONFIG_MTD_PB1500_USER is not set
+-# CONFIG_MTD_DB1X00 is not set
+ # CONFIG_MTD_PB1550 is not set
+-# CONFIG_MTD_HYDROGEN3 is not set
+ # CONFIG_MTD_MIRAGE is not set
+ # CONFIG_MTD_CSTM_MIPS_IXX is not set
+ # CONFIG_MTD_OCELOT is not set
+@@ -236,7 +234,6 @@
+ #
+ # Disk-On-Chip Device Drivers
+ #
+-# CONFIG_MTD_DOC1000 is not set
+ # CONFIG_MTD_DOC2000 is not set
+ # CONFIG_MTD_DOC2001 is not set
+ # CONFIG_MTD_DOCPROBE is not set
+@@ -341,11 +338,6 @@
  #
  # CONFIG_IPX is not set
  # CONFIG_ATALK is not set
@@ -8074,31 +9006,48 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-pb1500 linux-mips/arch/mips/defconfig
  # CONFIG_DECNET is not set
  # CONFIG_BRIDGE is not set
  # CONFIG_X25 is not set
-diff -Nur linux-2.4.29/arch/mips/defconfig-pb1550 linux-mips/arch/mips/defconfig-pb1550
---- linux-2.4.29/arch/mips/defconfig-pb1550	2005-01-19 15:09:29.000000000 +0100
-+++ linux-mips/arch/mips/defconfig-pb1550	2005-02-03 07:35:29.000000000 +0100
-@@ -22,16 +22,19 @@
- #
- # CONFIG_ACER_PICA_61 is not set
- # CONFIG_MIPS_BOSPORUS is not set
-+# CONFIG_MIPS_FICMMP is not set
- # CONFIG_MIPS_MIRAGE is not set
- # CONFIG_MIPS_DB1000 is not set
- # CONFIG_MIPS_DB1100 is not set
- # CONFIG_MIPS_DB1500 is not set
- # CONFIG_MIPS_DB1550 is not set
-+# CONFIG_MIPS_DB1200 is not set
+@@ -675,7 +667,6 @@
+ # CONFIG_AU1X00_USB_TTY is not set
+ # CONFIG_AU1X00_USB_RAW is not set
+ # CONFIG_TXX927_SERIAL is not set
+-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
+ CONFIG_UNIX98_PTYS=y
+ CONFIG_UNIX98_PTY_COUNT=256
+ 
+diff -Nur linux-2.4.30/arch/mips/defconfig-pb1550 linux-2.4.30-mips/arch/mips/defconfig-pb1550
+--- linux-2.4.30/arch/mips/defconfig-pb1550	2005-01-19 15:09:29.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/defconfig-pb1550	2005-03-18 13:13:21.000000000 +0100
+@@ -30,8 +30,8 @@
  # CONFIG_MIPS_PB1000 is not set
  # CONFIG_MIPS_PB1100 is not set
  # CONFIG_MIPS_PB1500 is not set
 -# CONFIG_MIPS_HYDROGEN3 is not set
  CONFIG_MIPS_PB1550=y
-+# CONFIG_MIPS_PB1200 is not set
 +# CONFIG_MIPS_HYDROGEN3 is not set
  # CONFIG_MIPS_XXS1500 is not set
  # CONFIG_MIPS_MTX1 is not set
  # CONFIG_COGENT_CSB250 is not set
-@@ -343,11 +346,6 @@
+@@ -213,11 +213,9 @@
+ # CONFIG_MTD_BOSPORUS is not set
+ # CONFIG_MTD_XXS1500 is not set
+ # CONFIG_MTD_MTX1 is not set
+-# CONFIG_MTD_DB1X00 is not set
+ CONFIG_MTD_PB1550=y
+ CONFIG_MTD_PB1550_BOOT=y
+ CONFIG_MTD_PB1550_USER=y
+-# CONFIG_MTD_HYDROGEN3 is not set
+ # CONFIG_MTD_MIRAGE is not set
+ # CONFIG_MTD_CSTM_MIPS_IXX is not set
+ # CONFIG_MTD_OCELOT is not set
+@@ -236,7 +234,6 @@
+ #
+ # Disk-On-Chip Device Drivers
+ #
+-# CONFIG_MTD_DOC1000 is not set
+ # CONFIG_MTD_DOC2000 is not set
+ # CONFIG_MTD_DOC2001 is not set
+ # CONFIG_MTD_DOCPROBE is not set
+@@ -343,11 +340,6 @@
  #
  # CONFIG_IPX is not set
  # CONFIG_ATALK is not set
@@ -8110,9 +9059,27 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-pb1550 linux-mips/arch/mips/defconfig
  # CONFIG_DECNET is not set
  # CONFIG_BRIDGE is not set
  # CONFIG_X25 is not set
-diff -Nur linux-2.4.29/arch/mips/defconfig-rbtx4927 linux-mips/arch/mips/defconfig-rbtx4927
---- linux-2.4.29/arch/mips/defconfig-rbtx4927	2005-01-19 15:09:29.000000000 +0100
-+++ linux-mips/arch/mips/defconfig-rbtx4927	2005-01-09 20:33:59.000000000 +0100
+@@ -633,7 +625,6 @@
+ # CONFIG_AU1X00_USB_TTY is not set
+ # CONFIG_AU1X00_USB_RAW is not set
+ # CONFIG_TXX927_SERIAL is not set
+-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
+ CONFIG_UNIX98_PTYS=y
+ CONFIG_UNIX98_PTY_COUNT=256
+ 
+diff -Nur linux-2.4.30/arch/mips/defconfig-rbtx4927 linux-2.4.30-mips/arch/mips/defconfig-rbtx4927
+--- linux-2.4.30/arch/mips/defconfig-rbtx4927	2005-01-19 15:09:29.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/defconfig-rbtx4927	2005-03-18 13:13:21.000000000 +0100
+@@ -28,8 +28,8 @@
+ # CONFIG_MIPS_PB1000 is not set
+ # CONFIG_MIPS_PB1100 is not set
+ # CONFIG_MIPS_PB1500 is not set
+-# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_PB1550 is not set
++# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_XXS1500 is not set
+ # CONFIG_MIPS_MTX1 is not set
+ # CONFIG_COGENT_CSB250 is not set
 @@ -223,11 +223,6 @@
  #
  # CONFIG_IPX is not set
@@ -8125,9 +9092,27 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-rbtx4927 linux-mips/arch/mips/defconf
  # CONFIG_DECNET is not set
  # CONFIG_BRIDGE is not set
  # CONFIG_X25 is not set
-diff -Nur linux-2.4.29/arch/mips/defconfig-rm200 linux-mips/arch/mips/defconfig-rm200
---- linux-2.4.29/arch/mips/defconfig-rm200	2005-01-19 15:09:29.000000000 +0100
-+++ linux-mips/arch/mips/defconfig-rm200	2005-01-09 20:33:59.000000000 +0100
+@@ -466,7 +461,6 @@
+ CONFIG_SERIAL_TXX9=y
+ CONFIG_SERIAL_TXX9_CONSOLE=y
+ # CONFIG_TXX927_SERIAL is not set
+-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
+ # CONFIG_UNIX98_PTYS is not set
+ 
+ #
+diff -Nur linux-2.4.30/arch/mips/defconfig-rm200 linux-2.4.30-mips/arch/mips/defconfig-rm200
+--- linux-2.4.30/arch/mips/defconfig-rm200	2005-01-19 15:09:29.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/defconfig-rm200	2005-03-18 13:13:21.000000000 +0100
+@@ -30,8 +30,8 @@
+ # CONFIG_MIPS_PB1000 is not set
+ # CONFIG_MIPS_PB1100 is not set
+ # CONFIG_MIPS_PB1500 is not set
+-# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_PB1550 is not set
++# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_XXS1500 is not set
+ # CONFIG_MIPS_MTX1 is not set
+ # CONFIG_COGENT_CSB250 is not set
 @@ -229,11 +229,6 @@
  #
  # CONFIG_IPX is not set
@@ -8140,9 +9125,27 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-rm200 linux-mips/arch/mips/defconfig-
  # CONFIG_DECNET is not set
  # CONFIG_BRIDGE is not set
  # CONFIG_X25 is not set
-diff -Nur linux-2.4.29/arch/mips/defconfig-sb1250-swarm linux-mips/arch/mips/defconfig-sb1250-swarm
---- linux-2.4.29/arch/mips/defconfig-sb1250-swarm	2005-01-19 15:09:29.000000000 +0100
-+++ linux-mips/arch/mips/defconfig-sb1250-swarm	2005-01-09 20:33:59.000000000 +0100
+@@ -340,7 +335,6 @@
+ # CONFIG_SERIAL is not set
+ # CONFIG_SERIAL_EXTENDED is not set
+ # CONFIG_SERIAL_NONSTANDARD is not set
+-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
+ CONFIG_UNIX98_PTYS=y
+ CONFIG_UNIX98_PTY_COUNT=256
+ 
+diff -Nur linux-2.4.30/arch/mips/defconfig-sb1250-swarm linux-2.4.30-mips/arch/mips/defconfig-sb1250-swarm
+--- linux-2.4.30/arch/mips/defconfig-sb1250-swarm	2005-01-19 15:09:29.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/defconfig-sb1250-swarm	2005-03-18 13:13:21.000000000 +0100
+@@ -30,8 +30,8 @@
+ # CONFIG_MIPS_PB1000 is not set
+ # CONFIG_MIPS_PB1100 is not set
+ # CONFIG_MIPS_PB1500 is not set
+-# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_PB1550 is not set
++# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_XXS1500 is not set
+ # CONFIG_MIPS_MTX1 is not set
+ # CONFIG_COGENT_CSB250 is not set
 @@ -90,6 +90,7 @@
  # CONFIG_SIBYTE_TBPROF is not set
  CONFIG_SIBYTE_GENBUS_IDE=y
@@ -8163,9 +9166,48 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-sb1250-swarm linux-mips/arch/mips/def
  # CONFIG_DECNET is not set
  # CONFIG_BRIDGE is not set
  # CONFIG_X25 is not set
-diff -Nur linux-2.4.29/arch/mips/defconfig-stretch linux-mips/arch/mips/defconfig-stretch
---- linux-2.4.29/arch/mips/defconfig-stretch	2005-01-19 15:09:29.000000000 +0100
-+++ linux-mips/arch/mips/defconfig-stretch	2005-01-09 20:33:59.000000000 +0100
+@@ -469,7 +465,6 @@
+ CONFIG_SIBYTE_SB1250_DUART=y
+ CONFIG_SIBYTE_SB1250_DUART_CONSOLE=y
+ CONFIG_SERIAL_CONSOLE=y
+-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
+ CONFIG_UNIX98_PTYS=y
+ CONFIG_UNIX98_PTY_COUNT=256
+ 
+diff -Nur linux-2.4.30/arch/mips/defconfig-sead linux-2.4.30-mips/arch/mips/defconfig-sead
+--- linux-2.4.30/arch/mips/defconfig-sead	2005-01-19 15:09:29.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/defconfig-sead	2005-03-18 13:13:21.000000000 +0100
+@@ -28,8 +28,8 @@
+ # CONFIG_MIPS_PB1000 is not set
+ # CONFIG_MIPS_PB1100 is not set
+ # CONFIG_MIPS_PB1500 is not set
+-# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_PB1550 is not set
++# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_XXS1500 is not set
+ # CONFIG_MIPS_MTX1 is not set
+ # CONFIG_COGENT_CSB250 is not set
+@@ -244,7 +244,6 @@
+ CONFIG_SERIAL_CONSOLE=y
+ # CONFIG_SERIAL_EXTENDED is not set
+ # CONFIG_SERIAL_NONSTANDARD is not set
+-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
+ # CONFIG_UNIX98_PTYS is not set
+ 
+ #
+diff -Nur linux-2.4.30/arch/mips/defconfig-stretch linux-2.4.30-mips/arch/mips/defconfig-stretch
+--- linux-2.4.30/arch/mips/defconfig-stretch	2005-01-19 15:09:29.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/defconfig-stretch	2005-03-18 13:13:21.000000000 +0100
+@@ -30,8 +30,8 @@
+ # CONFIG_MIPS_PB1000 is not set
+ # CONFIG_MIPS_PB1100 is not set
+ # CONFIG_MIPS_PB1500 is not set
+-# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_PB1550 is not set
++# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_XXS1500 is not set
+ # CONFIG_MIPS_MTX1 is not set
+ # CONFIG_COGENT_CSB250 is not set
 @@ -240,11 +240,6 @@
  #
  # CONFIG_IPX is not set
@@ -8178,7 +9220,7 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-stretch linux-mips/arch/mips/defconfi
  # CONFIG_DECNET is not set
  # CONFIG_BRIDGE is not set
  # CONFIG_X25 is not set
-@@ -324,6 +319,7 @@
+@@ -324,9 +319,11 @@
  # CONFIG_SCSI_MEGARAID is not set
  # CONFIG_SCSI_MEGARAID2 is not set
  # CONFIG_SCSI_SATA is not set
@@ -8186,9 +9228,31 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-stretch linux-mips/arch/mips/defconfi
  # CONFIG_SCSI_SATA_SVW is not set
  # CONFIG_SCSI_ATA_PIIX is not set
  # CONFIG_SCSI_SATA_NV is not set
-diff -Nur linux-2.4.29/arch/mips/defconfig-tb0226 linux-mips/arch/mips/defconfig-tb0226
---- linux-2.4.29/arch/mips/defconfig-tb0226	2005-01-19 15:09:29.000000000 +0100
-+++ linux-mips/arch/mips/defconfig-tb0226	2005-01-09 20:34:00.000000000 +0100
++# CONFIG_SCSI_SATA_QSTOR is not set
+ # CONFIG_SCSI_SATA_PROMISE is not set
+ # CONFIG_SCSI_SATA_SX4 is not set
+ # CONFIG_SCSI_SATA_SIL is not set
+@@ -516,7 +513,6 @@
+ # CONFIG_SERIAL_TXX9 is not set
+ # CONFIG_SERIAL_TXX9_CONSOLE is not set
+ # CONFIG_TXX927_SERIAL is not set
+-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
+ CONFIG_UNIX98_PTYS=y
+ CONFIG_UNIX98_PTY_COUNT=256
+ 
+diff -Nur linux-2.4.30/arch/mips/defconfig-tb0226 linux-2.4.30-mips/arch/mips/defconfig-tb0226
+--- linux-2.4.30/arch/mips/defconfig-tb0226	2005-01-19 15:09:29.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/defconfig-tb0226	2005-03-18 13:13:21.000000000 +0100
+@@ -30,8 +30,8 @@
+ # CONFIG_MIPS_PB1000 is not set
+ # CONFIG_MIPS_PB1100 is not set
+ # CONFIG_MIPS_PB1500 is not set
+-# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_PB1550 is not set
++# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_XXS1500 is not set
+ # CONFIG_MIPS_MTX1 is not set
+ # CONFIG_COGENT_CSB250 is not set
 @@ -228,11 +228,6 @@
  #
  # CONFIG_IPX is not set
@@ -8201,7 +9265,7 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-tb0226 linux-mips/arch/mips/defconfig
  # CONFIG_DECNET is not set
  # CONFIG_BRIDGE is not set
  # CONFIG_X25 is not set
-@@ -312,6 +307,7 @@
+@@ -312,9 +307,11 @@
  # CONFIG_SCSI_MEGARAID is not set
  # CONFIG_SCSI_MEGARAID2 is not set
  # CONFIG_SCSI_SATA is not set
@@ -8209,9 +9273,31 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-tb0226 linux-mips/arch/mips/defconfig
  # CONFIG_SCSI_SATA_SVW is not set
  # CONFIG_SCSI_ATA_PIIX is not set
  # CONFIG_SCSI_SATA_NV is not set
-diff -Nur linux-2.4.29/arch/mips/defconfig-tb0229 linux-mips/arch/mips/defconfig-tb0229
---- linux-2.4.29/arch/mips/defconfig-tb0229	2005-01-19 15:09:29.000000000 +0100
-+++ linux-mips/arch/mips/defconfig-tb0229	2005-01-09 20:34:00.000000000 +0100
++# CONFIG_SCSI_SATA_QSTOR is not set
+ # CONFIG_SCSI_SATA_PROMISE is not set
+ # CONFIG_SCSI_SATA_SX4 is not set
+ # CONFIG_SCSI_SATA_SIL is not set
+@@ -518,7 +515,6 @@
+ CONFIG_SERIAL_CONSOLE=y
+ # CONFIG_SERIAL_EXTENDED is not set
+ # CONFIG_SERIAL_NONSTANDARD is not set
+-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
+ # CONFIG_VR41XX_KIU is not set
+ CONFIG_UNIX98_PTYS=y
+ CONFIG_UNIX98_PTY_COUNT=256
+diff -Nur linux-2.4.30/arch/mips/defconfig-tb0229 linux-2.4.30-mips/arch/mips/defconfig-tb0229
+--- linux-2.4.30/arch/mips/defconfig-tb0229	2005-01-19 15:09:29.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/defconfig-tb0229	2005-03-18 13:13:21.000000000 +0100
+@@ -30,8 +30,8 @@
+ # CONFIG_MIPS_PB1000 is not set
+ # CONFIG_MIPS_PB1100 is not set
+ # CONFIG_MIPS_PB1500 is not set
+-# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_PB1550 is not set
++# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_XXS1500 is not set
+ # CONFIG_MIPS_MTX1 is not set
+ # CONFIG_COGENT_CSB250 is not set
 @@ -230,11 +230,6 @@
  #
  # CONFIG_IPX is not set
@@ -8224,10 +9310,46 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-tb0229 linux-mips/arch/mips/defconfig
  # CONFIG_DECNET is not set
  # CONFIG_BRIDGE is not set
  # CONFIG_X25 is not set
-diff -Nur linux-2.4.29/arch/mips/defconfig-ti1500 linux-mips/arch/mips/defconfig-ti1500
---- linux-2.4.29/arch/mips/defconfig-ti1500	2005-01-19 15:09:29.000000000 +0100
-+++ linux-mips/arch/mips/defconfig-ti1500	2005-01-09 20:34:00.000000000 +0100
-@@ -339,11 +339,6 @@
+@@ -445,7 +440,6 @@
+ CONFIG_SERIAL_CONSOLE=y
+ # CONFIG_SERIAL_EXTENDED is not set
+ # CONFIG_SERIAL_NONSTANDARD is not set
+-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
+ # CONFIG_VR41XX_KIU is not set
+ CONFIG_UNIX98_PTYS=y
+ CONFIG_UNIX98_PTY_COUNT=256
+diff -Nur linux-2.4.30/arch/mips/defconfig-ti1500 linux-2.4.30-mips/arch/mips/defconfig-ti1500
+--- linux-2.4.30/arch/mips/defconfig-ti1500	2005-01-19 15:09:29.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/defconfig-ti1500	2005-03-18 13:13:21.000000000 +0100
+@@ -30,8 +30,8 @@
+ # CONFIG_MIPS_PB1000 is not set
+ # CONFIG_MIPS_PB1100 is not set
+ # CONFIG_MIPS_PB1500 is not set
+-# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_PB1550 is not set
++# CONFIG_MIPS_HYDROGEN3 is not set
+ CONFIG_MIPS_XXS1500=y
+ # CONFIG_MIPS_MTX1 is not set
+ # CONFIG_COGENT_CSB250 is not set
+@@ -213,9 +213,7 @@
+ # CONFIG_MTD_BOSPORUS is not set
+ CONFIG_MTD_XXS1500=y
+ # CONFIG_MTD_MTX1 is not set
+-# CONFIG_MTD_DB1X00 is not set
+ # CONFIG_MTD_PB1550 is not set
+-# CONFIG_MTD_HYDROGEN3 is not set
+ # CONFIG_MTD_MIRAGE is not set
+ # CONFIG_MTD_CSTM_MIPS_IXX is not set
+ # CONFIG_MTD_OCELOT is not set
+@@ -234,7 +232,6 @@
+ #
+ # Disk-On-Chip Device Drivers
+ #
+-# CONFIG_MTD_DOC1000 is not set
+ # CONFIG_MTD_DOC2000 is not set
+ # CONFIG_MTD_DOC2001 is not set
+ # CONFIG_MTD_DOCPROBE is not set
+@@ -339,11 +336,6 @@
  #
  # CONFIG_IPX is not set
  # CONFIG_ATALK is not set
@@ -8239,9 +9361,27 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-ti1500 linux-mips/arch/mips/defconfig
  # CONFIG_DECNET is not set
  # CONFIG_BRIDGE is not set
  # CONFIG_X25 is not set
-diff -Nur linux-2.4.29/arch/mips/defconfig-workpad linux-mips/arch/mips/defconfig-workpad
---- linux-2.4.29/arch/mips/defconfig-workpad	2005-01-19 15:09:29.000000000 +0100
-+++ linux-mips/arch/mips/defconfig-workpad	2005-01-09 20:34:00.000000000 +0100
+@@ -600,7 +592,6 @@
+ # CONFIG_AU1X00_USB_TTY is not set
+ # CONFIG_AU1X00_USB_RAW is not set
+ # CONFIG_TXX927_SERIAL is not set
+-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
+ CONFIG_UNIX98_PTYS=y
+ CONFIG_UNIX98_PTY_COUNT=256
+ 
+diff -Nur linux-2.4.30/arch/mips/defconfig-workpad linux-2.4.30-mips/arch/mips/defconfig-workpad
+--- linux-2.4.30/arch/mips/defconfig-workpad	2005-01-19 15:09:29.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/defconfig-workpad	2005-03-18 13:13:21.000000000 +0100
+@@ -30,8 +30,8 @@
+ # CONFIG_MIPS_PB1000 is not set
+ # CONFIG_MIPS_PB1100 is not set
+ # CONFIG_MIPS_PB1500 is not set
+-# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_PB1550 is not set
++# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_XXS1500 is not set
+ # CONFIG_MIPS_MTX1 is not set
+ # CONFIG_COGENT_CSB250 is not set
 @@ -222,11 +222,6 @@
  #
  # CONFIG_IPX is not set
@@ -8254,10 +9394,46 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-workpad linux-mips/arch/mips/defconfi
  # CONFIG_DECNET is not set
  # CONFIG_BRIDGE is not set
  # CONFIG_X25 is not set
-diff -Nur linux-2.4.29/arch/mips/defconfig-xxs1500 linux-mips/arch/mips/defconfig-xxs1500
---- linux-2.4.29/arch/mips/defconfig-xxs1500	2005-01-19 15:09:29.000000000 +0100
-+++ linux-mips/arch/mips/defconfig-xxs1500	2005-01-09 20:34:00.000000000 +0100
-@@ -339,11 +339,6 @@
+@@ -426,7 +421,6 @@
+ # CONFIG_SERIAL_MULTIPORT is not set
+ # CONFIG_HUB6 is not set
+ # CONFIG_SERIAL_NONSTANDARD is not set
+-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
+ # CONFIG_VR41XX_KIU is not set
+ CONFIG_UNIX98_PTYS=y
+ CONFIG_UNIX98_PTY_COUNT=256
+diff -Nur linux-2.4.30/arch/mips/defconfig-xxs1500 linux-2.4.30-mips/arch/mips/defconfig-xxs1500
+--- linux-2.4.30/arch/mips/defconfig-xxs1500	2005-01-19 15:09:29.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/defconfig-xxs1500	2005-03-18 13:13:21.000000000 +0100
+@@ -30,8 +30,8 @@
+ # CONFIG_MIPS_PB1000 is not set
+ # CONFIG_MIPS_PB1100 is not set
+ # CONFIG_MIPS_PB1500 is not set
+-# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_PB1550 is not set
++# CONFIG_MIPS_HYDROGEN3 is not set
+ CONFIG_MIPS_XXS1500=y
+ # CONFIG_MIPS_MTX1 is not set
+ # CONFIG_COGENT_CSB250 is not set
+@@ -213,9 +213,7 @@
+ # CONFIG_MTD_BOSPORUS is not set
+ CONFIG_MTD_XXS1500=y
+ # CONFIG_MTD_MTX1 is not set
+-# CONFIG_MTD_DB1X00 is not set
+ # CONFIG_MTD_PB1550 is not set
+-# CONFIG_MTD_HYDROGEN3 is not set
+ # CONFIG_MTD_MIRAGE is not set
+ # CONFIG_MTD_CSTM_MIPS_IXX is not set
+ # CONFIG_MTD_OCELOT is not set
+@@ -234,7 +232,6 @@
+ #
+ # Disk-On-Chip Device Drivers
+ #
+-# CONFIG_MTD_DOC1000 is not set
+ # CONFIG_MTD_DOC2000 is not set
+ # CONFIG_MTD_DOC2001 is not set
+ # CONFIG_MTD_DOCPROBE is not set
+@@ -339,11 +336,6 @@
  #
  # CONFIG_IPX is not set
  # CONFIG_ATALK is not set
@@ -8269,9 +9445,27 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-xxs1500 linux-mips/arch/mips/defconfi
  # CONFIG_DECNET is not set
  # CONFIG_BRIDGE is not set
  # CONFIG_X25 is not set
-diff -Nur linux-2.4.29/arch/mips/defconfig-yosemite linux-mips/arch/mips/defconfig-yosemite
---- linux-2.4.29/arch/mips/defconfig-yosemite	2005-01-19 15:09:29.000000000 +0100
-+++ linux-mips/arch/mips/defconfig-yosemite	2005-01-09 20:34:00.000000000 +0100
+@@ -671,7 +663,6 @@
+ # CONFIG_AU1X00_USB_TTY is not set
+ # CONFIG_AU1X00_USB_RAW is not set
+ # CONFIG_TXX927_SERIAL is not set
+-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
+ CONFIG_UNIX98_PTYS=y
+ CONFIG_UNIX98_PTY_COUNT=256
+ 
+diff -Nur linux-2.4.30/arch/mips/defconfig-yosemite linux-2.4.30-mips/arch/mips/defconfig-yosemite
+--- linux-2.4.30/arch/mips/defconfig-yosemite	2005-01-19 15:09:29.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/defconfig-yosemite	2005-03-18 13:13:21.000000000 +0100
+@@ -30,8 +30,8 @@
+ # CONFIG_MIPS_PB1000 is not set
+ # CONFIG_MIPS_PB1100 is not set
+ # CONFIG_MIPS_PB1500 is not set
+-# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_PB1550 is not set
++# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_XXS1500 is not set
+ # CONFIG_MIPS_MTX1 is not set
+ # CONFIG_COGENT_CSB250 is not set
 @@ -227,11 +227,6 @@
  #
  # CONFIG_IPX is not set
@@ -8284,7 +9478,7 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-yosemite linux-mips/arch/mips/defconf
  # CONFIG_DECNET is not set
  # CONFIG_BRIDGE is not set
  # CONFIG_X25 is not set
-@@ -310,6 +305,7 @@
+@@ -310,9 +305,11 @@
  # CONFIG_SCSI_MEGARAID is not set
  # CONFIG_SCSI_MEGARAID2 is not set
  # CONFIG_SCSI_SATA is not set
@@ -8292,20 +9486,82 @@ diff -Nur linux-2.4.29/arch/mips/defconfig-yosemite linux-mips/arch/mips/defconf
  # CONFIG_SCSI_SATA_SVW is not set
  # CONFIG_SCSI_ATA_PIIX is not set
  # CONFIG_SCSI_SATA_NV is not set
-diff -Nur linux-2.4.29/arch/mips/kernel/cpu-probe.c linux-mips/arch/mips/kernel/cpu-probe.c
---- linux-2.4.29/arch/mips/kernel/cpu-probe.c	2005-01-19 15:09:29.000000000 +0100
-+++ linux-mips/arch/mips/kernel/cpu-probe.c	2005-01-30 09:01:28.000000000 +0100
-@@ -105,6 +105,7 @@
++# CONFIG_SCSI_SATA_QSTOR is not set
+ # CONFIG_SCSI_SATA_PROMISE is not set
+ # CONFIG_SCSI_SATA_SX4 is not set
+ # CONFIG_SCSI_SATA_SIL is not set
+@@ -477,7 +474,6 @@
+ # CONFIG_SERIAL_TXX9 is not set
+ # CONFIG_SERIAL_TXX9_CONSOLE is not set
+ # CONFIG_TXX927_SERIAL is not set
+-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
+ CONFIG_UNIX98_PTYS=y
+ CONFIG_UNIX98_PTY_COUNT=256
+ 
+diff -Nur linux-2.4.30/arch/mips/kernel/cpu-probe.c linux-2.4.30-mips/arch/mips/kernel/cpu-probe.c
+--- linux-2.4.30/arch/mips/kernel/cpu-probe.c	2005-01-19 15:09:29.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/kernel/cpu-probe.c	2005-04-08 10:33:17.000000000 +0200
+@@ -34,16 +34,12 @@
+ 		".set\tmips0");
+ }
+ 
+-/* The Au1xxx wait is available only if we run CONFIG_PM and
+- * the timer setup found we had a 32KHz counter available.
+- * There are still problems with functions that may call au1k_wait
+- * directly, but that will be discovered pretty quickly.
+- */
+-extern void (*au1k_wait_ptr)(void);
+-void au1k_wait(void)
++/* The Au1xxx wait is available only if using 32khz counter or
++ * external timer source, but specifically not CP0 Counter. */
++int allow_au1k_wait; 
++static void au1k_wait(void)
+ {
+-#ifdef CONFIG_PM
+-	unsigned long addr;
++	unsigned long addr = 0;
+ 	/* using the wait instruction makes CP0 counter unusable */
+ 	__asm__("la %0,au1k_wait\n\t"
+ 		".set mips3\n\t"
+@@ -58,10 +54,6 @@
+ 		"nop\n\t"
+ 		".set mips0\n\t"
+ 		: : "r" (addr));
+-#else
+-	__asm__("nop\n\t"
+-		"nop");
+-#endif
+ }
+ 
+ static inline void check_wait(void)
+@@ -100,20 +92,17 @@
+ 		cpu_wait = r4k_wait;
+ 		printk(" available.\n");
+ 		break;
+-#ifdef CONFIG_PM
+ 	case CPU_AU1000:
  	case CPU_AU1100:
  	case CPU_AU1500:
  	case CPU_AU1550:
+-		if (au1k_wait_ptr != NULL) {
+-			cpu_wait = au1k_wait_ptr;
 +	case CPU_AU1200:
- 		if (au1k_wait_ptr != NULL) {
- 			cpu_wait = au1k_wait_ptr;
++		if (allow_au1k_wait) {
++			cpu_wait = au1k_wait;
  			printk(" available.\n");
-diff -Nur linux-2.4.29/arch/mips/kernel/head.S linux-mips/arch/mips/kernel/head.S
---- linux-2.4.29/arch/mips/kernel/head.S	2005-01-19 15:09:29.000000000 +0100
-+++ linux-mips/arch/mips/kernel/head.S	2004-11-22 14:38:23.000000000 +0100
+-		}
+-		else {
++		} else
+ 			printk(" unavailable.\n");
+-		}
+ 		break;
+-#endif
+ 	default:
+ 		printk(" unavailable.\n");
+ 		break;
+diff -Nur linux-2.4.30/arch/mips/kernel/head.S linux-2.4.30-mips/arch/mips/kernel/head.S
+--- linux-2.4.30/arch/mips/kernel/head.S	2005-01-19 15:09:29.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/kernel/head.S	2004-11-22 14:38:23.000000000 +0100
 @@ -43,9 +43,9 @@
  
  		/* Cache Error */
@@ -8474,9 +9730,9 @@ diff -Nur linux-2.4.29/arch/mips/kernel/head.S linux-mips/arch/mips/kernel/head.
  		END(smp_bootstrap)
  #endif
  
-diff -Nur linux-2.4.29/arch/mips/kernel/scall_o32.S linux-mips/arch/mips/kernel/scall_o32.S
---- linux-2.4.29/arch/mips/kernel/scall_o32.S	2005-01-19 15:09:29.000000000 +0100
-+++ linux-mips/arch/mips/kernel/scall_o32.S	2005-02-07 22:21:53.000000000 +0100
+diff -Nur linux-2.4.30/arch/mips/kernel/scall_o32.S linux-2.4.30-mips/arch/mips/kernel/scall_o32.S
+--- linux-2.4.30/arch/mips/kernel/scall_o32.S	2005-01-19 15:09:29.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/kernel/scall_o32.S	2005-02-07 22:21:53.000000000 +0100
 @@ -121,15 +121,14 @@
  
  trace_a_syscall:
@@ -8495,9 +9751,9 @@ diff -Nur linux-2.4.29/arch/mips/kernel/scall_o32.S linux-mips/arch/mips/kernel/
  
  	li	t0, -EMAXERRNO - 1	# error?
  	sltu	t0, t0, v0
-diff -Nur linux-2.4.29/arch/mips/kernel/setup.c linux-mips/arch/mips/kernel/setup.c
---- linux-2.4.29/arch/mips/kernel/setup.c	2005-01-19 15:09:29.000000000 +0100
-+++ linux-mips/arch/mips/kernel/setup.c	2005-01-13 22:15:57.000000000 +0100
+diff -Nur linux-2.4.30/arch/mips/kernel/setup.c linux-2.4.30-mips/arch/mips/kernel/setup.c
+--- linux-2.4.30/arch/mips/kernel/setup.c	2005-01-19 15:09:29.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/kernel/setup.c	2005-01-13 22:15:57.000000000 +0100
 @@ -5,7 +5,7 @@
   *
   * Copyright (C) 1995  Linus Torvalds
@@ -8527,10 +9783,43 @@ diff -Nur linux-2.4.29/arch/mips/kernel/setup.c linux-mips/arch/mips/kernel/setu
  	start_kernel();
  }
  
-diff -Nur linux-2.4.29/arch/mips/kernel/traps.c linux-mips/arch/mips/kernel/traps.c
---- linux-2.4.29/arch/mips/kernel/traps.c	2005-01-19 15:09:29.000000000 +0100
-+++ linux-mips/arch/mips/kernel/traps.c	2004-11-22 14:38:23.000000000 +0100
-@@ -887,12 +887,18 @@
+diff -Nur linux-2.4.30/arch/mips/kernel/traps.c linux-2.4.30-mips/arch/mips/kernel/traps.c
+--- linux-2.4.30/arch/mips/kernel/traps.c	2005-01-19 15:09:29.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/kernel/traps.c	2005-04-12 22:25:34.000000000 +0200
+@@ -452,9 +452,10 @@
+ 	}
+ 	ll_task = current;
+ 
++	compute_return_epc(regs);
++
+ 	regs->regs[(opcode & RT) >> 16] = value;
+ 
+-	compute_return_epc(regs);
+ 	return;
+ 
+ sig:
+@@ -485,8 +486,8 @@
+ 		goto sig;
+ 	}
+ 	if (ll_bit == 0 || ll_task != current) {
+-		regs->regs[reg] = 0;
+ 		compute_return_epc(regs);
++		regs->regs[reg] = 0;
+ 		return;
+ 	}
+ 
+@@ -495,9 +496,9 @@
+ 		goto sig;
+ 	}
+ 
++	compute_return_epc(regs);
+ 	regs->regs[reg] = 1;
+ 
+-	compute_return_epc(regs);
+ 	return;
+ 
+ sig:
+@@ -887,12 +888,18 @@
  void __init per_cpu_trap_init(void)
  {
  	unsigned int cpu = smp_processor_id();
@@ -8553,7 +9842,7 @@ diff -Nur linux-2.4.29/arch/mips/kernel/traps.c linux-mips/arch/mips/kernel/trap
  
  	/*
  	 * Some MIPS CPUs have a dedicated interrupt vector which reduces the
-@@ -902,7 +908,7 @@
+@@ -902,7 +909,7 @@
  		set_c0_cause(CAUSEF_IV);
  
  	cpu_data[cpu].asid_cache = ASID_FIRST_VERSION;
@@ -8562,7 +9851,7 @@ diff -Nur linux-2.4.29/arch/mips/kernel/traps.c linux-mips/arch/mips/kernel/trap
  
  	atomic_inc(&init_mm.mm_count);
  	current->active_mm = &init_mm;
-@@ -918,8 +924,6 @@
+@@ -918,8 +925,6 @@
  	extern char except_vec4;
  	unsigned long i;
  
@@ -8571,7 +9860,7 @@ diff -Nur linux-2.4.29/arch/mips/kernel/traps.c linux-mips/arch/mips/kernel/trap
  	/* Copy the generic exception handler code to it's final destination. */
  	memcpy((void *)(KSEG0 + 0x80), &except_vec1_generic, 0x80);
  
-@@ -1020,10 +1024,5 @@
+@@ -1020,10 +1025,5 @@
  
  	flush_icache_range(KSEG0, KSEG0 + 0x400);
  
@@ -8583,9 +9872,9 @@ diff -Nur linux-2.4.29/arch/mips/kernel/traps.c linux-mips/arch/mips/kernel/trap
 -	TLBMISS_HANDLER_SETUP();
 +	per_cpu_trap_init();
  }
-diff -Nur linux-2.4.29/arch/mips/lib/rtc-no.c linux-mips/arch/mips/lib/rtc-no.c
---- linux-2.4.29/arch/mips/lib/rtc-no.c	2004-02-18 14:36:30.000000000 +0100
-+++ linux-mips/arch/mips/lib/rtc-no.c	2005-01-13 22:15:57.000000000 +0100
+diff -Nur linux-2.4.30/arch/mips/lib/rtc-no.c linux-2.4.30-mips/arch/mips/lib/rtc-no.c
+--- linux-2.4.30/arch/mips/lib/rtc-no.c	2004-02-18 14:36:30.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/lib/rtc-no.c	2005-01-13 22:15:57.000000000 +0100
 @@ -6,10 +6,9 @@
   * Stub RTC routines to keep Linux from crashing on machine which don't
   * have a RTC chip.
@@ -8604,9 +9893,9 @@ diff -Nur linux-2.4.29/arch/mips/lib/rtc-no.c linux-mips/arch/mips/lib/rtc-no.c
  };
 -
 -EXPORT_SYMBOL(rtc_ops);
-diff -Nur linux-2.4.29/arch/mips/lib/rtc-std.c linux-mips/arch/mips/lib/rtc-std.c
---- linux-2.4.29/arch/mips/lib/rtc-std.c	2004-02-18 14:36:30.000000000 +0100
-+++ linux-mips/arch/mips/lib/rtc-std.c	2005-01-13 22:15:57.000000000 +0100
+diff -Nur linux-2.4.30/arch/mips/lib/rtc-std.c linux-2.4.30-mips/arch/mips/lib/rtc-std.c
+--- linux-2.4.30/arch/mips/lib/rtc-std.c	2004-02-18 14:36:30.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/lib/rtc-std.c	2005-01-13 22:15:57.000000000 +0100
 @@ -5,9 +5,8 @@
   *
   * RTC routines for PC style attached Dallas chip.
@@ -8624,79 +9913,42 @@ diff -Nur linux-2.4.29/arch/mips/lib/rtc-std.c linux-mips/arch/mips/lib/rtc-std.
  };
 -
 -EXPORT_SYMBOL(rtc_ops);
-diff -Nur linux-2.4.29/arch/mips/Makefile linux-mips/arch/mips/Makefile
---- linux-2.4.29/arch/mips/Makefile	2005-01-19 15:09:26.000000000 +0100
-+++ linux-mips/arch/mips/Makefile	2005-01-30 09:01:26.000000000 +0100
-@@ -211,7 +211,7 @@
- endif
- 
- #
--# Au1000 (Alchemy Semi PB1000) eval board
-+# Au1x AMD Alchemy eval boards
- #
- ifdef CONFIG_MIPS_PB1000
- LIBS		+= arch/mips/au1000/pb1000/pb1000.o \
-@@ -220,9 +220,6 @@
- LOADADDR	:= 0x80100000
- endif
- 
--#
--# Au1100 (Alchemy Semi PB1100) eval board
--#
- ifdef CONFIG_MIPS_PB1100
- LIBS          += arch/mips/au1000/pb1100/pb1100.o \
-                  arch/mips/au1000/common/au1000.o
-@@ -230,9 +227,6 @@
- LOADADDR      += 0x80100000
- endif
- 
--#
--# Au1500 (Alchemy Semi PB1500) eval board
--#
- ifdef CONFIG_MIPS_PB1500
- LIBS		+= arch/mips/au1000/pb1500/pb1500.o \
- 		   arch/mips/au1000/common/au1000.o
-@@ -240,9 +234,6 @@
- LOADADDR	:= 0x80100000
- endif
- 
--#
--# Au1x00 (AMD/Alchemy) eval boards
--#
- ifdef CONFIG_MIPS_DB1000
- LIBS          += arch/mips/au1000/db1x00/db1x00.o \
-                  arch/mips/au1000/common/au1000.o
-@@ -313,6 +304,27 @@
- LOADADDR      += 0x80100000
- endif
+diff -Nur linux-2.4.30/arch/mips/mm/c-r4k.c linux-2.4.30-mips/arch/mips/mm/c-r4k.c
+--- linux-2.4.30/arch/mips/mm/c-r4k.c	2005-01-19 15:09:29.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/mm/c-r4k.c	2005-02-06 22:55:42.000000000 +0100
+@@ -867,9 +867,16 @@
+ 	 * normally they'd suffer from aliases but magic in the hardware deals
+ 	 * with that for us so we don't need to take care ourselves.
+ 	 */
+-	if (c->cputype != CPU_R10000 && c->cputype != CPU_R12000)
+-		if (c->dcache.waysize > PAGE_SIZE)
+-		        c->dcache.flags |= MIPS_CACHE_ALIASES;
++	switch (c->cputype) {
++	case CPU_R10000:
++	case CPU_R12000:
++		break;
++	case CPU_24K:
++		if (!(read_c0_config7() & (1 << 16)))
++	default:
++			if (c->dcache.waysize > PAGE_SIZE)
++				c->dcache.flags |= MIPS_CACHE_ALIASES;
++	}
  
-+ifdef CONFIG_MIPS_PB1200
-+LIBS          += arch/mips/au1000/pb1200/pb1200.o \
-+                 arch/mips/au1000/common/au1000.o
-+SUBDIRS       += arch/mips/au1000/pb1200 arch/mips/au1000/common
-+LOADADDR      += 0x80100000
-+endif
-+
-+ifdef CONFIG_MIPS_DB1200
-+LIBS          += arch/mips/au1000/pb1200/pb1200.o \
-+                 arch/mips/au1000/common/au1000.o
-+SUBDIRS       += arch/mips/au1000/pb1200 arch/mips/au1000/common
-+LOADADDR      += 0x80100000
-+endif
-+
-+ifdef CONFIG_MIPS_FICMMP
-+LIBS          += arch/mips/au1000/ficmmp/ficmmp.o \
-+                 arch/mips/au1000/common/au1000.o
-+SUBDIRS       += arch/mips/au1000/ficmmp arch/mips/au1000/common
-+LOADADDR      += 0x80100000
-+endif
-+
+ 	switch (c->cputype) {
+ 	case CPU_20KC:
+@@ -1069,9 +1076,6 @@
+ 	probe_pcache();
+ 	setup_scache();
  
- #
- # Cogent CSB250
-diff -Nur linux-2.4.29/arch/mips/mm/cerr-sb1.c linux-mips/arch/mips/mm/cerr-sb1.c
---- linux-2.4.29/arch/mips/mm/cerr-sb1.c	2004-02-18 14:36:30.000000000 +0100
-+++ linux-mips/arch/mips/mm/cerr-sb1.c	2004-12-13 18:37:23.000000000 +0100
+-	if (c->dcache.sets * c->dcache.ways > PAGE_SIZE)
+-		c->dcache.flags |= MIPS_CACHE_ALIASES;
+-
+ 	r4k_blast_dcache_page_setup();
+ 	r4k_blast_dcache_page_indexed_setup();
+ 	r4k_blast_dcache_setup();
+diff -Nur linux-2.4.30/arch/mips/mm/cerr-sb1.c linux-2.4.30-mips/arch/mips/mm/cerr-sb1.c
+--- linux-2.4.30/arch/mips/mm/cerr-sb1.c	2004-02-18 14:36:30.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/mm/cerr-sb1.c	2004-12-13 18:37:23.000000000 +0100
 @@ -252,14 +252,14 @@
  
  /* Masks to select bits for Hamming parity, mask_72_64[i] for bit[i] */
@@ -8741,125 +9993,9 @@ diff -Nur linux-2.4.29/arch/mips/mm/cerr-sb1.c linux-mips/arch/mips/mm/cerr-sb1.
  		if (way == 0) {
  			lru = (taghi >> 14) & 0xff;
  			prom_printf("[Bank %d Set 0x%02x]  LRU > %d %d %d %d > MRU\n",
-diff -Nur linux-2.4.29/arch/mips/mm/c-r4k.c linux-mips/arch/mips/mm/c-r4k.c
---- linux-2.4.29/arch/mips/mm/c-r4k.c	2005-01-19 15:09:29.000000000 +0100
-+++ linux-mips/arch/mips/mm/c-r4k.c	2005-02-06 22:55:42.000000000 +0100
-@@ -867,9 +867,16 @@
- 	 * normally they'd suffer from aliases but magic in the hardware deals
- 	 * with that for us so we don't need to take care ourselves.
- 	 */
--	if (c->cputype != CPU_R10000 && c->cputype != CPU_R12000)
--		if (c->dcache.waysize > PAGE_SIZE)
--		        c->dcache.flags |= MIPS_CACHE_ALIASES;
-+	switch (c->cputype) {
-+	case CPU_R10000:
-+	case CPU_R12000:
-+		break;
-+	case CPU_24K:
-+		if (!(read_c0_config7() & (1 << 16)))
-+	default:
-+			if (c->dcache.waysize > PAGE_SIZE)
-+				c->dcache.flags |= MIPS_CACHE_ALIASES;
-+	}
- 
- 	switch (c->cputype) {
- 	case CPU_20KC:
-@@ -1069,9 +1076,6 @@
- 	probe_pcache();
- 	setup_scache();
- 
--	if (c->dcache.sets * c->dcache.ways > PAGE_SIZE)
--		c->dcache.flags |= MIPS_CACHE_ALIASES;
--
- 	r4k_blast_dcache_page_setup();
- 	r4k_blast_dcache_page_indexed_setup();
- 	r4k_blast_dcache_setup();
-diff -Nur linux-2.4.29/arch/mips/mm/tlbex-mips32.S linux-mips/arch/mips/mm/tlbex-mips32.S
---- linux-2.4.29/arch/mips/mm/tlbex-mips32.S	2004-02-18 14:36:30.000000000 +0100
-+++ linux-mips/arch/mips/mm/tlbex-mips32.S	2004-11-29 00:33:15.000000000 +0100
-@@ -196,7 +196,7 @@
- 	.set	noat; \
- 	SAVE_ALL; \
- 	mfc0	a2, CP0_BADVADDR; \
--	STI; \
-+	KMODE; \
- 	.set	at; \
- 	move	a0, sp; \
- 	jal	do_page_fault; \
-diff -Nur linux-2.4.29/arch/mips/mm/tlbex-r4k.S linux-mips/arch/mips/mm/tlbex-r4k.S
---- linux-2.4.29/arch/mips/mm/tlbex-r4k.S	2004-02-18 14:36:30.000000000 +0100
-+++ linux-mips/arch/mips/mm/tlbex-r4k.S	2004-11-25 23:18:38.000000000 +0100
-@@ -184,13 +184,10 @@
- 	P_MTC0	k0, CP0_ENTRYLO0		# load it
- 	PTE_SRL	k1, k1, 6			# convert to entrylo1
- 	P_MTC0	k1, CP0_ENTRYLO1		# load it
--	b	1f
--	rm9000_tlb_hazard
-+	mtc0_tlbw_hazard
- 	tlbwr					# write random tlb entry
--1:
--	nop
--	rm9000_tlb_hazard
--	eret					# return from trap
-+	tlbw_eret_hazard
-+	eret
- 	END(except_vec0_r4000)
- 
- 	/* TLB refill, EXL == 0, R4600 version */
-@@ -468,13 +465,10 @@
- 	PTE_PRESENT(k0, k1, nopage_tlbl)
- 	PTE_MAKEVALID(k0, k1)
- 	PTE_RELOAD(k1, k0)
--	rm9000_tlb_hazard
--	nop
--	b	1f
--	 tlbwi
--1:
-+	mtc0_tlbw_hazard
-+	tlbwi
- 	nop
--	rm9000_tlb_hazard
-+	tlbw_eret_hazard
- 	.set	mips3
- 	eret
- 	.set	mips0
-@@ -496,13 +490,10 @@
- 	PTE_WRITABLE(k0, k1, nopage_tlbs)
- 	PTE_MAKEWRITE(k0, k1)
- 	PTE_RELOAD(k1, k0)
--	rm9000_tlb_hazard
--	nop
--	b	1f
--	 tlbwi
--1:
-+	mtc0_tlbw_hazard
-+	tlbwi
- 	nop
--	rm9000_tlb_hazard
-+	tlbw_eret_hazard
- 	.set	mips3
- 	eret
- 	.set	mips0
-@@ -529,13 +520,10 @@
- 
- 	/* Now reload the entry into the tlb. */
- 	PTE_RELOAD(k1, k0)
--	rm9000_tlb_hazard
--	nop
--	b	1f
--	 tlbwi
--1:
--	rm9000_tlb_hazard
-+	mtc0_tlbw_hazard
-+	tlbwi
- 	nop
-+	tlbw_eret_hazard
- 	.set	mips3
- 	eret
- 	.set	mips0
-diff -Nur linux-2.4.29/arch/mips/mm/tlb-r4k.c linux-mips/arch/mips/mm/tlb-r4k.c
---- linux-2.4.29/arch/mips/mm/tlb-r4k.c	2005-01-19 15:09:29.000000000 +0100
-+++ linux-mips/arch/mips/mm/tlb-r4k.c	2004-11-25 23:18:38.000000000 +0100
+diff -Nur linux-2.4.30/arch/mips/mm/tlb-r4k.c linux-2.4.30-mips/arch/mips/mm/tlb-r4k.c
+--- linux-2.4.30/arch/mips/mm/tlb-r4k.c	2005-01-19 15:09:29.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/mm/tlb-r4k.c	2004-11-25 23:18:38.000000000 +0100
 @@ -3,17 +3,12 @@
   * License.  See the file "COPYING" in the main directory of this archive
   * for more details.
@@ -9186,10 +10322,103 @@ diff -Nur linux-2.4.29/arch/mips/mm/tlb-r4k.c linux-mips/arch/mips/mm/tlb-r4k.c
  
  	/*
  	 * You should never change this register:
-diff -Nur linux-2.4.29/arch/mips64/defconfig linux-mips/arch/mips64/defconfig
---- linux-2.4.29/arch/mips64/defconfig	2005-01-19 15:09:30.000000000 +0100
-+++ linux-mips/arch/mips64/defconfig	2005-01-20 03:19:22.000000000 +0100
-@@ -470,6 +470,7 @@
+diff -Nur linux-2.4.30/arch/mips/mm/tlbex-mips32.S linux-2.4.30-mips/arch/mips/mm/tlbex-mips32.S
+--- linux-2.4.30/arch/mips/mm/tlbex-mips32.S	2004-02-18 14:36:30.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/mm/tlbex-mips32.S	2004-11-29 00:33:15.000000000 +0100
+@@ -196,7 +196,7 @@
+ 	.set	noat; \
+ 	SAVE_ALL; \
+ 	mfc0	a2, CP0_BADVADDR; \
+-	STI; \
++	KMODE; \
+ 	.set	at; \
+ 	move	a0, sp; \
+ 	jal	do_page_fault; \
+diff -Nur linux-2.4.30/arch/mips/mm/tlbex-r4k.S linux-2.4.30-mips/arch/mips/mm/tlbex-r4k.S
+--- linux-2.4.30/arch/mips/mm/tlbex-r4k.S	2004-02-18 14:36:30.000000000 +0100
++++ linux-2.4.30-mips/arch/mips/mm/tlbex-r4k.S	2004-11-25 23:18:38.000000000 +0100
+@@ -184,13 +184,10 @@
+ 	P_MTC0	k0, CP0_ENTRYLO0		# load it
+ 	PTE_SRL	k1, k1, 6			# convert to entrylo1
+ 	P_MTC0	k1, CP0_ENTRYLO1		# load it
+-	b	1f
+-	rm9000_tlb_hazard
++	mtc0_tlbw_hazard
+ 	tlbwr					# write random tlb entry
+-1:
+-	nop
+-	rm9000_tlb_hazard
+-	eret					# return from trap
++	tlbw_eret_hazard
++	eret
+ 	END(except_vec0_r4000)
+ 
+ 	/* TLB refill, EXL == 0, R4600 version */
+@@ -468,13 +465,10 @@
+ 	PTE_PRESENT(k0, k1, nopage_tlbl)
+ 	PTE_MAKEVALID(k0, k1)
+ 	PTE_RELOAD(k1, k0)
+-	rm9000_tlb_hazard
+-	nop
+-	b	1f
+-	 tlbwi
+-1:
++	mtc0_tlbw_hazard
++	tlbwi
+ 	nop
+-	rm9000_tlb_hazard
++	tlbw_eret_hazard
+ 	.set	mips3
+ 	eret
+ 	.set	mips0
+@@ -496,13 +490,10 @@
+ 	PTE_WRITABLE(k0, k1, nopage_tlbs)
+ 	PTE_MAKEWRITE(k0, k1)
+ 	PTE_RELOAD(k1, k0)
+-	rm9000_tlb_hazard
+-	nop
+-	b	1f
+-	 tlbwi
+-1:
++	mtc0_tlbw_hazard
++	tlbwi
+ 	nop
+-	rm9000_tlb_hazard
++	tlbw_eret_hazard
+ 	.set	mips3
+ 	eret
+ 	.set	mips0
+@@ -529,13 +520,10 @@
+ 
+ 	/* Now reload the entry into the tlb. */
+ 	PTE_RELOAD(k1, k0)
+-	rm9000_tlb_hazard
+-	nop
+-	b	1f
+-	 tlbwi
+-1:
+-	rm9000_tlb_hazard
++	mtc0_tlbw_hazard
++	tlbwi
+ 	nop
++	tlbw_eret_hazard
+ 	.set	mips3
+ 	eret
+ 	.set	mips0
+diff -Nur linux-2.4.30/arch/mips64/defconfig linux-2.4.30-mips/arch/mips64/defconfig
+--- linux-2.4.30/arch/mips64/defconfig	2005-01-19 15:09:30.000000000 +0100
++++ linux-2.4.30-mips/arch/mips64/defconfig	2005-03-18 13:13:23.000000000 +0100
+@@ -30,8 +30,8 @@
+ # CONFIG_MIPS_PB1000 is not set
+ # CONFIG_MIPS_PB1100 is not set
+ # CONFIG_MIPS_PB1500 is not set
+-# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_PB1550 is not set
++# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_XXS1500 is not set
+ # CONFIG_MIPS_MTX1 is not set
+ # CONFIG_COGENT_CSB250 is not set
+@@ -470,9 +470,11 @@
  # CONFIG_SCSI_MEGARAID is not set
  # CONFIG_SCSI_MEGARAID2 is not set
  # CONFIG_SCSI_SATA is not set
@@ -9197,9 +10426,31 @@ diff -Nur linux-2.4.29/arch/mips64/defconfig linux-mips/arch/mips64/defconfig
  # CONFIG_SCSI_SATA_SVW is not set
  # CONFIG_SCSI_ATA_PIIX is not set
  # CONFIG_SCSI_SATA_NV is not set
-diff -Nur linux-2.4.29/arch/mips64/defconfig-atlas linux-mips/arch/mips64/defconfig-atlas
---- linux-2.4.29/arch/mips64/defconfig-atlas	2005-01-19 15:09:30.000000000 +0100
-+++ linux-mips/arch/mips64/defconfig-atlas	2005-01-09 20:34:01.000000000 +0100
++# CONFIG_SCSI_SATA_QSTOR is not set
+ # CONFIG_SCSI_SATA_PROMISE is not set
+ # CONFIG_SCSI_SATA_SX4 is not set
+ # CONFIG_SCSI_SATA_SIL is not set
+@@ -658,7 +660,6 @@
+ CONFIG_SERIAL_CONSOLE=y
+ # CONFIG_SERIAL_EXTENDED is not set
+ # CONFIG_SERIAL_NONSTANDARD is not set
+-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
+ CONFIG_UNIX98_PTYS=y
+ CONFIG_UNIX98_PTY_COUNT=256
+ 
+diff -Nur linux-2.4.30/arch/mips64/defconfig-atlas linux-2.4.30-mips/arch/mips64/defconfig-atlas
+--- linux-2.4.30/arch/mips64/defconfig-atlas	2005-01-19 15:09:30.000000000 +0100
++++ linux-2.4.30-mips/arch/mips64/defconfig-atlas	2005-03-18 13:13:23.000000000 +0100
+@@ -28,8 +28,8 @@
+ # CONFIG_MIPS_PB1000 is not set
+ # CONFIG_MIPS_PB1100 is not set
+ # CONFIG_MIPS_PB1500 is not set
+-# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_PB1550 is not set
++# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_XXS1500 is not set
+ # CONFIG_MIPS_MTX1 is not set
+ # CONFIG_COGENT_CSB250 is not set
 @@ -232,11 +232,6 @@
  #
  # CONFIG_IPX is not set
@@ -9212,7 +10463,7 @@ diff -Nur linux-2.4.29/arch/mips64/defconfig-atlas linux-mips/arch/mips64/defcon
  # CONFIG_DECNET is not set
  # CONFIG_BRIDGE is not set
  # CONFIG_X25 is not set
-@@ -314,6 +309,7 @@
+@@ -314,9 +309,11 @@
  # CONFIG_SCSI_MEGARAID is not set
  # CONFIG_SCSI_MEGARAID2 is not set
  # CONFIG_SCSI_SATA is not set
@@ -9220,9 +10471,31 @@ diff -Nur linux-2.4.29/arch/mips64/defconfig-atlas linux-mips/arch/mips64/defcon
  # CONFIG_SCSI_SATA_SVW is not set
  # CONFIG_SCSI_ATA_PIIX is not set
  # CONFIG_SCSI_SATA_NV is not set
-diff -Nur linux-2.4.29/arch/mips64/defconfig-decstation linux-mips/arch/mips64/defconfig-decstation
---- linux-2.4.29/arch/mips64/defconfig-decstation	2005-01-19 15:09:30.000000000 +0100
-+++ linux-mips/arch/mips64/defconfig-decstation	2005-01-09 20:34:01.000000000 +0100
++# CONFIG_SCSI_SATA_QSTOR is not set
+ # CONFIG_SCSI_SATA_PROMISE is not set
+ # CONFIG_SCSI_SATA_SX4 is not set
+ # CONFIG_SCSI_SATA_SIL is not set
+@@ -474,7 +471,6 @@
+ CONFIG_SERIAL_CONSOLE=y
+ # CONFIG_SERIAL_EXTENDED is not set
+ # CONFIG_SERIAL_NONSTANDARD is not set
+-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
+ CONFIG_UNIX98_PTYS=y
+ CONFIG_UNIX98_PTY_COUNT=256
+ 
+diff -Nur linux-2.4.30/arch/mips64/defconfig-decstation linux-2.4.30-mips/arch/mips64/defconfig-decstation
+--- linux-2.4.30/arch/mips64/defconfig-decstation	2005-01-19 15:09:30.000000000 +0100
++++ linux-2.4.30-mips/arch/mips64/defconfig-decstation	2005-03-18 13:13:23.000000000 +0100
+@@ -28,8 +28,8 @@
+ # CONFIG_MIPS_PB1000 is not set
+ # CONFIG_MIPS_PB1100 is not set
+ # CONFIG_MIPS_PB1500 is not set
+-# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_PB1550 is not set
++# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_XXS1500 is not set
+ # CONFIG_MIPS_MTX1 is not set
+ # CONFIG_COGENT_CSB250 is not set
 @@ -224,11 +224,6 @@
  #
  # CONFIG_IPX is not set
@@ -9235,7 +10508,7 @@ diff -Nur linux-2.4.29/arch/mips64/defconfig-decstation linux-mips/arch/mips64/d
  # CONFIG_DECNET is not set
  # CONFIG_BRIDGE is not set
  # CONFIG_X25 is not set
-@@ -307,6 +302,7 @@
+@@ -307,9 +302,11 @@
  # CONFIG_SCSI_MEGARAID is not set
  # CONFIG_SCSI_MEGARAID2 is not set
  # CONFIG_SCSI_SATA is not set
@@ -9243,9 +10516,31 @@ diff -Nur linux-2.4.29/arch/mips64/defconfig-decstation linux-mips/arch/mips64/d
  # CONFIG_SCSI_SATA_SVW is not set
  # CONFIG_SCSI_ATA_PIIX is not set
  # CONFIG_SCSI_SATA_NV is not set
-diff -Nur linux-2.4.29/arch/mips64/defconfig-ip22 linux-mips/arch/mips64/defconfig-ip22
---- linux-2.4.29/arch/mips64/defconfig-ip22	2005-01-19 15:09:31.000000000 +0100
-+++ linux-mips/arch/mips64/defconfig-ip22	2005-01-09 20:34:01.000000000 +0100
++# CONFIG_SCSI_SATA_QSTOR is not set
+ # CONFIG_SCSI_SATA_PROMISE is not set
+ # CONFIG_SCSI_SATA_SX4 is not set
+ # CONFIG_SCSI_SATA_SIL is not set
+@@ -477,7 +474,6 @@
+ CONFIG_SERIAL_DEC_CONSOLE=y
+ # CONFIG_DZ is not set
+ CONFIG_ZS=y
+-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
+ CONFIG_UNIX98_PTYS=y
+ CONFIG_UNIX98_PTY_COUNT=256
+ 
+diff -Nur linux-2.4.30/arch/mips64/defconfig-ip22 linux-2.4.30-mips/arch/mips64/defconfig-ip22
+--- linux-2.4.30/arch/mips64/defconfig-ip22	2005-01-19 15:09:31.000000000 +0100
++++ linux-2.4.30-mips/arch/mips64/defconfig-ip22	2005-03-18 13:13:23.000000000 +0100
+@@ -30,8 +30,8 @@
+ # CONFIG_MIPS_PB1000 is not set
+ # CONFIG_MIPS_PB1100 is not set
+ # CONFIG_MIPS_PB1500 is not set
+-# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_PB1550 is not set
++# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_XXS1500 is not set
+ # CONFIG_MIPS_MTX1 is not set
+ # CONFIG_COGENT_CSB250 is not set
 @@ -235,11 +235,6 @@
  #
  # CONFIG_IPX is not set
@@ -9258,7 +10553,7 @@ diff -Nur linux-2.4.29/arch/mips64/defconfig-ip22 linux-mips/arch/mips64/defconf
  # CONFIG_DECNET is not set
  # CONFIG_BRIDGE is not set
  # CONFIG_X25 is not set
-@@ -319,6 +314,7 @@
+@@ -319,9 +314,11 @@
  # CONFIG_SCSI_MEGARAID is not set
  # CONFIG_SCSI_MEGARAID2 is not set
  # CONFIG_SCSI_SATA is not set
@@ -9266,10 +10561,32 @@ diff -Nur linux-2.4.29/arch/mips64/defconfig-ip22 linux-mips/arch/mips64/defconf
  # CONFIG_SCSI_SATA_SVW is not set
  # CONFIG_SCSI_ATA_PIIX is not set
  # CONFIG_SCSI_SATA_NV is not set
-diff -Nur linux-2.4.29/arch/mips64/defconfig-ip27 linux-mips/arch/mips64/defconfig-ip27
---- linux-2.4.29/arch/mips64/defconfig-ip27	2005-01-19 15:09:31.000000000 +0100
-+++ linux-mips/arch/mips64/defconfig-ip27	2005-01-20 03:19:22.000000000 +0100
-@@ -470,6 +470,7 @@
++# CONFIG_SCSI_SATA_QSTOR is not set
+ # CONFIG_SCSI_SATA_PROMISE is not set
+ # CONFIG_SCSI_SATA_SX4 is not set
+ # CONFIG_SCSI_SATA_SIL is not set
+@@ -488,7 +485,6 @@
+ # CONFIG_SERIAL_TXX9_CONSOLE is not set
+ # CONFIG_TXX927_SERIAL is not set
+ CONFIG_IP22_SERIAL=y
+-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
+ CONFIG_UNIX98_PTYS=y
+ CONFIG_UNIX98_PTY_COUNT=256
+ 
+diff -Nur linux-2.4.30/arch/mips64/defconfig-ip27 linux-2.4.30-mips/arch/mips64/defconfig-ip27
+--- linux-2.4.30/arch/mips64/defconfig-ip27	2005-01-19 15:09:31.000000000 +0100
++++ linux-2.4.30-mips/arch/mips64/defconfig-ip27	2005-03-18 13:13:23.000000000 +0100
+@@ -30,8 +30,8 @@
+ # CONFIG_MIPS_PB1000 is not set
+ # CONFIG_MIPS_PB1100 is not set
+ # CONFIG_MIPS_PB1500 is not set
+-# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_PB1550 is not set
++# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_XXS1500 is not set
+ # CONFIG_MIPS_MTX1 is not set
+ # CONFIG_COGENT_CSB250 is not set
+@@ -470,9 +470,11 @@
  # CONFIG_SCSI_MEGARAID is not set
  # CONFIG_SCSI_MEGARAID2 is not set
  # CONFIG_SCSI_SATA is not set
@@ -9277,9 +10594,31 @@ diff -Nur linux-2.4.29/arch/mips64/defconfig-ip27 linux-mips/arch/mips64/defconf
  # CONFIG_SCSI_SATA_SVW is not set
  # CONFIG_SCSI_ATA_PIIX is not set
  # CONFIG_SCSI_SATA_NV is not set
-diff -Nur linux-2.4.29/arch/mips64/defconfig-jaguar linux-mips/arch/mips64/defconfig-jaguar
---- linux-2.4.29/arch/mips64/defconfig-jaguar	2005-01-19 15:09:31.000000000 +0100
-+++ linux-mips/arch/mips64/defconfig-jaguar	2005-01-09 20:34:01.000000000 +0100
++# CONFIG_SCSI_SATA_QSTOR is not set
+ # CONFIG_SCSI_SATA_PROMISE is not set
+ # CONFIG_SCSI_SATA_SX4 is not set
+ # CONFIG_SCSI_SATA_SIL is not set
+@@ -658,7 +660,6 @@
+ CONFIG_SERIAL_CONSOLE=y
+ # CONFIG_SERIAL_EXTENDED is not set
+ # CONFIG_SERIAL_NONSTANDARD is not set
+-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
+ CONFIG_UNIX98_PTYS=y
+ CONFIG_UNIX98_PTY_COUNT=256
+ 
+diff -Nur linux-2.4.30/arch/mips64/defconfig-jaguar linux-2.4.30-mips/arch/mips64/defconfig-jaguar
+--- linux-2.4.30/arch/mips64/defconfig-jaguar	2005-01-19 15:09:31.000000000 +0100
++++ linux-2.4.30-mips/arch/mips64/defconfig-jaguar	2005-03-18 13:13:23.000000000 +0100
+@@ -30,8 +30,8 @@
+ # CONFIG_MIPS_PB1000 is not set
+ # CONFIG_MIPS_PB1100 is not set
+ # CONFIG_MIPS_PB1500 is not set
+-# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_PB1550 is not set
++# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_XXS1500 is not set
+ # CONFIG_MIPS_MTX1 is not set
+ # CONFIG_COGENT_CSB250 is not set
 @@ -227,11 +227,6 @@
  #
  # CONFIG_IPX is not set
@@ -9292,9 +10631,27 @@ diff -Nur linux-2.4.29/arch/mips64/defconfig-jaguar linux-mips/arch/mips64/defco
  # CONFIG_DECNET is not set
  # CONFIG_BRIDGE is not set
  # CONFIG_X25 is not set
-diff -Nur linux-2.4.29/arch/mips64/defconfig-malta linux-mips/arch/mips64/defconfig-malta
---- linux-2.4.29/arch/mips64/defconfig-malta	2005-01-19 15:09:31.000000000 +0100
-+++ linux-mips/arch/mips64/defconfig-malta	2005-01-09 20:34:01.000000000 +0100
+@@ -403,7 +398,6 @@
+ # CONFIG_SERIAL_TXX9 is not set
+ # CONFIG_SERIAL_TXX9_CONSOLE is not set
+ # CONFIG_TXX927_SERIAL is not set
+-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
+ CONFIG_UNIX98_PTYS=y
+ CONFIG_UNIX98_PTY_COUNT=256
+ 
+diff -Nur linux-2.4.30/arch/mips64/defconfig-malta linux-2.4.30-mips/arch/mips64/defconfig-malta
+--- linux-2.4.30/arch/mips64/defconfig-malta	2005-01-19 15:09:31.000000000 +0100
++++ linux-2.4.30-mips/arch/mips64/defconfig-malta	2005-03-18 13:13:23.000000000 +0100
+@@ -30,8 +30,8 @@
+ # CONFIG_MIPS_PB1000 is not set
+ # CONFIG_MIPS_PB1100 is not set
+ # CONFIG_MIPS_PB1500 is not set
+-# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_PB1550 is not set
++# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_XXS1500 is not set
+ # CONFIG_MIPS_MTX1 is not set
+ # CONFIG_COGENT_CSB250 is not set
 @@ -235,11 +235,6 @@
  #
  # CONFIG_IPX is not set
@@ -9307,7 +10664,7 @@ diff -Nur linux-2.4.29/arch/mips64/defconfig-malta linux-mips/arch/mips64/defcon
  # CONFIG_DECNET is not set
  # CONFIG_BRIDGE is not set
  # CONFIG_X25 is not set
-@@ -317,6 +312,7 @@
+@@ -317,9 +312,11 @@
  # CONFIG_SCSI_MEGARAID is not set
  # CONFIG_SCSI_MEGARAID2 is not set
  # CONFIG_SCSI_SATA is not set
@@ -9315,9 +10672,31 @@ diff -Nur linux-2.4.29/arch/mips64/defconfig-malta linux-mips/arch/mips64/defcon
  # CONFIG_SCSI_SATA_SVW is not set
  # CONFIG_SCSI_ATA_PIIX is not set
  # CONFIG_SCSI_SATA_NV is not set
-diff -Nur linux-2.4.29/arch/mips64/defconfig-ocelotc linux-mips/arch/mips64/defconfig-ocelotc
---- linux-2.4.29/arch/mips64/defconfig-ocelotc	2005-01-19 15:09:31.000000000 +0100
-+++ linux-mips/arch/mips64/defconfig-ocelotc	2005-01-09 20:34:01.000000000 +0100
++# CONFIG_SCSI_SATA_QSTOR is not set
+ # CONFIG_SCSI_SATA_PROMISE is not set
+ # CONFIG_SCSI_SATA_SX4 is not set
+ # CONFIG_SCSI_SATA_SIL is not set
+@@ -477,7 +474,6 @@
+ CONFIG_SERIAL_CONSOLE=y
+ # CONFIG_SERIAL_EXTENDED is not set
+ # CONFIG_SERIAL_NONSTANDARD is not set
+-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
+ CONFIG_UNIX98_PTYS=y
+ CONFIG_UNIX98_PTY_COUNT=256
+ 
+diff -Nur linux-2.4.30/arch/mips64/defconfig-ocelotc linux-2.4.30-mips/arch/mips64/defconfig-ocelotc
+--- linux-2.4.30/arch/mips64/defconfig-ocelotc	2005-01-19 15:09:31.000000000 +0100
++++ linux-2.4.30-mips/arch/mips64/defconfig-ocelotc	2005-03-18 13:13:23.000000000 +0100
+@@ -30,8 +30,8 @@
+ # CONFIG_MIPS_PB1000 is not set
+ # CONFIG_MIPS_PB1100 is not set
+ # CONFIG_MIPS_PB1500 is not set
+-# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_PB1550 is not set
++# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_XXS1500 is not set
+ # CONFIG_MIPS_MTX1 is not set
+ # CONFIG_COGENT_CSB250 is not set
 @@ -231,11 +231,6 @@
  #
  # CONFIG_IPX is not set
@@ -9330,9 +10709,27 @@ diff -Nur linux-2.4.29/arch/mips64/defconfig-ocelotc linux-mips/arch/mips64/defc
  # CONFIG_DECNET is not set
  # CONFIG_BRIDGE is not set
  # CONFIG_X25 is not set
-diff -Nur linux-2.4.29/arch/mips64/defconfig-sb1250-swarm linux-mips/arch/mips64/defconfig-sb1250-swarm
---- linux-2.4.29/arch/mips64/defconfig-sb1250-swarm	2005-01-19 15:09:31.000000000 +0100
-+++ linux-mips/arch/mips64/defconfig-sb1250-swarm	2005-01-09 20:34:01.000000000 +0100
+@@ -453,7 +448,6 @@
+ # CONFIG_SERIAL_TXX9 is not set
+ # CONFIG_SERIAL_TXX9_CONSOLE is not set
+ # CONFIG_TXX927_SERIAL is not set
+-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
+ CONFIG_UNIX98_PTYS=y
+ CONFIG_UNIX98_PTY_COUNT=256
+ 
+diff -Nur linux-2.4.30/arch/mips64/defconfig-sb1250-swarm linux-2.4.30-mips/arch/mips64/defconfig-sb1250-swarm
+--- linux-2.4.30/arch/mips64/defconfig-sb1250-swarm	2005-01-19 15:09:31.000000000 +0100
++++ linux-2.4.30-mips/arch/mips64/defconfig-sb1250-swarm	2005-03-18 13:13:23.000000000 +0100
+@@ -30,8 +30,8 @@
+ # CONFIG_MIPS_PB1000 is not set
+ # CONFIG_MIPS_PB1100 is not set
+ # CONFIG_MIPS_PB1500 is not set
+-# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_PB1550 is not set
++# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_XXS1500 is not set
+ # CONFIG_MIPS_MTX1 is not set
+ # CONFIG_COGENT_CSB250 is not set
 @@ -90,6 +90,7 @@
  # CONFIG_SIBYTE_TBPROF is not set
  CONFIG_SIBYTE_GENBUS_IDE=y
@@ -9353,9 +10750,38 @@ diff -Nur linux-2.4.29/arch/mips64/defconfig-sb1250-swarm linux-mips/arch/mips64
  # CONFIG_DECNET is not set
  # CONFIG_BRIDGE is not set
  # CONFIG_X25 is not set
-diff -Nur linux-2.4.29/arch/mips64/kernel/binfmt_elfn32.c linux-mips/arch/mips64/kernel/binfmt_elfn32.c
---- linux-2.4.29/arch/mips64/kernel/binfmt_elfn32.c	2003-08-25 13:44:40.000000000 +0200
-+++ linux-mips/arch/mips64/kernel/binfmt_elfn32.c	2005-01-26 03:40:47.000000000 +0100
+@@ -432,7 +428,6 @@
+ CONFIG_SIBYTE_SB1250_DUART=y
+ CONFIG_SIBYTE_SB1250_DUART_CONSOLE=y
+ CONFIG_SERIAL_CONSOLE=y
+-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
+ CONFIG_UNIX98_PTYS=y
+ CONFIG_UNIX98_PTY_COUNT=256
+ 
+diff -Nur linux-2.4.30/arch/mips64/defconfig-sead linux-2.4.30-mips/arch/mips64/defconfig-sead
+--- linux-2.4.30/arch/mips64/defconfig-sead	2005-01-19 15:09:31.000000000 +0100
++++ linux-2.4.30-mips/arch/mips64/defconfig-sead	2005-03-18 13:13:23.000000000 +0100
+@@ -28,8 +28,8 @@
+ # CONFIG_MIPS_PB1000 is not set
+ # CONFIG_MIPS_PB1100 is not set
+ # CONFIG_MIPS_PB1500 is not set
+-# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_PB1550 is not set
++# CONFIG_MIPS_HYDROGEN3 is not set
+ # CONFIG_MIPS_XXS1500 is not set
+ # CONFIG_MIPS_MTX1 is not set
+ # CONFIG_COGENT_CSB250 is not set
+@@ -242,7 +242,6 @@
+ CONFIG_SERIAL_CONSOLE=y
+ # CONFIG_SERIAL_EXTENDED is not set
+ # CONFIG_SERIAL_NONSTANDARD is not set
+-# CONFIG_MIPS_HYDROGEN3_BUTTONS is not set
+ # CONFIG_UNIX98_PTYS is not set
+ 
+ #
+diff -Nur linux-2.4.30/arch/mips64/kernel/binfmt_elfn32.c linux-2.4.30-mips/arch/mips64/kernel/binfmt_elfn32.c
+--- linux-2.4.30/arch/mips64/kernel/binfmt_elfn32.c	2003-08-25 13:44:40.000000000 +0200
++++ linux-2.4.30-mips/arch/mips64/kernel/binfmt_elfn32.c	2005-01-26 03:40:47.000000000 +0100
 @@ -116,4 +116,7 @@
  #undef MODULE_DESCRIPTION
  #undef MODULE_AUTHOR
@@ -9364,9 +10790,9 @@ diff -Nur linux-2.4.29/arch/mips64/kernel/binfmt_elfn32.c linux-mips/arch/mips64
 +#define TASK_SIZE TASK_SIZE32
 +
  #include "../../../fs/binfmt_elf.c"
-diff -Nur linux-2.4.29/arch/mips64/kernel/binfmt_elfo32.c linux-mips/arch/mips64/kernel/binfmt_elfo32.c
---- linux-2.4.29/arch/mips64/kernel/binfmt_elfo32.c	2003-08-25 13:44:40.000000000 +0200
-+++ linux-mips/arch/mips64/kernel/binfmt_elfo32.c	2005-01-26 03:40:47.000000000 +0100
+diff -Nur linux-2.4.30/arch/mips64/kernel/binfmt_elfo32.c linux-2.4.30-mips/arch/mips64/kernel/binfmt_elfo32.c
+--- linux-2.4.30/arch/mips64/kernel/binfmt_elfo32.c	2003-08-25 13:44:40.000000000 +0200
++++ linux-2.4.30-mips/arch/mips64/kernel/binfmt_elfo32.c	2005-01-26 03:40:47.000000000 +0100
 @@ -137,4 +137,7 @@
  #undef MODULE_DESCRIPTION
  #undef MODULE_AUTHOR
@@ -9375,9 +10801,9 @@ diff -Nur linux-2.4.29/arch/mips64/kernel/binfmt_elfo32.c linux-mips/arch/mips64
 +#define TASK_SIZE TASK_SIZE32
 +
  #include "../../../fs/binfmt_elf.c"
-diff -Nur linux-2.4.29/arch/mips64/kernel/head.S linux-mips/arch/mips64/kernel/head.S
---- linux-2.4.29/arch/mips64/kernel/head.S	2004-02-18 14:36:30.000000000 +0100
-+++ linux-mips/arch/mips64/kernel/head.S	2004-11-22 14:38:26.000000000 +0100
+diff -Nur linux-2.4.30/arch/mips64/kernel/head.S linux-2.4.30-mips/arch/mips64/kernel/head.S
+--- linux-2.4.30/arch/mips64/kernel/head.S	2004-02-18 14:36:30.000000000 +0100
++++ linux-2.4.30-mips/arch/mips64/kernel/head.S	2004-11-22 14:38:26.000000000 +0100
 @@ -91,6 +91,21 @@
  	__INIT
  
@@ -9462,9 +10888,9 @@ diff -Nur linux-2.4.29/arch/mips64/kernel/head.S linux-mips/arch/mips64/kernel/h
  	END(smp_bootstrap)
  #endif /* CONFIG_SMP */
  
-diff -Nur linux-2.4.29/arch/mips64/kernel/ioctl32.c linux-mips/arch/mips64/kernel/ioctl32.c
---- linux-2.4.29/arch/mips64/kernel/ioctl32.c	2005-01-19 15:09:31.000000000 +0100
-+++ linux-mips/arch/mips64/kernel/ioctl32.c	2005-01-26 03:36:17.000000000 +0100
+diff -Nur linux-2.4.30/arch/mips64/kernel/ioctl32.c linux-2.4.30-mips/arch/mips64/kernel/ioctl32.c
+--- linux-2.4.30/arch/mips64/kernel/ioctl32.c	2005-01-19 15:09:31.000000000 +0100
++++ linux-2.4.30-mips/arch/mips64/kernel/ioctl32.c	2005-01-26 03:36:17.000000000 +0100
 @@ -2352,7 +2352,7 @@
  	IOCTL32_HANDLER(AUTOFS_IOC_SETTIMEOUT32, ioc_settimeout),
  	IOCTL32_DEFAULT(AUTOFS_IOC_EXPIRE),
@@ -9474,9 +10900,91 @@ diff -Nur linux-2.4.29/arch/mips64/kernel/ioctl32.c linux-mips/arch/mips64/kerne
  	IOCTL32_DEFAULT(AUTOFS_IOC_ASKREGHOST),
  	IOCTL32_DEFAULT(AUTOFS_IOC_TOGGLEREGHOST),
  	IOCTL32_DEFAULT(AUTOFS_IOC_ASKUMOUNT),
-diff -Nur linux-2.4.29/arch/mips64/kernel/scall_64.S linux-mips/arch/mips64/kernel/scall_64.S
---- linux-2.4.29/arch/mips64/kernel/scall_64.S	2005-01-19 15:09:32.000000000 +0100
-+++ linux-mips/arch/mips64/kernel/scall_64.S	2005-02-07 22:21:54.000000000 +0100
+diff -Nur linux-2.4.30/arch/mips64/kernel/linux32.c linux-2.4.30-mips/arch/mips64/kernel/linux32.c
+--- linux-2.4.30/arch/mips64/kernel/linux32.c	2005-04-04 03:42:19.000000000 +0200
++++ linux-2.4.30-mips/arch/mips64/kernel/linux32.c	2005-03-18 13:13:23.000000000 +0100
+@@ -1187,72 +1187,19 @@
+    lseek back to original location.  They fail just like lseek does on
+    non-seekable files.  */
+ 
+-asmlinkage ssize_t sys32_pread(unsigned int fd, char * buf,
+-			       size_t count, u32 unused, u64 a4, u64 a5)
++asmlinkage ssize_t sys32_pread(unsigned int fd, char *buf,
++                                 size_t count, u32 unused, u64 a4, u64 a5)
+ {
+-	ssize_t ret;
+-	struct file * file;
+-	ssize_t (*read)(struct file *, char *, size_t, loff_t *);
+-	loff_t pos;
+-
+-	ret = -EBADF;
+-	file = fget(fd);
+-	if (!file)
+-		goto bad_file;
+-	if (!(file->f_mode & FMODE_READ))
+-		goto out;
+-	pos = merge_64(a4, a5);
+-	ret = locks_verify_area(FLOCK_VERIFY_READ, file->f_dentry->d_inode,
+-				file, pos, count);
+-	if (ret)
+-		goto out;
+-	ret = -EINVAL;
+-	if (!file->f_op || !(read = file->f_op->read))
+-		goto out;
+-	if (pos < 0)
+-		goto out;
+-	ret = read(file, buf, count, &pos);
+-	if (ret > 0)
+-		dnotify_parent(file->f_dentry, DN_ACCESS);
+-out:
+-	fput(file);
+-bad_file:
+-	return ret;
++	return sys_pread(fd, buf, count, merge_64(a4, a5));
+ }
+ 
+ asmlinkage ssize_t sys32_pwrite(unsigned int fd, const char * buf,
+ 			        size_t count, u32 unused, u64 a4, u64 a5)
+ {
+-	ssize_t ret;
+-	struct file * file;
+-	ssize_t (*write)(struct file *, const char *, size_t, loff_t *);
+-	loff_t pos;
+-
+-	ret = -EBADF;
+-	file = fget(fd);
+-	if (!file)
+-		goto bad_file;
+-	if (!(file->f_mode & FMODE_WRITE))
+-		goto out;
+-	pos = merge_64(a4, a5);
+-	ret = locks_verify_area(FLOCK_VERIFY_WRITE, file->f_dentry->d_inode,
+-				file, pos, count);
+-	if (ret)
+-		goto out;
+-	ret = -EINVAL;
+-	if (!file->f_op || !(write = file->f_op->write))
+-		goto out;
+-	if (pos < 0)
+-		goto out;
+-
+-	ret = write(file, buf, count, &pos);
+-	if (ret > 0)
+-		dnotify_parent(file->f_dentry, DN_MODIFY);
+-out:
+-	fput(file);
+-bad_file:
+-	return ret;
++	return sys_pwrite(fd, buf, count, merge_64(a4, a5));
+ }
++
++
+ /*
+  * Ooo, nasty.  We need here to frob 32-bit unsigned longs to
+  * 64-bit unsigned longs.
+diff -Nur linux-2.4.30/arch/mips64/kernel/scall_64.S linux-2.4.30-mips/arch/mips64/kernel/scall_64.S
+--- linux-2.4.30/arch/mips64/kernel/scall_64.S	2005-01-19 15:09:32.000000000 +0100
++++ linux-2.4.30-mips/arch/mips64/kernel/scall_64.S	2005-02-07 22:21:54.000000000 +0100
 @@ -102,15 +102,14 @@
  
  trace_a_syscall:
@@ -9495,9 +11003,9 @@ diff -Nur linux-2.4.29/arch/mips64/kernel/scall_64.S linux-mips/arch/mips64/kern
  
  	li	t0, -EMAXERRNO - 1	# error?
  	sltu	t0, t0, v0
-diff -Nur linux-2.4.29/arch/mips64/kernel/scall_n32.S linux-mips/arch/mips64/kernel/scall_n32.S
---- linux-2.4.29/arch/mips64/kernel/scall_n32.S	2005-01-19 15:09:32.000000000 +0100
-+++ linux-mips/arch/mips64/kernel/scall_n32.S	2005-02-07 22:21:54.000000000 +0100
+diff -Nur linux-2.4.30/arch/mips64/kernel/scall_n32.S linux-2.4.30-mips/arch/mips64/kernel/scall_n32.S
+--- linux-2.4.30/arch/mips64/kernel/scall_n32.S	2005-01-19 15:09:32.000000000 +0100
++++ linux-2.4.30-mips/arch/mips64/kernel/scall_n32.S	2005-02-07 22:21:54.000000000 +0100
 @@ -106,15 +106,14 @@
  
  trace_a_syscall:
@@ -9516,9 +11024,9 @@ diff -Nur linux-2.4.29/arch/mips64/kernel/scall_n32.S linux-mips/arch/mips64/ker
  
  	li	t0, -EMAXERRNO - 1	# error?
  	sltu	t0, t0, v0
-diff -Nur linux-2.4.29/arch/mips64/kernel/scall_o32.S linux-mips/arch/mips64/kernel/scall_o32.S
---- linux-2.4.29/arch/mips64/kernel/scall_o32.S	2005-01-19 15:09:32.000000000 +0100
-+++ linux-mips/arch/mips64/kernel/scall_o32.S	2005-02-14 04:52:57.000000000 +0100
+diff -Nur linux-2.4.30/arch/mips64/kernel/scall_o32.S linux-2.4.30-mips/arch/mips64/kernel/scall_o32.S
+--- linux-2.4.30/arch/mips64/kernel/scall_o32.S	2005-01-19 15:09:32.000000000 +0100
++++ linux-2.4.30-mips/arch/mips64/kernel/scall_o32.S	2005-02-14 04:52:57.000000000 +0100
 @@ -118,9 +118,8 @@
  	sd	a6, PT_R10(sp)
  	sd	a7, PT_R11(sp)
@@ -9548,9 +11056,9 @@ diff -Nur linux-2.4.29/arch/mips64/kernel/scall_o32.S linux-mips/arch/mips64/ker
  	.macro	sys function, nargs
  	.byte	\nargs
  	.endm
-diff -Nur linux-2.4.29/arch/mips64/kernel/setup.c linux-mips/arch/mips64/kernel/setup.c
---- linux-2.4.29/arch/mips64/kernel/setup.c	2005-01-19 15:09:32.000000000 +0100
-+++ linux-mips/arch/mips64/kernel/setup.c	2004-11-22 14:38:26.000000000 +0100
+diff -Nur linux-2.4.30/arch/mips64/kernel/setup.c linux-2.4.30-mips/arch/mips64/kernel/setup.c
+--- linux-2.4.30/arch/mips64/kernel/setup.c	2005-01-19 15:09:32.000000000 +0100
++++ linux-2.4.30-mips/arch/mips64/kernel/setup.c	2004-11-22 14:38:26.000000000 +0100
 @@ -129,14 +129,6 @@
  	 */
  	load_mmu();
@@ -9566,9 +11074,9 @@ diff -Nur linux-2.4.29/arch/mips64/kernel/setup.c linux-mips/arch/mips64/kernel/
  	start_kernel();
  }
  
-diff -Nur linux-2.4.29/arch/mips64/kernel/signal_n32.c linux-mips/arch/mips64/kernel/signal_n32.c
---- linux-2.4.29/arch/mips64/kernel/signal_n32.c	2005-01-19 15:09:33.000000000 +0100
-+++ linux-mips/arch/mips64/kernel/signal_n32.c	2005-02-07 22:10:53.000000000 +0100
+diff -Nur linux-2.4.30/arch/mips64/kernel/signal_n32.c linux-2.4.30-mips/arch/mips64/kernel/signal_n32.c
+--- linux-2.4.30/arch/mips64/kernel/signal_n32.c	2005-01-19 15:09:33.000000000 +0100
++++ linux-2.4.30-mips/arch/mips64/kernel/signal_n32.c	2005-02-07 22:10:53.000000000 +0100
 @@ -68,7 +68,7 @@
  };
  
@@ -9578,10 +11086,43 @@ diff -Nur linux-2.4.29/arch/mips64/kernel/signal_n32.c linux-mips/arch/mips64/ke
  
  asmlinkage void sysn32_rt_sigreturn(abi64_no_regargs, struct pt_regs regs)
  {
-diff -Nur linux-2.4.29/arch/mips64/kernel/traps.c linux-mips/arch/mips64/kernel/traps.c
---- linux-2.4.29/arch/mips64/kernel/traps.c	2005-01-19 15:09:33.000000000 +0100
-+++ linux-mips/arch/mips64/kernel/traps.c	2004-11-22 14:38:26.000000000 +0100
-@@ -809,13 +809,18 @@
+diff -Nur linux-2.4.30/arch/mips64/kernel/traps.c linux-2.4.30-mips/arch/mips64/kernel/traps.c
+--- linux-2.4.30/arch/mips64/kernel/traps.c	2005-01-19 15:09:33.000000000 +0100
++++ linux-2.4.30-mips/arch/mips64/kernel/traps.c	2005-04-12 22:25:34.000000000 +0200
+@@ -462,9 +462,10 @@
+ 	}
+ 	ll_task = current;
+ 
++	compute_return_epc(regs);
++
+ 	regs->regs[(opcode & RT) >> 16] = value;
+ 
+-	compute_return_epc(regs);
+ 	return;
+ 
+ sig:
+@@ -495,8 +496,8 @@
+ 		goto sig;
+ 	}
+ 	if (ll_bit == 0 || ll_task != current) {
+-		regs->regs[reg] = 0;
+ 		compute_return_epc(regs);
++		regs->regs[reg] = 0;
+ 		return;
+ 	}
+ 
+@@ -505,9 +506,9 @@
+ 		goto sig;
+ 	}
+ 
++	compute_return_epc(regs);
+ 	regs->regs[reg] = 1;
+ 
+-	compute_return_epc(regs);
+ 	return;
+ 
+ sig:
+@@ -809,13 +810,18 @@
  void __init per_cpu_trap_init(void)
  {
  	unsigned int cpu = smp_processor_id();
@@ -9605,7 +11146,7 @@ diff -Nur linux-2.4.29/arch/mips64/kernel/traps.c linux-mips/arch/mips64/kernel/
  
  	/*
  	 * Some MIPS CPUs have a dedicated interrupt vector which reduces the
-@@ -825,13 +830,11 @@
+@@ -825,13 +831,11 @@
  		set_c0_cause(CAUSEF_IV);
  
  	cpu_data[cpu].asid_cache = ASID_FIRST_VERSION;
@@ -9621,7 +11162,7 @@ diff -Nur linux-2.4.29/arch/mips64/kernel/traps.c linux-mips/arch/mips64/kernel/
  	enter_lazy_tlb(&init_mm, current, cpu);
  }
  
-@@ -842,8 +845,6 @@
+@@ -842,8 +846,6 @@
  	extern char except_vec4;
  	unsigned long i;
  
@@ -9630,7 +11171,7 @@ diff -Nur linux-2.4.29/arch/mips64/kernel/traps.c linux-mips/arch/mips64/kernel/
  	/* Copy the generic exception handlers to their final destination. */
  	memcpy((void *) KSEG0         , &except_vec0_generic, 0x80);
  	memcpy((void *)(KSEG0 + 0x180), &except_vec3_generic, 0x80);
-@@ -933,6 +934,5 @@
+@@ -933,6 +935,5 @@
  
  	flush_icache_range(KSEG0, KSEG0 + 0x400);
  
@@ -9638,9 +11179,42 @@ diff -Nur linux-2.4.29/arch/mips64/kernel/traps.c linux-mips/arch/mips64/kernel/
 -	current->active_mm = &init_mm;
 +	per_cpu_trap_init();
  }
-diff -Nur linux-2.4.29/arch/mips64/mm/cerr-sb1.c linux-mips/arch/mips64/mm/cerr-sb1.c
---- linux-2.4.29/arch/mips64/mm/cerr-sb1.c	2004-02-18 14:36:30.000000000 +0100
-+++ linux-mips/arch/mips64/mm/cerr-sb1.c	2004-12-13 18:37:26.000000000 +0100
+diff -Nur linux-2.4.30/arch/mips64/mm/c-r4k.c linux-2.4.30-mips/arch/mips64/mm/c-r4k.c
+--- linux-2.4.30/arch/mips64/mm/c-r4k.c	2005-01-19 15:09:33.000000000 +0100
++++ linux-2.4.30-mips/arch/mips64/mm/c-r4k.c	2005-02-06 22:55:42.000000000 +0100
+@@ -867,9 +867,16 @@
+ 	 * normally they'd suffer from aliases but magic in the hardware deals
+ 	 * with that for us so we don't need to take care ourselves.
+ 	 */
+-	if (c->cputype != CPU_R10000 && c->cputype != CPU_R12000)
+-		if (c->dcache.waysize > PAGE_SIZE)
+-		        c->dcache.flags |= MIPS_CACHE_ALIASES;
++	switch (c->cputype) {
++	case CPU_R10000:
++	case CPU_R12000:
++		break;
++	case CPU_24K:
++		if (!(read_c0_config7() & (1 << 16)))
++	default:
++			if (c->dcache.waysize > PAGE_SIZE)
++				c->dcache.flags |= MIPS_CACHE_ALIASES;
++	}
+ 
+ 	switch (c->cputype) {
+ 	case CPU_20KC:
+@@ -1070,9 +1077,6 @@
+ 	setup_scache();
+ 	coherency_setup();
+ 
+-	if (c->dcache.sets * c->dcache.ways > PAGE_SIZE)
+-		c->dcache.flags |= MIPS_CACHE_ALIASES;
+-
+ 	r4k_blast_dcache_page_setup();
+ 	r4k_blast_dcache_page_indexed_setup();
+ 	r4k_blast_dcache_setup();
+diff -Nur linux-2.4.30/arch/mips64/mm/cerr-sb1.c linux-2.4.30-mips/arch/mips64/mm/cerr-sb1.c
+--- linux-2.4.30/arch/mips64/mm/cerr-sb1.c	2004-02-18 14:36:30.000000000 +0100
++++ linux-2.4.30-mips/arch/mips64/mm/cerr-sb1.c	2004-12-13 18:37:26.000000000 +0100
 @@ -252,14 +252,14 @@
  
  /* Masks to select bits for Hamming parity, mask_72_64[i] for bit[i] */
@@ -9685,101 +11259,9 @@ diff -Nur linux-2.4.29/arch/mips64/mm/cerr-sb1.c linux-mips/arch/mips64/mm/cerr-
  		if (way == 0) {
  			lru = (taghi >> 14) & 0xff;
  			prom_printf("[Bank %d Set 0x%02x]  LRU > %d %d %d %d > MRU\n",
-diff -Nur linux-2.4.29/arch/mips64/mm/c-r4k.c linux-mips/arch/mips64/mm/c-r4k.c
---- linux-2.4.29/arch/mips64/mm/c-r4k.c	2005-01-19 15:09:33.000000000 +0100
-+++ linux-mips/arch/mips64/mm/c-r4k.c	2005-02-06 22:55:42.000000000 +0100
-@@ -867,9 +867,16 @@
- 	 * normally they'd suffer from aliases but magic in the hardware deals
- 	 * with that for us so we don't need to take care ourselves.
- 	 */
--	if (c->cputype != CPU_R10000 && c->cputype != CPU_R12000)
--		if (c->dcache.waysize > PAGE_SIZE)
--		        c->dcache.flags |= MIPS_CACHE_ALIASES;
-+	switch (c->cputype) {
-+	case CPU_R10000:
-+	case CPU_R12000:
-+		break;
-+	case CPU_24K:
-+		if (!(read_c0_config7() & (1 << 16)))
-+	default:
-+			if (c->dcache.waysize > PAGE_SIZE)
-+				c->dcache.flags |= MIPS_CACHE_ALIASES;
-+	}
- 
- 	switch (c->cputype) {
- 	case CPU_20KC:
-@@ -1070,9 +1077,6 @@
- 	setup_scache();
- 	coherency_setup();
- 
--	if (c->dcache.sets * c->dcache.ways > PAGE_SIZE)
--		c->dcache.flags |= MIPS_CACHE_ALIASES;
--
- 	r4k_blast_dcache_page_setup();
- 	r4k_blast_dcache_page_indexed_setup();
- 	r4k_blast_dcache_setup();
-diff -Nur linux-2.4.29/arch/mips64/mm/tlbex-r4k.S linux-mips/arch/mips64/mm/tlbex-r4k.S
---- linux-2.4.29/arch/mips64/mm/tlbex-r4k.S	2004-02-18 14:36:30.000000000 +0100
-+++ linux-mips/arch/mips64/mm/tlbex-r4k.S	2004-11-25 23:18:38.000000000 +0100
-@@ -151,11 +151,9 @@
- 	ld	k0, 0(k1)			# get even pte
- 	ld	k1, 8(k1)			# get odd pte
- 	PTE_RELOAD k0 k1
--	rm9000_tlb_hazard
--	b	1f
--	 tlbwr
--1:	nop
--	rm9000_tlb_hazard
-+	mtc0_tlbw_hazard
-+	tlbwr
-+1:	tlbw_eret_hazard
- 	eret
- 
- 9:						# handle the vmalloc range
-@@ -163,11 +161,9 @@
- 	ld	k0, 0(k1)			# get even pte
- 	ld	k1, 8(k1)			# get odd pte
- 	PTE_RELOAD k0 k1
--	rm9000_tlb_hazard
--	b	1f
--	 tlbwr
--1:	nop
--	rm9000_tlb_hazard
-+	mtc0_tlbw_hazard
-+	tlbwr
-+1:	tlbw_eret_hazard
- 	eret
- END(handle_vec1_r4k)
- 
-@@ -195,10 +191,9 @@
- 	ld	k0, 0(k1)			# get even pte
- 	ld	k1, 8(k1)			# get odd pte
- 	PTE_RELOAD k0 k1
--	rm9000_tlb_hazard
--	nop
-+	mtc0_tlbw_hazard
- 	tlbwr
--	rm9000_tlb_hazard
-+	tlbw_eret_hazard
- 	eret
- 
- 9:						# handle the vmalloc range
-@@ -206,10 +201,9 @@
- 	ld	k0, 0(k1)			# get even pte
- 	ld	k1, 8(k1)			# get odd pte
- 	PTE_RELOAD k0 k1
--	rm9000_tlb_hazard
--	nop
-+	mtc0_tlbw_hazard
- 	tlbwr
--	rm9000_tlb_hazard
-+	tlbw_eret_hazard
- 	eret
- END(handle_vec1_r10k)
- 
-diff -Nur linux-2.4.29/arch/mips64/mm/tlb-r4k.c linux-mips/arch/mips64/mm/tlb-r4k.c
---- linux-2.4.29/arch/mips64/mm/tlb-r4k.c	2005-01-19 15:09:33.000000000 +0100
-+++ linux-mips/arch/mips64/mm/tlb-r4k.c	2004-11-25 23:18:38.000000000 +0100
+diff -Nur linux-2.4.30/arch/mips64/mm/tlb-r4k.c linux-2.4.30-mips/arch/mips64/mm/tlb-r4k.c
+--- linux-2.4.30/arch/mips64/mm/tlb-r4k.c	2005-01-19 15:09:33.000000000 +0100
++++ linux-2.4.30-mips/arch/mips64/mm/tlb-r4k.c	2004-11-25 23:18:38.000000000 +0100
 @@ -1,24 +1,12 @@
  /*
 - * Carsten Langgaard, carstenl@mips.com
@@ -10131,9 +11613,159 @@ diff -Nur linux-2.4.29/arch/mips64/mm/tlb-r4k.c linux-mips/arch/mips64/mm/tlb-r4
  	probe_tlb(config);
  	write_c0_pagemask(PM_DEFAULT_MASK);
  	write_c0_wired(0);
-diff -Nur linux-2.4.29/drivers/char/au1000_gpio.c linux-mips/drivers/char/au1000_gpio.c
---- linux-2.4.29/drivers/char/au1000_gpio.c	2003-08-25 13:44:41.000000000 +0200
-+++ linux-mips/drivers/char/au1000_gpio.c	2003-12-20 14:18:51.000000000 +0100
+diff -Nur linux-2.4.30/arch/mips64/mm/tlbex-r4k.S linux-2.4.30-mips/arch/mips64/mm/tlbex-r4k.S
+--- linux-2.4.30/arch/mips64/mm/tlbex-r4k.S	2004-02-18 14:36:30.000000000 +0100
++++ linux-2.4.30-mips/arch/mips64/mm/tlbex-r4k.S	2004-11-25 23:18:38.000000000 +0100
+@@ -151,11 +151,9 @@
+ 	ld	k0, 0(k1)			# get even pte
+ 	ld	k1, 8(k1)			# get odd pte
+ 	PTE_RELOAD k0 k1
+-	rm9000_tlb_hazard
+-	b	1f
+-	 tlbwr
+-1:	nop
+-	rm9000_tlb_hazard
++	mtc0_tlbw_hazard
++	tlbwr
++1:	tlbw_eret_hazard
+ 	eret
+ 
+ 9:						# handle the vmalloc range
+@@ -163,11 +161,9 @@
+ 	ld	k0, 0(k1)			# get even pte
+ 	ld	k1, 8(k1)			# get odd pte
+ 	PTE_RELOAD k0 k1
+-	rm9000_tlb_hazard
+-	b	1f
+-	 tlbwr
+-1:	nop
+-	rm9000_tlb_hazard
++	mtc0_tlbw_hazard
++	tlbwr
++1:	tlbw_eret_hazard
+ 	eret
+ END(handle_vec1_r4k)
+ 
+@@ -195,10 +191,9 @@
+ 	ld	k0, 0(k1)			# get even pte
+ 	ld	k1, 8(k1)			# get odd pte
+ 	PTE_RELOAD k0 k1
+-	rm9000_tlb_hazard
+-	nop
++	mtc0_tlbw_hazard
+ 	tlbwr
+-	rm9000_tlb_hazard
++	tlbw_eret_hazard
+ 	eret
+ 
+ 9:						# handle the vmalloc range
+@@ -206,10 +201,9 @@
+ 	ld	k0, 0(k1)			# get even pte
+ 	ld	k1, 8(k1)			# get odd pte
+ 	PTE_RELOAD k0 k1
+-	rm9000_tlb_hazard
+-	nop
++	mtc0_tlbw_hazard
+ 	tlbwr
+-	rm9000_tlb_hazard
++	tlbw_eret_hazard
+ 	eret
+ END(handle_vec1_r10k)
+ 
+diff -Nur linux-2.4.30/drivers/char/Config.in linux-2.4.30-mips/drivers/char/Config.in
+--- linux-2.4.30/drivers/char/Config.in	2004-08-08 01:26:04.000000000 +0200
++++ linux-2.4.30-mips/drivers/char/Config.in	2005-02-11 22:09:56.000000000 +0100
+@@ -313,14 +313,11 @@
+ if [ "$CONFIG_OBSOLETE" = "y" -a "$CONFIG_ALPHA_BOOK1" = "y" ]; then
+    bool 'Tadpole ANA H8 Support (OBSOLETE)'  CONFIG_H8
+ fi
+-if [ "$CONFIG_MIPS" = "y" -a "$CONFIG_NEW_TIME_C" = "y" ]; then
+-   tristate 'Generic MIPS RTC Support' CONFIG_MIPS_RTC
+-fi
+ if [ "$CONFIG_SGI_IP22" = "y" ]; then
+-   bool 'SGI DS1286 RTC support' CONFIG_SGI_DS1286
++   tristate 'Dallas DS1286 RTC support' CONFIG_DS1286
+ fi
+ if [ "$CONFIG_SGI_IP27" = "y" ]; then
+-   bool 'SGI M48T35 RTC support' CONFIG_SGI_IP27_RTC
++   tristate 'SGI M48T35 RTC support' CONFIG_SGI_IP27_RTC
+ fi
+ if [ "$CONFIG_TOSHIBA_RBTX4927" = "y" -o "$CONFIG_TOSHIBA_JMR3927" = "y" ]; then
+    tristate 'Dallas DS1742 RTC support' CONFIG_DS1742
+@@ -383,6 +380,11 @@
+       source drivers/char/drm/Config.in
+    fi
+ fi
++
++if [ "$CONFIG_X86" = "y" ]; then
++   tristate 'ACP Modem (Mwave) support' CONFIG_MWAVE
++fi
++
+ endmenu
+ 
+ if [ "$CONFIG_HOTPLUG" = "y" -a "$CONFIG_PCMCIA" != "n" ]; then
+@@ -391,6 +393,7 @@
+ if [ "$CONFIG_SOC_AU1X00" = "y" ]; then
+    tristate ' Alchemy Au1x00 GPIO device support' CONFIG_AU1X00_GPIO
+    tristate ' Au1000/ADS7846 touchscreen support' CONFIG_TS_AU1X00_ADS7846
++   #tristate ' Alchemy Au1550 PSC SPI support' CONFIG_AU1550_PSC_SPI
+ fi
+ if [ "$CONFIG_MIPS_ITE8172" = "y" ]; then
+   tristate ' ITE GPIO' CONFIG_ITE_GPIO
+diff -Nur linux-2.4.30/drivers/char/Makefile linux-2.4.30-mips/drivers/char/Makefile
+--- linux-2.4.30/drivers/char/Makefile	2004-08-08 01:26:04.000000000 +0200
++++ linux-2.4.30-mips/drivers/char/Makefile	2005-02-11 22:09:56.000000000 +0100
+@@ -48,7 +48,12 @@
+     KEYBD    =
+   endif
+   ifeq ($(CONFIG_VR41XX_KIU),y)
+-    KEYMAP   =
++    ifeq ($(CONFIG_IBM_WORKPAD),y)
++      KEYMAP = ibm_workpad_keymap.o
++    endif
++    ifeq ($(CONFIG_VICTOR_MPC30X),y)
++      KEYMAP = victor_mpc30x_keymap.o
++    endif
+     KEYBD    = vr41xx_keyb.o
+   endif
+ endif
+@@ -251,7 +256,6 @@
+ obj-$(CONFIG_RTC) += rtc.o
+ obj-$(CONFIG_GEN_RTC) += genrtc.o
+ obj-$(CONFIG_EFI_RTC) += efirtc.o
+-obj-$(CONFIG_SGI_DS1286) += ds1286.o
+ obj-$(CONFIG_MIPS_RTC) += mips_rtc.o
+ obj-$(CONFIG_SGI_IP27_RTC) += ip27-rtc.o
+ ifeq ($(CONFIG_PPC),)
+@@ -259,6 +263,7 @@
+ endif
+ obj-$(CONFIG_TOSHIBA) += toshiba.o
+ obj-$(CONFIG_I8K) += i8k.o
++obj-$(CONFIG_DS1286) += ds1286.o
+ obj-$(CONFIG_DS1620) += ds1620.o
+ obj-$(CONFIG_DS1742) += ds1742.o
+ obj-$(CONFIG_INTEL_RNG) += i810_rng.o
+@@ -269,6 +274,7 @@
+ 
+ obj-$(CONFIG_ITE_GPIO) += ite_gpio.o
+ obj-$(CONFIG_AU1X00_GPIO) += au1000_gpio.o
++obj-$(CONFIG_AU1550_PSC_SPI) += au1550_psc_spi.o
+ obj-$(CONFIG_AU1X00_USB_TTY) += au1000_usbtty.o
+ obj-$(CONFIG_AU1X00_USB_RAW) += au1000_usbraw.o
+ obj-$(CONFIG_COBALT_LCD) += lcd.o
+@@ -353,3 +359,9 @@
+ 
+ qtronixmap.c: qtronixmap.map
+ 	set -e ; loadkeys --mktable $< | sed -e 's/^static *//' > $@
++
++ibm_workpad_keymap.c: ibm_workpad_keymap.map
++	set -e ; loadkeys --mktable $< | sed -e 's/^static *//' > $@
++
++victor_mpc30x_keymap.c: victor_mpc30x_keymap.map
++	set -e ; loadkeys --mktable $< | sed -e 's/^static *//' > $@
+diff -Nur linux-2.4.30/drivers/char/au1000_gpio.c linux-2.4.30-mips/drivers/char/au1000_gpio.c
+--- linux-2.4.30/drivers/char/au1000_gpio.c	2003-08-25 13:44:41.000000000 +0200
++++ linux-2.4.30-mips/drivers/char/au1000_gpio.c	2003-12-20 14:18:51.000000000 +0100
 @@ -246,7 +246,7 @@
  
  static struct miscdevice au1000gpio_miscdev =
@@ -10143,9 +11775,9 @@ diff -Nur linux-2.4.29/drivers/char/au1000_gpio.c linux-mips/drivers/char/au1000
  	"au1000_gpio",
  	&au1000gpio_fops
  };
-diff -Nur linux-2.4.29/drivers/char/au1550_psc_spi.c linux-mips/drivers/char/au1550_psc_spi.c
---- linux-2.4.29/drivers/char/au1550_psc_spi.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-mips/drivers/char/au1550_psc_spi.c	2005-02-11 21:37:24.000000000 +0100
+diff -Nur linux-2.4.30/drivers/char/au1550_psc_spi.c linux-2.4.30-mips/drivers/char/au1550_psc_spi.c
+--- linux-2.4.30/drivers/char/au1550_psc_spi.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.30-mips/drivers/char/au1550_psc_spi.c	2005-02-11 21:37:24.000000000 +0100
 @@ -0,0 +1,466 @@
 +/*
 + *  Driver for Alchemy Au1550 SPI on the PSC.
@@ -10613,49 +12245,9 @@ diff -Nur linux-2.4.29/drivers/char/au1550_psc_spi.c linux-mips/drivers/char/au1
 +
 +module_init(au1550spi_init);
 +module_exit(au1550spi_exit);
-diff -Nur linux-2.4.29/drivers/char/Config.in linux-mips/drivers/char/Config.in
---- linux-2.4.29/drivers/char/Config.in	2004-08-08 01:26:04.000000000 +0200
-+++ linux-mips/drivers/char/Config.in	2005-02-11 22:09:56.000000000 +0100
-@@ -313,14 +313,11 @@
- if [ "$CONFIG_OBSOLETE" = "y" -a "$CONFIG_ALPHA_BOOK1" = "y" ]; then
-    bool 'Tadpole ANA H8 Support (OBSOLETE)'  CONFIG_H8
- fi
--if [ "$CONFIG_MIPS" = "y" -a "$CONFIG_NEW_TIME_C" = "y" ]; then
--   tristate 'Generic MIPS RTC Support' CONFIG_MIPS_RTC
--fi
- if [ "$CONFIG_SGI_IP22" = "y" ]; then
--   bool 'SGI DS1286 RTC support' CONFIG_SGI_DS1286
-+   tristate 'Dallas DS1286 RTC support' CONFIG_DS1286
- fi
- if [ "$CONFIG_SGI_IP27" = "y" ]; then
--   bool 'SGI M48T35 RTC support' CONFIG_SGI_IP27_RTC
-+   tristate 'SGI M48T35 RTC support' CONFIG_SGI_IP27_RTC
- fi
- if [ "$CONFIG_TOSHIBA_RBTX4927" = "y" -o "$CONFIG_TOSHIBA_JMR3927" = "y" ]; then
-    tristate 'Dallas DS1742 RTC support' CONFIG_DS1742
-@@ -383,6 +380,11 @@
-       source drivers/char/drm/Config.in
-    fi
- fi
-+
-+if [ "$CONFIG_X86" = "y" ]; then
-+   tristate 'ACP Modem (Mwave) support' CONFIG_MWAVE
-+fi
-+
- endmenu
- 
- if [ "$CONFIG_HOTPLUG" = "y" -a "$CONFIG_PCMCIA" != "n" ]; then
-@@ -391,6 +393,7 @@
- if [ "$CONFIG_SOC_AU1X00" = "y" ]; then
-    tristate ' Alchemy Au1x00 GPIO device support' CONFIG_AU1X00_GPIO
-    tristate ' Au1000/ADS7846 touchscreen support' CONFIG_TS_AU1X00_ADS7846
-+   #tristate ' Alchemy Au1550 PSC SPI support' CONFIG_AU1550_PSC_SPI
- fi
- if [ "$CONFIG_MIPS_ITE8172" = "y" ]; then
-   tristate ' ITE GPIO' CONFIG_ITE_GPIO
-diff -Nur linux-2.4.29/drivers/char/decserial.c linux-mips/drivers/char/decserial.c
---- linux-2.4.29/drivers/char/decserial.c	2003-08-25 13:44:41.000000000 +0200
-+++ linux-mips/drivers/char/decserial.c	2004-09-28 02:53:01.000000000 +0200
+diff -Nur linux-2.4.30/drivers/char/decserial.c linux-2.4.30-mips/drivers/char/decserial.c
+--- linux-2.4.30/drivers/char/decserial.c	2003-08-25 13:44:41.000000000 +0200
++++ linux-2.4.30-mips/drivers/char/decserial.c	2004-09-28 02:53:01.000000000 +0200
 @@ -3,95 +3,105 @@
   *      choose the right serial device at boot time
   *
@@ -10806,9 +12398,9 @@ diff -Nur linux-2.4.29/drivers/char/decserial.c linux-mips/drivers/char/decseria
  #endif
  }
  
-diff -Nur linux-2.4.29/drivers/char/ds1286.c linux-mips/drivers/char/ds1286.c
---- linux-2.4.29/drivers/char/ds1286.c	2004-02-18 14:36:31.000000000 +0100
-+++ linux-mips/drivers/char/ds1286.c	2004-01-10 06:21:39.000000000 +0100
+diff -Nur linux-2.4.30/drivers/char/ds1286.c linux-2.4.30-mips/drivers/char/ds1286.c
+--- linux-2.4.30/drivers/char/ds1286.c	2004-02-18 14:36:31.000000000 +0100
++++ linux-2.4.30-mips/drivers/char/ds1286.c	2004-01-10 06:21:39.000000000 +0100
 @@ -1,6 +1,10 @@
  /*
   * DS1286 Real Time Clock interface for Linux
@@ -10944,9 +12536,9 @@ diff -Nur linux-2.4.29/drivers/char/ds1286.c linux-mips/drivers/char/ds1286.c
 +
 +MODULE_AUTHOR("Ralf Baechle");
 +MODULE_LICENSE("GPL");
-diff -Nur linux-2.4.29/drivers/char/ds1742.c linux-mips/drivers/char/ds1742.c
---- linux-2.4.29/drivers/char/ds1742.c	2004-02-18 14:36:31.000000000 +0100
-+++ linux-mips/drivers/char/ds1742.c	2004-01-09 20:27:16.000000000 +0100
+diff -Nur linux-2.4.30/drivers/char/ds1742.c linux-2.4.30-mips/drivers/char/ds1742.c
+--- linux-2.4.30/drivers/char/ds1742.c	2004-02-18 14:36:31.000000000 +0100
++++ linux-2.4.30-mips/drivers/char/ds1742.c	2004-01-09 20:27:16.000000000 +0100
 @@ -142,6 +142,7 @@
  	CMOS_WRITE(RTC_WRITE, RTC_CONTROL);
  
@@ -10982,9 +12574,9 @@ diff -Nur linux-2.4.29/drivers/char/ds1742.c linux-mips/drivers/char/ds1742.c
  		to_tm(curr_time, &rtc_tm);
  		rtc_tm.tm_year -= 1900;
  		return copy_to_user((void *) arg, &rtc_tm, sizeof(rtc_tm)) ? 
-diff -Nur linux-2.4.29/drivers/char/dummy_keyb.c linux-mips/drivers/char/dummy_keyb.c
---- linux-2.4.29/drivers/char/dummy_keyb.c	2003-08-25 13:44:41.000000000 +0200
-+++ linux-mips/drivers/char/dummy_keyb.c	2004-01-09 09:53:08.000000000 +0100
+diff -Nur linux-2.4.30/drivers/char/dummy_keyb.c linux-2.4.30-mips/drivers/char/dummy_keyb.c
+--- linux-2.4.30/drivers/char/dummy_keyb.c	2003-08-25 13:44:41.000000000 +0200
++++ linux-2.4.30-mips/drivers/char/dummy_keyb.c	2004-01-09 09:53:08.000000000 +0100
 @@ -140,3 +140,7 @@
  {
  	printk("Dummy keyboard driver installed.\n");
@@ -10993,9 +12585,9 @@ diff -Nur linux-2.4.29/drivers/char/dummy_keyb.c linux-mips/drivers/char/dummy_k
 +unsigned char kbd_sysrq_key;
 +unsigned char kbd_sysrq_xlate[128];
 +#endif
-diff -Nur linux-2.4.29/drivers/char/dz.c linux-mips/drivers/char/dz.c
---- linux-2.4.29/drivers/char/dz.c	2005-01-19 15:09:44.000000000 +0100
-+++ linux-mips/drivers/char/dz.c	2004-12-27 05:13:42.000000000 +0100
+diff -Nur linux-2.4.30/drivers/char/dz.c linux-2.4.30-mips/drivers/char/dz.c
+--- linux-2.4.30/drivers/char/dz.c	2005-01-19 15:09:44.000000000 +0100
++++ linux-2.4.30-mips/drivers/char/dz.c	2004-12-27 05:13:42.000000000 +0100
 @@ -1,11 +1,13 @@
  /*
 - * dz.c: Serial port driver for DECStations equiped 
@@ -11865,9 +13457,9 @@ diff -Nur linux-2.4.29/drivers/char/dz.c linux-mips/drivers/char/dz.c
  };
  
  void __init dz_serial_console_init(void)
-diff -Nur linux-2.4.29/drivers/char/dz.h linux-mips/drivers/char/dz.h
---- linux-2.4.29/drivers/char/dz.h	2002-08-03 02:39:43.000000000 +0200
-+++ linux-mips/drivers/char/dz.h	2004-09-28 02:53:01.000000000 +0200
+diff -Nur linux-2.4.30/drivers/char/dz.h linux-2.4.30-mips/drivers/char/dz.h
+--- linux-2.4.30/drivers/char/dz.h	2002-08-03 02:39:43.000000000 +0200
++++ linux-2.4.30-mips/drivers/char/dz.h	2004-09-28 02:53:01.000000000 +0200
 @@ -10,6 +10,8 @@
  #ifndef DZ_SERIAL_H
  #define DZ_SERIAL_H
@@ -12016,9 +13608,9 @@ diff -Nur linux-2.4.29/drivers/char/dz.h linux-mips/drivers/char/dz.h
 -#endif
 -
  #endif /* DZ_SERIAL_H */
-diff -Nur linux-2.4.29/drivers/char/ibm_workpad_keymap.map linux-mips/drivers/char/ibm_workpad_keymap.map
---- linux-2.4.29/drivers/char/ibm_workpad_keymap.map	1970-01-01 01:00:00.000000000 +0100
-+++ linux-mips/drivers/char/ibm_workpad_keymap.map	2003-12-20 15:20:44.000000000 +0100
+diff -Nur linux-2.4.30/drivers/char/ibm_workpad_keymap.map linux-2.4.30-mips/drivers/char/ibm_workpad_keymap.map
+--- linux-2.4.30/drivers/char/ibm_workpad_keymap.map	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.30-mips/drivers/char/ibm_workpad_keymap.map	2003-12-20 15:20:44.000000000 +0100
 @@ -0,0 +1,343 @@
 +# Keymap for IBM Workpad z50
 +# US Mapping
@@ -12363,9 +13955,9 @@ diff -Nur linux-2.4.29/drivers/char/ibm_workpad_keymap.map linux-mips/drivers/ch
 +keycode 93 = AltGr
 +keycode 94 = ShiftR
 +	shift keycode 94 = Caps_Lock
-diff -Nur linux-2.4.29/drivers/char/indydog.c linux-mips/drivers/char/indydog.c
---- linux-2.4.29/drivers/char/indydog.c	2003-08-25 13:44:41.000000000 +0200
-+++ linux-mips/drivers/char/indydog.c	2004-06-22 17:32:07.000000000 +0200
+diff -Nur linux-2.4.30/drivers/char/indydog.c linux-2.4.30-mips/drivers/char/indydog.c
+--- linux-2.4.30/drivers/char/indydog.c	2003-08-25 13:44:41.000000000 +0200
++++ linux-2.4.30-mips/drivers/char/indydog.c	2004-06-22 17:32:07.000000000 +0200
 @@ -1,5 +1,5 @@
  /*
 - *	IndyDog	0.2	A Hardware Watchdog Device for SGI IP22
@@ -12609,9 +14201,9 @@ diff -Nur linux-2.4.29/drivers/char/indydog.c linux-mips/drivers/char/indydog.c
 +MODULE_AUTHOR("Guido Guenther <agx@sigxcpu.org>");
 +MODULE_DESCRIPTION("Hardware Watchdog Device for SGI IP22");
  MODULE_LICENSE("GPL");
-diff -Nur linux-2.4.29/drivers/char/ip27-rtc.c linux-mips/drivers/char/ip27-rtc.c
---- linux-2.4.29/drivers/char/ip27-rtc.c	2004-02-18 14:36:31.000000000 +0100
-+++ linux-mips/drivers/char/ip27-rtc.c	2004-04-06 03:35:30.000000000 +0200
+diff -Nur linux-2.4.30/drivers/char/ip27-rtc.c linux-2.4.30-mips/drivers/char/ip27-rtc.c
+--- linux-2.4.30/drivers/char/ip27-rtc.c	2004-02-18 14:36:31.000000000 +0100
++++ linux-2.4.30-mips/drivers/char/ip27-rtc.c	2004-04-06 03:35:30.000000000 +0200
 @@ -44,6 +44,7 @@
  #include <asm/sn/klconfig.h>
  #include <asm/sn/sn0/ip27.h>
@@ -12641,60 +14233,9 @@ diff -Nur linux-2.4.29/drivers/char/ip27-rtc.c linux-mips/drivers/char/ip27-rtc.
 +MODULE_AUTHOR("Ralf Baechle <ralf@linux-mips.org>");
 +MODULE_DESCRIPTION("SGI IP27 M48T35 RTC driver");
 +MODULE_LICENSE("GPL");
-diff -Nur linux-2.4.29/drivers/char/Makefile linux-mips/drivers/char/Makefile
---- linux-2.4.29/drivers/char/Makefile	2004-08-08 01:26:04.000000000 +0200
-+++ linux-mips/drivers/char/Makefile	2005-02-11 22:09:56.000000000 +0100
-@@ -48,7 +48,12 @@
-     KEYBD    =
-   endif
-   ifeq ($(CONFIG_VR41XX_KIU),y)
--    KEYMAP   =
-+    ifeq ($(CONFIG_IBM_WORKPAD),y)
-+      KEYMAP = ibm_workpad_keymap.o
-+    endif
-+    ifeq ($(CONFIG_VICTOR_MPC30X),y)
-+      KEYMAP = victor_mpc30x_keymap.o
-+    endif
-     KEYBD    = vr41xx_keyb.o
-   endif
- endif
-@@ -251,7 +256,6 @@
- obj-$(CONFIG_RTC) += rtc.o
- obj-$(CONFIG_GEN_RTC) += genrtc.o
- obj-$(CONFIG_EFI_RTC) += efirtc.o
--obj-$(CONFIG_SGI_DS1286) += ds1286.o
- obj-$(CONFIG_MIPS_RTC) += mips_rtc.o
- obj-$(CONFIG_SGI_IP27_RTC) += ip27-rtc.o
- ifeq ($(CONFIG_PPC),)
-@@ -259,6 +263,7 @@
- endif
- obj-$(CONFIG_TOSHIBA) += toshiba.o
- obj-$(CONFIG_I8K) += i8k.o
-+obj-$(CONFIG_DS1286) += ds1286.o
- obj-$(CONFIG_DS1620) += ds1620.o
- obj-$(CONFIG_DS1742) += ds1742.o
- obj-$(CONFIG_INTEL_RNG) += i810_rng.o
-@@ -269,6 +274,7 @@
- 
- obj-$(CONFIG_ITE_GPIO) += ite_gpio.o
- obj-$(CONFIG_AU1X00_GPIO) += au1000_gpio.o
-+obj-$(CONFIG_AU1550_PSC_SPI) += au1550_psc_spi.o
- obj-$(CONFIG_AU1X00_USB_TTY) += au1000_usbtty.o
- obj-$(CONFIG_AU1X00_USB_RAW) += au1000_usbraw.o
- obj-$(CONFIG_COBALT_LCD) += lcd.o
-@@ -353,3 +359,9 @@
- 
- qtronixmap.c: qtronixmap.map
- 	set -e ; loadkeys --mktable $< | sed -e 's/^static *//' > $@
-+
-+ibm_workpad_keymap.c: ibm_workpad_keymap.map
-+	set -e ; loadkeys --mktable $< | sed -e 's/^static *//' > $@
-+
-+victor_mpc30x_keymap.c: victor_mpc30x_keymap.map
-+	set -e ; loadkeys --mktable $< | sed -e 's/^static *//' > $@
-diff -Nur linux-2.4.29/drivers/char/mips_rtc.c linux-mips/drivers/char/mips_rtc.c
---- linux-2.4.29/drivers/char/mips_rtc.c	2004-01-05 14:53:56.000000000 +0100
-+++ linux-mips/drivers/char/mips_rtc.c	2004-06-28 14:54:53.000000000 +0200
+diff -Nur linux-2.4.30/drivers/char/mips_rtc.c linux-2.4.30-mips/drivers/char/mips_rtc.c
+--- linux-2.4.30/drivers/char/mips_rtc.c	2004-01-05 14:53:56.000000000 +0100
++++ linux-2.4.30-mips/drivers/char/mips_rtc.c	2004-06-28 14:54:53.000000000 +0200
 @@ -53,14 +53,6 @@
  #include <asm/io.h>
  #include <asm/uaccess.h>
@@ -12710,9 +14251,9 @@ diff -Nur linux-2.4.29/drivers/char/mips_rtc.c linux-mips/drivers/char/mips_rtc.
  #include <asm/time.h>
  
  static unsigned long rtc_status = 0;	/* bitmapped status byte.       */
-diff -Nur linux-2.4.29/drivers/char/sb1250_duart.c linux-mips/drivers/char/sb1250_duart.c
---- linux-2.4.29/drivers/char/sb1250_duart.c	2004-02-18 14:36:31.000000000 +0100
-+++ linux-mips/drivers/char/sb1250_duart.c	2004-09-17 01:25:44.000000000 +0200
+diff -Nur linux-2.4.30/drivers/char/sb1250_duart.c linux-2.4.30-mips/drivers/char/sb1250_duart.c
+--- linux-2.4.30/drivers/char/sb1250_duart.c	2004-02-18 14:36:31.000000000 +0100
++++ linux-2.4.30-mips/drivers/char/sb1250_duart.c	2004-09-17 01:25:44.000000000 +0200
 @@ -328,10 +328,11 @@
  		if (c <= 0) break;
  
@@ -12767,9 +14308,9 @@ diff -Nur linux-2.4.29/drivers/char/sb1250_duart.c linux-mips/drivers/char/sb125
  		break;
  	case TIOCSSERIAL:
  		printk("Ignoring TIOCSSERIAL\n");
-diff -Nur linux-2.4.29/drivers/char/serial.c linux-mips/drivers/char/serial.c
---- linux-2.4.29/drivers/char/serial.c	2005-01-19 15:09:50.000000000 +0100
-+++ linux-mips/drivers/char/serial.c	2004-12-27 05:13:43.000000000 +0100
+diff -Nur linux-2.4.30/drivers/char/serial.c linux-2.4.30-mips/drivers/char/serial.c
+--- linux-2.4.30/drivers/char/serial.c	2005-01-19 15:09:50.000000000 +0100
++++ linux-2.4.30-mips/drivers/char/serial.c	2004-12-27 05:13:43.000000000 +0100
 @@ -62,6 +62,12 @@
   *        Robert Schwebel <robert@schwebel.de>,
   *        Juergen Beisert <jbeisert@eurodsn.de>,
@@ -12815,9 +14356,9 @@ diff -Nur linux-2.4.29/drivers/char/serial.c linux-mips/drivers/char/serial.c
  
  /*
   * We used to support using pause I/O for certain machines.  We
-diff -Nur linux-2.4.29/drivers/char/victor_mpc30x_keymap.map linux-mips/drivers/char/victor_mpc30x_keymap.map
---- linux-2.4.29/drivers/char/victor_mpc30x_keymap.map	1970-01-01 01:00:00.000000000 +0100
-+++ linux-mips/drivers/char/victor_mpc30x_keymap.map	2004-02-05 18:04:42.000000000 +0100
+diff -Nur linux-2.4.30/drivers/char/victor_mpc30x_keymap.map linux-2.4.30-mips/drivers/char/victor_mpc30x_keymap.map
+--- linux-2.4.30/drivers/char/victor_mpc30x_keymap.map	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.30-mips/drivers/char/victor_mpc30x_keymap.map	2004-02-05 18:04:42.000000000 +0100
 @@ -0,0 +1,102 @@
 +# Victor Interlink MP-C303/304 keyboard keymap
 +#
@@ -12921,9 +14462,9 @@ diff -Nur linux-2.4.29/drivers/char/victor_mpc30x_keymap.map linux-mips/drivers/
 +	alt keycode 31 = PageDown
 +keycode 47 = Right
 +	alt keycode 47 = End
-diff -Nur linux-2.4.29/drivers/char/vr41xx_keyb.c linux-mips/drivers/char/vr41xx_keyb.c
---- linux-2.4.29/drivers/char/vr41xx_keyb.c	2004-02-18 14:36:31.000000000 +0100
-+++ linux-mips/drivers/char/vr41xx_keyb.c	2004-02-17 13:08:55.000000000 +0100
+diff -Nur linux-2.4.30/drivers/char/vr41xx_keyb.c linux-2.4.30-mips/drivers/char/vr41xx_keyb.c
+--- linux-2.4.30/drivers/char/vr41xx_keyb.c	2004-02-18 14:36:31.000000000 +0100
++++ linux-2.4.30-mips/drivers/char/vr41xx_keyb.c	2004-02-17 13:08:55.000000000 +0100
 @@ -308,7 +308,7 @@
  			if (found != 0) {
  				kiu_base = VRC4173_KIU_OFFSET;
@@ -12942,9 +14483,9 @@ diff -Nur linux-2.4.29/drivers/char/vr41xx_keyb.c linux-mips/drivers/char/vr41xx
  
  	kiu_writew(KIURST_KIURST, KIURST);
  
-diff -Nur linux-2.4.29/drivers/i2c/Config.in linux-mips/drivers/i2c/Config.in
---- linux-2.4.29/drivers/i2c/Config.in	2004-04-14 15:05:29.000000000 +0200
-+++ linux-mips/drivers/i2c/Config.in	2005-02-11 20:49:04.000000000 +0100
+diff -Nur linux-2.4.30/drivers/i2c/Config.in linux-2.4.30-mips/drivers/i2c/Config.in
+--- linux-2.4.30/drivers/i2c/Config.in	2004-04-14 15:05:29.000000000 +0200
++++ linux-2.4.30-mips/drivers/i2c/Config.in	2005-02-11 20:49:04.000000000 +0100
 @@ -57,6 +57,10 @@
     if [ "$CONFIG_SGI_IP22" = "y" ]; then
        dep_tristate 'I2C SGI interfaces' CONFIG_I2C_ALGO_SGI $CONFIG_I2C
@@ -12956,9 +14497,29 @@ diff -Nur linux-2.4.29/drivers/i2c/Config.in linux-mips/drivers/i2c/Config.in
   
  # This is needed for automatic patch generation: sensors code starts here
  # This is needed for automatic patch generation: sensors code ends here
-diff -Nur linux-2.4.29/drivers/i2c/i2c-algo-au1550.c linux-mips/drivers/i2c/i2c-algo-au1550.c
---- linux-2.4.29/drivers/i2c/i2c-algo-au1550.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-mips/drivers/i2c/i2c-algo-au1550.c	2005-02-11 20:49:04.000000000 +0100
+diff -Nur linux-2.4.30/drivers/i2c/Makefile linux-2.4.30-mips/drivers/i2c/Makefile
+--- linux-2.4.30/drivers/i2c/Makefile	2004-02-18 14:36:31.000000000 +0100
++++ linux-2.4.30-mips/drivers/i2c/Makefile	2005-02-11 20:49:04.000000000 +0100
+@@ -6,7 +6,7 @@
+ 
+ export-objs	:= i2c-core.o i2c-algo-bit.o i2c-algo-pcf.o \
+ 		   i2c-algo-ite.o i2c-algo-sibyte.o i2c-algo-sgi.o \
+-		   i2c-proc.o
++		   i2c-algo-au1550.o i2c-proc.o i2c-au1550.o
+ 
+ obj-$(CONFIG_I2C)		+= i2c-core.o
+ obj-$(CONFIG_I2C_CHARDEV)	+= i2c-dev.o
+@@ -25,6 +25,7 @@
+ obj-$(CONFIG_I2C_ALGO_SIBYTE)	+= i2c-algo-sibyte.o i2c-sibyte.o
+ obj-$(CONFIG_I2C_MAX1617)	+= i2c-max1617.o
+ obj-$(CONFIG_I2C_ALGO_SGI)	+= i2c-algo-sgi.o
++obj-$(CONFIG_I2C_ALGO_AU1550)	+= i2c-algo-au1550.o i2c-au1550.o
+ 
+ # This is needed for automatic patch generation: sensors code starts here
+ # This is needed for automatic patch generation: sensors code ends here
+diff -Nur linux-2.4.30/drivers/i2c/i2c-algo-au1550.c linux-2.4.30-mips/drivers/i2c/i2c-algo-au1550.c
+--- linux-2.4.30/drivers/i2c/i2c-algo-au1550.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.30-mips/drivers/i2c/i2c-algo-au1550.c	2005-02-11 20:49:04.000000000 +0100
 @@ -0,0 +1,340 @@
 +/*
 + * i2c-algo-au1550.c: SMBus (i2c) driver algorithms for Alchemy PSC interface
@@ -13300,9 +14861,9 @@ diff -Nur linux-2.4.29/drivers/i2c/i2c-algo-au1550.c linux-mips/drivers/i2c/i2c-
 +MODULE_AUTHOR("Dan Malek <dan@embeddededge.com>");
 +MODULE_DESCRIPTION("SMBus Au1550 algorithm");
 +MODULE_LICENSE("GPL");
-diff -Nur linux-2.4.29/drivers/i2c/i2c-au1550.c linux-mips/drivers/i2c/i2c-au1550.c
---- linux-2.4.29/drivers/i2c/i2c-au1550.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-mips/drivers/i2c/i2c-au1550.c	2005-02-11 20:49:04.000000000 +0100
+diff -Nur linux-2.4.30/drivers/i2c/i2c-au1550.c linux-2.4.30-mips/drivers/i2c/i2c-au1550.c
+--- linux-2.4.30/drivers/i2c/i2c-au1550.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.30-mips/drivers/i2c/i2c-au1550.c	2005-02-11 20:49:04.000000000 +0100
 @@ -0,0 +1,154 @@
 +/*
 + * i2c-au1550.c: SMBus (i2c) adapter for Alchemy PSC interface
@@ -13458,9 +15019,9 @@ diff -Nur linux-2.4.29/drivers/i2c/i2c-au1550.c linux-mips/drivers/i2c/i2c-au155
 +{
 +	i2c_au1550_del_bus(&pb1550_board_adapter);
 +}
-diff -Nur linux-2.4.29/drivers/i2c/i2c-core.c linux-mips/drivers/i2c/i2c-core.c
---- linux-2.4.29/drivers/i2c/i2c-core.c	2005-01-19 15:09:54.000000000 +0100
-+++ linux-mips/drivers/i2c/i2c-core.c	2004-11-29 18:47:16.000000000 +0100
+diff -Nur linux-2.4.30/drivers/i2c/i2c-core.c linux-2.4.30-mips/drivers/i2c/i2c-core.c
+--- linux-2.4.30/drivers/i2c/i2c-core.c	2005-01-19 15:09:54.000000000 +0100
++++ linux-2.4.30-mips/drivers/i2c/i2c-core.c	2004-11-29 18:47:16.000000000 +0100
 @@ -1280,6 +1280,9 @@
  #ifdef CONFIG_I2C_MAX1617
  	extern int i2c_max1617_init(void);
@@ -13482,29 +15043,9 @@ diff -Nur linux-2.4.29/drivers/i2c/i2c-core.c linux-mips/drivers/i2c/i2c-core.c
  	/* -------------- proc interface ---- */
  #ifdef CONFIG_I2C_PROC
  	sensors_init();
-diff -Nur linux-2.4.29/drivers/i2c/Makefile linux-mips/drivers/i2c/Makefile
---- linux-2.4.29/drivers/i2c/Makefile	2004-02-18 14:36:31.000000000 +0100
-+++ linux-mips/drivers/i2c/Makefile	2005-02-11 20:49:04.000000000 +0100
-@@ -6,7 +6,7 @@
- 
- export-objs	:= i2c-core.o i2c-algo-bit.o i2c-algo-pcf.o \
- 		   i2c-algo-ite.o i2c-algo-sibyte.o i2c-algo-sgi.o \
--		   i2c-proc.o
-+		   i2c-algo-au1550.o i2c-proc.o i2c-au1550.o
- 
- obj-$(CONFIG_I2C)		+= i2c-core.o
- obj-$(CONFIG_I2C_CHARDEV)	+= i2c-dev.o
-@@ -25,6 +25,7 @@
- obj-$(CONFIG_I2C_ALGO_SIBYTE)	+= i2c-algo-sibyte.o i2c-sibyte.o
- obj-$(CONFIG_I2C_MAX1617)	+= i2c-max1617.o
- obj-$(CONFIG_I2C_ALGO_SGI)	+= i2c-algo-sgi.o
-+obj-$(CONFIG_I2C_ALGO_AU1550)	+= i2c-algo-au1550.o i2c-au1550.o
- 
- # This is needed for automatic patch generation: sensors code starts here
- # This is needed for automatic patch generation: sensors code ends here
-diff -Nur linux-2.4.29/drivers/media/video/indycam.c linux-mips/drivers/media/video/indycam.c
---- linux-2.4.29/drivers/media/video/indycam.c	2004-02-18 14:36:31.000000000 +0100
-+++ linux-mips/drivers/media/video/indycam.c	2004-12-09 21:32:05.000000000 +0100
+diff -Nur linux-2.4.30/drivers/media/video/indycam.c linux-2.4.30-mips/drivers/media/video/indycam.c
+--- linux-2.4.30/drivers/media/video/indycam.c	2004-02-18 14:36:31.000000000 +0100
++++ linux-2.4.30-mips/drivers/media/video/indycam.c	2004-12-09 21:32:05.000000000 +0100
 @@ -50,13 +50,14 @@
  		0x80,			/* INDYCAM_GAMMA */
  	};
@@ -13554,9 +15095,9 @@ diff -Nur linux-2.4.29/drivers/media/video/indycam.c linux-mips/drivers/media/vi
  
  	MOD_INC_USE_COUNT;
  	return 0;
-diff -Nur linux-2.4.29/drivers/media/video/vino.c linux-mips/drivers/media/video/vino.c
---- linux-2.4.29/drivers/media/video/vino.c	2004-02-18 14:36:31.000000000 +0100
-+++ linux-mips/drivers/media/video/vino.c	2004-12-10 05:02:54.000000000 +0100
+diff -Nur linux-2.4.30/drivers/media/video/vino.c linux-2.4.30-mips/drivers/media/video/vino.c
+--- linux-2.4.30/drivers/media/video/vino.c	2004-02-18 14:36:31.000000000 +0100
++++ linux-2.4.30-mips/drivers/media/video/vino.c	2004-12-10 05:02:54.000000000 +0100
 @@ -5,6 +5,8 @@
   * License version 2 as published by the Free Software Foundation.
   *
@@ -13677,9 +15218,9 @@ diff -Nur linux-2.4.29/drivers/media/video/vino.c linux-mips/drivers/media/video
  }
  
  static int vino_grab(struct vino_device *v, int frame)
-diff -Nur linux-2.4.29/drivers/mtd/devices/docprobe.c linux-mips/drivers/mtd/devices/docprobe.c
---- linux-2.4.29/drivers/mtd/devices/docprobe.c	2003-06-13 16:51:34.000000000 +0200
-+++ linux-mips/drivers/mtd/devices/docprobe.c	2003-06-16 01:42:21.000000000 +0200
+diff -Nur linux-2.4.30/drivers/mtd/devices/docprobe.c linux-2.4.30-mips/drivers/mtd/devices/docprobe.c
+--- linux-2.4.30/drivers/mtd/devices/docprobe.c	2003-06-13 16:51:34.000000000 +0200
++++ linux-2.4.30-mips/drivers/mtd/devices/docprobe.c	2003-06-16 01:42:21.000000000 +0200
 @@ -89,10 +89,10 @@
  	0xe4000000,
  #elif defined(CONFIG_MOMENCO_OCELOT)
@@ -13694,9 +15235,9 @@ diff -Nur linux-2.4.29/drivers/mtd/devices/docprobe.c linux-mips/drivers/mtd/dev
  #warning Unknown architecture for DiskOnChip. No default probe locations defined
  #endif
  	0 };
-diff -Nur linux-2.4.29/drivers/mtd/devices/ms02-nv.c linux-mips/drivers/mtd/devices/ms02-nv.c
---- linux-2.4.29/drivers/mtd/devices/ms02-nv.c	2003-06-13 16:51:34.000000000 +0200
-+++ linux-mips/drivers/mtd/devices/ms02-nv.c	2004-07-30 12:22:40.000000000 +0200
+diff -Nur linux-2.4.30/drivers/mtd/devices/ms02-nv.c linux-2.4.30-mips/drivers/mtd/devices/ms02-nv.c
+--- linux-2.4.30/drivers/mtd/devices/ms02-nv.c	2003-06-13 16:51:34.000000000 +0200
++++ linux-2.4.30-mips/drivers/mtd/devices/ms02-nv.c	2004-07-30 12:22:40.000000000 +0200
 @@ -1,10 +1,10 @@
  /*
 - *      Copyright (c) 2001 Maciej W. Rozycki
@@ -13770,9 +15311,9 @@ diff -Nur linux-2.4.29/drivers/mtd/devices/ms02-nv.c linux-mips/drivers/mtd/devi
  		csr = (volatile u32 *)KN03_MCR_BASE;
  		if (*csr & KN03_MCR_BNK32M)
  			stride = 2;
-diff -Nur linux-2.4.29/drivers/mtd/devices/ms02-nv.h linux-mips/drivers/mtd/devices/ms02-nv.h
---- linux-2.4.29/drivers/mtd/devices/ms02-nv.h	2002-11-29 00:53:13.000000000 +0100
-+++ linux-mips/drivers/mtd/devices/ms02-nv.h	2004-07-30 12:22:40.000000000 +0200
+diff -Nur linux-2.4.30/drivers/mtd/devices/ms02-nv.h linux-2.4.30-mips/drivers/mtd/devices/ms02-nv.h
+--- linux-2.4.30/drivers/mtd/devices/ms02-nv.h	2002-11-29 00:53:13.000000000 +0100
++++ linux-2.4.30-mips/drivers/mtd/devices/ms02-nv.h	2004-07-30 12:22:40.000000000 +0200
 @@ -1,32 +1,96 @@
  /*
 - *      Copyright (c) 2001 Maciej W. Rozycki
@@ -13879,9 +15420,9 @@ diff -Nur linux-2.4.29/drivers/mtd/devices/ms02-nv.h linux-mips/drivers/mtd/devi
  typedef volatile u32 ms02nv_uint;
  
  struct ms02nv_private {
-diff -Nur linux-2.4.29/drivers/mtd/maps/Config.in linux-mips/drivers/mtd/maps/Config.in
---- linux-2.4.29/drivers/mtd/maps/Config.in	2003-06-13 16:51:34.000000000 +0200
-+++ linux-mips/drivers/mtd/maps/Config.in	2004-02-26 01:46:35.000000000 +0100
+diff -Nur linux-2.4.30/drivers/mtd/maps/Config.in linux-2.4.30-mips/drivers/mtd/maps/Config.in
+--- linux-2.4.30/drivers/mtd/maps/Config.in	2003-06-13 16:51:34.000000000 +0200
++++ linux-2.4.30-mips/drivers/mtd/maps/Config.in	2004-02-26 01:46:35.000000000 +0100
 @@ -51,11 +51,26 @@
     dep_tristate '  Pb1000 MTD support' CONFIG_MTD_PB1000 $CONFIG_MIPS_PB1000
     dep_tristate '  Pb1500 MTD support' CONFIG_MTD_PB1500 $CONFIG_MIPS_PB1500
@@ -13909,9 +15450,33 @@ diff -Nur linux-2.4.29/drivers/mtd/maps/Config.in linux-mips/drivers/mtd/maps/Co
     dep_tristate '  Flash chip mapping on ITE QED-4N-S01B, Globespan IVR or custom board' CONFIG_MTD_CSTM_MIPS_IXX $CONFIG_MTD_CFI $CONFIG_MTD_JEDEC $CONFIG_MTD_PARTITIONS 
     if [ "$CONFIG_MTD_CSTM_MIPS_IXX" = "y" -o "$CONFIG_MTD_CSTM_MIPS_IXX" = "m" ]; then
        hex '    Physical start address of flash mapping' CONFIG_MTD_CSTM_MIPS_IXX_START 0x8000000
-diff -Nur linux-2.4.29/drivers/mtd/maps/db1x00-flash.c linux-mips/drivers/mtd/maps/db1x00-flash.c
---- linux-2.4.29/drivers/mtd/maps/db1x00-flash.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-mips/drivers/mtd/maps/db1x00-flash.c	2005-02-03 07:35:29.000000000 +0100
+diff -Nur linux-2.4.30/drivers/mtd/maps/Makefile linux-2.4.30-mips/drivers/mtd/maps/Makefile
+--- linux-2.4.30/drivers/mtd/maps/Makefile	2003-06-13 16:51:34.000000000 +0200
++++ linux-2.4.30-mips/drivers/mtd/maps/Makefile	2004-02-26 01:46:35.000000000 +0100
+@@ -52,7 +52,13 @@
+ obj-$(CONFIG_MTD_PB1000)	+= pb1xxx-flash.o
+ obj-$(CONFIG_MTD_PB1100)	+= pb1xxx-flash.o
+ obj-$(CONFIG_MTD_PB1500)	+= pb1xxx-flash.o
++obj-$(CONFIG_MTD_XXS1500)       += xxs1500.o
++obj-$(CONFIG_MTD_MTX1)		+= mtx-1.o
+ obj-$(CONFIG_MTD_LASAT)		+= lasat.o
++obj-$(CONFIG_MTD_DB1X00)        += db1x00-flash.o
++obj-$(CONFIG_MTD_PB1550)        += pb1550-flash.o
++obj-$(CONFIG_MTD_HYDROGEN3)     += hydrogen3-flash.o
++obj-$(CONFIG_MTD_BOSPORUS)	+= pb1xxx-flash.o
+ obj-$(CONFIG_MTD_AUTCPU12)	+= autcpu12-nvram.o
+ obj-$(CONFIG_MTD_EDB7312)	+= edb7312.o
+ obj-$(CONFIG_MTD_IMPA7)		+= impa7.o
+@@ -61,5 +67,6 @@
+ obj-$(CONFIG_MTD_UCLINUX)	+= uclinux.o
+ obj-$(CONFIG_MTD_NETtel)	+= nettel.o
+ obj-$(CONFIG_MTD_SCB2_FLASH)	+= scb2_flash.o
++obj-$(CONFIG_MTD_MIRAGE)        += mirage-flash.o
+ 
+ include $(TOPDIR)/Rules.make
+diff -Nur linux-2.4.30/drivers/mtd/maps/db1x00-flash.c linux-2.4.30-mips/drivers/mtd/maps/db1x00-flash.c
+--- linux-2.4.30/drivers/mtd/maps/db1x00-flash.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.30-mips/drivers/mtd/maps/db1x00-flash.c	2005-02-03 07:35:29.000000000 +0100
 @@ -0,0 +1,283 @@
 +/*
 + * Flash memory access on Alchemy Db1xxx boards
@@ -14196,9 +15761,9 @@ diff -Nur linux-2.4.29/drivers/mtd/maps/db1x00-flash.c linux-mips/drivers/mtd/ma
 +MODULE_AUTHOR("Pete Popov");
 +MODULE_DESCRIPTION("Db1x00 mtd map driver");
 +MODULE_LICENSE("GPL");
-diff -Nur linux-2.4.29/drivers/mtd/maps/hydrogen3-flash.c linux-mips/drivers/mtd/maps/hydrogen3-flash.c
---- linux-2.4.29/drivers/mtd/maps/hydrogen3-flash.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-mips/drivers/mtd/maps/hydrogen3-flash.c	2004-01-10 23:40:18.000000000 +0100
+diff -Nur linux-2.4.30/drivers/mtd/maps/hydrogen3-flash.c linux-2.4.30-mips/drivers/mtd/maps/hydrogen3-flash.c
+--- linux-2.4.30/drivers/mtd/maps/hydrogen3-flash.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.30-mips/drivers/mtd/maps/hydrogen3-flash.c	2004-01-10 23:40:18.000000000 +0100
 @@ -0,0 +1,189 @@
 +/*
 + * Flash memory access on Alchemy HydrogenIII boards
@@ -14389,9 +15954,9 @@ diff -Nur linux-2.4.29/drivers/mtd/maps/hydrogen3-flash.c linux-mips/drivers/mtd
 +MODULE_AUTHOR("Pete Popov");
 +MODULE_DESCRIPTION("HydrogenIII mtd map driver");
 +MODULE_LICENSE("GPL");
-diff -Nur linux-2.4.29/drivers/mtd/maps/lasat.c linux-mips/drivers/mtd/maps/lasat.c
---- linux-2.4.29/drivers/mtd/maps/lasat.c	2003-06-13 16:51:34.000000000 +0200
-+++ linux-mips/drivers/mtd/maps/lasat.c	2003-08-18 04:59:02.000000000 +0200
+diff -Nur linux-2.4.30/drivers/mtd/maps/lasat.c linux-2.4.30-mips/drivers/mtd/maps/lasat.c
+--- linux-2.4.30/drivers/mtd/maps/lasat.c	2003-06-13 16:51:34.000000000 +0200
++++ linux-2.4.30-mips/drivers/mtd/maps/lasat.c	2003-08-18 04:59:02.000000000 +0200
 @@ -1,15 +1,6 @@
  /*
   * Flash device on lasat 100 and 200 boards
@@ -14497,33 +16062,9 @@ diff -Nur linux-2.4.29/drivers/mtd/maps/lasat.c linux-mips/drivers/mtd/maps/lasa
  	}
  }
  
-diff -Nur linux-2.4.29/drivers/mtd/maps/Makefile linux-mips/drivers/mtd/maps/Makefile
---- linux-2.4.29/drivers/mtd/maps/Makefile	2003-06-13 16:51:34.000000000 +0200
-+++ linux-mips/drivers/mtd/maps/Makefile	2004-02-26 01:46:35.000000000 +0100
-@@ -52,7 +52,13 @@
- obj-$(CONFIG_MTD_PB1000)	+= pb1xxx-flash.o
- obj-$(CONFIG_MTD_PB1100)	+= pb1xxx-flash.o
- obj-$(CONFIG_MTD_PB1500)	+= pb1xxx-flash.o
-+obj-$(CONFIG_MTD_XXS1500)       += xxs1500.o
-+obj-$(CONFIG_MTD_MTX1)		+= mtx-1.o
- obj-$(CONFIG_MTD_LASAT)		+= lasat.o
-+obj-$(CONFIG_MTD_DB1X00)        += db1x00-flash.o
-+obj-$(CONFIG_MTD_PB1550)        += pb1550-flash.o
-+obj-$(CONFIG_MTD_HYDROGEN3)     += hydrogen3-flash.o
-+obj-$(CONFIG_MTD_BOSPORUS)	+= pb1xxx-flash.o
- obj-$(CONFIG_MTD_AUTCPU12)	+= autcpu12-nvram.o
- obj-$(CONFIG_MTD_EDB7312)	+= edb7312.o
- obj-$(CONFIG_MTD_IMPA7)		+= impa7.o
-@@ -61,5 +67,6 @@
- obj-$(CONFIG_MTD_UCLINUX)	+= uclinux.o
- obj-$(CONFIG_MTD_NETtel)	+= nettel.o
- obj-$(CONFIG_MTD_SCB2_FLASH)	+= scb2_flash.o
-+obj-$(CONFIG_MTD_MIRAGE)        += mirage-flash.o
- 
- include $(TOPDIR)/Rules.make
-diff -Nur linux-2.4.29/drivers/mtd/maps/mirage-flash.c linux-mips/drivers/mtd/maps/mirage-flash.c
---- linux-2.4.29/drivers/mtd/maps/mirage-flash.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-mips/drivers/mtd/maps/mirage-flash.c	2003-12-22 04:37:22.000000000 +0100
+diff -Nur linux-2.4.30/drivers/mtd/maps/mirage-flash.c linux-2.4.30-mips/drivers/mtd/maps/mirage-flash.c
+--- linux-2.4.30/drivers/mtd/maps/mirage-flash.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.30-mips/drivers/mtd/maps/mirage-flash.c	2003-12-22 04:37:22.000000000 +0100
 @@ -0,0 +1,194 @@
 +/*
 + * Flash memory access on AMD Mirage board.
@@ -14719,9 +16260,9 @@ diff -Nur linux-2.4.29/drivers/mtd/maps/mirage-flash.c linux-mips/drivers/mtd/ma
 +MODULE_AUTHOR("Embedded Edge");
 +MODULE_DESCRIPTION("Mirage mtd map driver");
 +MODULE_LICENSE("GPL");
-diff -Nur linux-2.4.29/drivers/mtd/maps/mtx-1.c linux-mips/drivers/mtd/maps/mtx-1.c
---- linux-2.4.29/drivers/mtd/maps/mtx-1.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-mips/drivers/mtd/maps/mtx-1.c	2003-06-27 02:04:35.000000000 +0200
+diff -Nur linux-2.4.30/drivers/mtd/maps/mtx-1.c linux-2.4.30-mips/drivers/mtd/maps/mtx-1.c
+--- linux-2.4.30/drivers/mtd/maps/mtx-1.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.30-mips/drivers/mtd/maps/mtx-1.c	2003-06-27 02:04:35.000000000 +0200
 @@ -0,0 +1,181 @@
 +/*
 + * Flash memory access on 4G Systems MTX-1 board
@@ -14904,9 +16445,9 @@ diff -Nur linux-2.4.29/drivers/mtd/maps/mtx-1.c linux-mips/drivers/mtd/maps/mtx-
 +MODULE_AUTHOR("Pete Popov");
 +MODULE_DESCRIPTION("MTX-1 CFI map driver");
 +MODULE_LICENSE("GPL");
-diff -Nur linux-2.4.29/drivers/mtd/maps/pb1550-flash.c linux-mips/drivers/mtd/maps/pb1550-flash.c
---- linux-2.4.29/drivers/mtd/maps/pb1550-flash.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-mips/drivers/mtd/maps/pb1550-flash.c	2004-02-26 01:48:48.000000000 +0100
+diff -Nur linux-2.4.30/drivers/mtd/maps/pb1550-flash.c linux-2.4.30-mips/drivers/mtd/maps/pb1550-flash.c
+--- linux-2.4.30/drivers/mtd/maps/pb1550-flash.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.30-mips/drivers/mtd/maps/pb1550-flash.c	2004-02-26 01:48:48.000000000 +0100
 @@ -0,0 +1,270 @@
 +/*
 + * Flash memory access on Alchemy Pb1550 board
@@ -15178,9 +16719,9 @@ diff -Nur linux-2.4.29/drivers/mtd/maps/pb1550-flash.c linux-mips/drivers/mtd/ma
 +MODULE_AUTHOR("Embedded Edge, LLC");
 +MODULE_DESCRIPTION("Pb1550 mtd map driver");
 +MODULE_LICENSE("GPL");
-diff -Nur linux-2.4.29/drivers/mtd/maps/pb1xxx-flash.c linux-mips/drivers/mtd/maps/pb1xxx-flash.c
---- linux-2.4.29/drivers/mtd/maps/pb1xxx-flash.c	2003-06-13 16:51:34.000000000 +0200
-+++ linux-mips/drivers/mtd/maps/pb1xxx-flash.c	2003-05-19 08:27:22.000000000 +0200
+diff -Nur linux-2.4.30/drivers/mtd/maps/pb1xxx-flash.c linux-2.4.30-mips/drivers/mtd/maps/pb1xxx-flash.c
+--- linux-2.4.30/drivers/mtd/maps/pb1xxx-flash.c	2003-06-13 16:51:34.000000000 +0200
++++ linux-2.4.30-mips/drivers/mtd/maps/pb1xxx-flash.c	2003-05-19 08:27:22.000000000 +0200
 @@ -192,6 +192,34 @@
  #else
  #error MTD_PB1500 define combo error /* should never happen */
@@ -15216,9 +16757,9 @@ diff -Nur linux-2.4.29/drivers/mtd/maps/pb1xxx-flash.c linux-mips/drivers/mtd/ma
  #else
  #error Unsupported board
  #endif
-diff -Nur linux-2.4.29/drivers/mtd/maps/xxs1500.c linux-mips/drivers/mtd/maps/xxs1500.c
---- linux-2.4.29/drivers/mtd/maps/xxs1500.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-mips/drivers/mtd/maps/xxs1500.c	2003-08-02 04:06:01.000000000 +0200
+diff -Nur linux-2.4.30/drivers/mtd/maps/xxs1500.c linux-2.4.30-mips/drivers/mtd/maps/xxs1500.c
+--- linux-2.4.30/drivers/mtd/maps/xxs1500.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.30-mips/drivers/mtd/maps/xxs1500.c	2003-08-02 04:06:01.000000000 +0200
 @@ -0,0 +1,186 @@
 +/*
 + * Flash memory access on MyCable XXS1500 board
@@ -15406,9 +16947,9 @@ diff -Nur linux-2.4.29/drivers/mtd/maps/xxs1500.c linux-mips/drivers/mtd/maps/xx
 +MODULE_AUTHOR("Pete Popov");
 +MODULE_DESCRIPTION("XXS1500 CFI map driver");
 +MODULE_LICENSE("GPL");
-diff -Nur linux-2.4.29/drivers/net/defxx.c linux-mips/drivers/net/defxx.c
---- linux-2.4.29/drivers/net/defxx.c	2004-11-17 12:54:21.000000000 +0100
-+++ linux-mips/drivers/net/defxx.c	2004-11-19 01:28:39.000000000 +0100
+diff -Nur linux-2.4.30/drivers/net/defxx.c linux-2.4.30-mips/drivers/net/defxx.c
+--- linux-2.4.30/drivers/net/defxx.c	2004-11-17 12:54:21.000000000 +0100
++++ linux-2.4.30-mips/drivers/net/defxx.c	2004-11-19 01:28:39.000000000 +0100
 @@ -10,24 +10,18 @@
   *
   * Abstract:
@@ -16249,9 +17790,9 @@ diff -Nur linux-2.4.29/drivers/net/defxx.c linux-mips/drivers/net/defxx.c
  MODULE_LICENSE("GPL");
  
  
-diff -Nur linux-2.4.29/drivers/net/defxx.h linux-mips/drivers/net/defxx.h
---- linux-2.4.29/drivers/net/defxx.h	2001-02-13 22:15:05.000000000 +0100
-+++ linux-mips/drivers/net/defxx.h	2004-10-03 20:06:48.000000000 +0200
+diff -Nur linux-2.4.30/drivers/net/defxx.h linux-2.4.30-mips/drivers/net/defxx.h
+--- linux-2.4.30/drivers/net/defxx.h	2001-02-13 22:15:05.000000000 +0100
++++ linux-2.4.30-mips/drivers/net/defxx.h	2004-10-03 20:06:48.000000000 +0200
 @@ -12,17 +12,11 @@
   *   Contains all definitions specified by port specification and required
   *   by the defxx.c driver.
@@ -16340,9 +17881,9 @@ diff -Nur linux-2.4.29/drivers/net/defxx.h linux-mips/drivers/net/defxx.h
  	struct pci_dev *		pci_dev;
  	u32				full_duplex_enb;				/* FDDI Full Duplex enable (1 == on, 2 == off) */
  	u32				req_ttrt;					/* requested TTRT value (in 80ns units) */
-diff -Nur linux-2.4.29/drivers/net/hamradio/hdlcdrv.c linux-mips/drivers/net/hamradio/hdlcdrv.c
---- linux-2.4.29/drivers/net/hamradio/hdlcdrv.c	2002-02-25 20:37:59.000000000 +0100
-+++ linux-mips/drivers/net/hamradio/hdlcdrv.c	2004-05-04 14:04:27.000000000 +0200
+diff -Nur linux-2.4.30/drivers/net/hamradio/hdlcdrv.c linux-2.4.30-mips/drivers/net/hamradio/hdlcdrv.c
+--- linux-2.4.30/drivers/net/hamradio/hdlcdrv.c	2002-02-25 20:37:59.000000000 +0100
++++ linux-2.4.30-mips/drivers/net/hamradio/hdlcdrv.c	2004-05-04 14:04:27.000000000 +0200
 @@ -587,6 +587,8 @@
  		return -EINVAL;
  	s = (struct hdlcdrv_state *)dev->priv;
@@ -16352,9 +17893,9 @@ diff -Nur linux-2.4.29/drivers/net/hamradio/hdlcdrv.c linux-mips/drivers/net/ham
  	if (s->ops && s->ops->close)
  		i = s->ops->close(dev);
  	if (s->skb)
-diff -Nur linux-2.4.29/drivers/net/irda/au1k_ir.c linux-mips/drivers/net/irda/au1k_ir.c
---- linux-2.4.29/drivers/net/irda/au1k_ir.c	2004-02-18 14:36:31.000000000 +0100
-+++ linux-mips/drivers/net/irda/au1k_ir.c	2005-02-03 07:35:29.000000000 +0100
+diff -Nur linux-2.4.30/drivers/net/irda/au1k_ir.c linux-2.4.30-mips/drivers/net/irda/au1k_ir.c
+--- linux-2.4.30/drivers/net/irda/au1k_ir.c	2004-02-18 14:36:31.000000000 +0100
++++ linux-2.4.30-mips/drivers/net/irda/au1k_ir.c	2005-02-03 07:35:29.000000000 +0100
 @@ -81,10 +81,6 @@
  
  #define RUN_AT(x) (jiffies + (x))
@@ -16366,9 +17907,9 @@ diff -Nur linux-2.4.29/drivers/net/irda/au1k_ir.c linux-mips/drivers/net/irda/au
  static spinlock_t ir_lock = SPIN_LOCK_UNLOCKED;
  
  /*
-diff -Nur linux-2.4.29/drivers/pci/pci.c linux-mips/drivers/pci/pci.c
---- linux-2.4.29/drivers/pci/pci.c	2004-11-17 12:54:21.000000000 +0100
-+++ linux-mips/drivers/pci/pci.c	2004-11-19 01:28:41.000000000 +0100
+diff -Nur linux-2.4.30/drivers/pci/pci.c linux-2.4.30-mips/drivers/pci/pci.c
+--- linux-2.4.30/drivers/pci/pci.c	2004-11-17 12:54:21.000000000 +0100
++++ linux-2.4.30-mips/drivers/pci/pci.c	2004-11-19 01:28:41.000000000 +0100
 @@ -1281,11 +1281,17 @@
  {
  	unsigned int buses;
@@ -16395,9 +17936,66 @@ diff -Nur linux-2.4.29/drivers/pci/pci.c linux-mips/drivers/pci/pci.c
  	sprintf(child->name, (is_cardbus ? "PCI CardBus #%02x" : "PCI Bus #%02x"), child->number);
  	return max;
  }
-diff -Nur linux-2.4.29/drivers/pcmcia/au1000_db1x00.c linux-mips/drivers/pcmcia/au1000_db1x00.c
---- linux-2.4.29/drivers/pcmcia/au1000_db1x00.c	2005-01-19 15:09:57.000000000 +0100
-+++ linux-mips/drivers/pcmcia/au1000_db1x00.c	2005-02-03 07:35:30.000000000 +0100
+diff -Nur linux-2.4.30/drivers/pcmcia/Config.in linux-2.4.30-mips/drivers/pcmcia/Config.in
+--- linux-2.4.30/drivers/pcmcia/Config.in	2004-02-18 14:36:31.000000000 +0100
++++ linux-2.4.30-mips/drivers/pcmcia/Config.in	2004-02-22 06:21:34.000000000 +0100
+@@ -30,16 +30,14 @@
+       dep_tristate '  M8xx support' CONFIG_PCMCIA_M8XX $CONFIG_PCMCIA
+    fi
+    if [ "$CONFIG_SOC_AU1X00" = "y" ]; then
+-      dep_tristate '  Au1x00 PCMCIA support' CONFIG_PCMCIA_AU1X00 $CONFIG_PCMCIA 
+-      if [ "$CONFIG_PCMCIA_AU1X00" != "n" ]; then
+-        bool '  Pb1x00 board support' CONFIG_PCMCIA_PB1X00
+-        bool '  Db1x00 board support' CONFIG_PCMCIA_DB1X00
+-        bool '  XXS1500 board support' CONFIG_PCMCIA_XXS1500
+-      fi
++      dep_tristate '  Au1x00 PCMCIA support' CONFIG_PCMCIA_AU1X00 $CONFIG_PCMCIA
+    fi
+    if [ "$CONFIG_SIBYTE_SB1xxx_SOC" = "y" ]; then
+       dep_bool '  SiByte PCMCIA support' CONFIG_PCMCIA_SIBYTE $CONFIG_PCMCIA $CONFIG_BLK_DEV_IDE_SIBYTE
+    fi
++   if [ "$CONFIG_VRC4171" = "y" -o "$CONFIG_VRC4171" = "m" ]; then
++      dep_tristate '  NEC VRC4171 Card Controllers support' CONFIG_PCMCIA_VRC4171 $CONFIG_PCMCIA
++   fi
+    if [ "$CONFIG_VRC4173" = "y" -o "$CONFIG_VRC4173" = "m" ]; then
+       dep_tristate '  NEC VRC4173 CARDU support' CONFIG_PCMCIA_VRC4173 $CONFIG_PCMCIA
+    fi
+diff -Nur linux-2.4.30/drivers/pcmcia/Makefile linux-2.4.30-mips/drivers/pcmcia/Makefile
+--- linux-2.4.30/drivers/pcmcia/Makefile	2004-02-18 14:36:31.000000000 +0100
++++ linux-2.4.30-mips/drivers/pcmcia/Makefile	2005-02-03 07:35:30.000000000 +0100
+@@ -61,9 +61,18 @@
+ 
+ obj-$(CONFIG_PCMCIA_AU1X00)			+= au1x00_ss.o
+ au1000_ss-objs-y				:= au1000_generic.o
+-au1000_ss-objs-$(CONFIG_PCMCIA_PB1X00)		+= au1000_pb1x00.o
+-au1000_ss-objs-$(CONFIG_PCMCIA_DB1X00)		+= au1000_db1x00.o
+-au1000_ss-objs-$(CONFIG_PCMCIA_XXS1500) 	+= au1000_xxs1500.o
++au1000_ss-objs-$(CONFIG_MIPS_PB1000)		+= au1000_pb1x00.o
++au1000_ss-objs-$(CONFIG_MIPS_PB1100)		+= au1000_pb1x00.o
++au1000_ss-objs-$(CONFIG_MIPS_PB1500)		+= au1000_pb1x00.o
++au1000_ss-objs-$(CONFIG_MIPS_PB1550)		+= au1000_pb1550.o
++au1000_ss-objs-$(CONFIG_MIPS_PB1200)		+= au1000_db1x00.o
++au1000_ss-objs-$(CONFIG_MIPS_DB1000)		+= au1000_db1x00.o
++au1000_ss-objs-$(CONFIG_MIPS_DB1100)		+= au1000_db1x00.o
++au1000_ss-objs-$(CONFIG_MIPS_DB1500)		+= au1000_db1x00.o
++au1000_ss-objs-$(CONFIG_MIPS_DB1550)		+= au1000_db1x00.o
++au1000_ss-objs-$(CONFIG_MIPS_DB1200)		+= au1000_db1x00.o
++au1000_ss-objs-$(CONFIG_MIPS_HYDROGEN3)		+= au1000_hydrogen3.o
++au1000_ss-objs-$(CONFIG_MIPS_XXS1500) 		+= au1000_xxs1500.o
+ 
+ obj-$(CONFIG_PCMCIA_SA1100)	+= sa1100_cs.o
+ obj-$(CONFIG_PCMCIA_M8XX)	+= m8xx_pcmcia.o
+@@ -89,6 +98,7 @@
+ sa1100_cs-objs-$(CONFIG_SA1100_XP860)		+= sa1100_xp860.o sa1111_generic.o
+ sa1100_cs-objs-$(CONFIG_SA1100_YOPY)		+= sa1100_yopy.o
+ 
++obj-$(CONFIG_PCMCIA_VRC4171)	+= vrc4171_card.o
+ obj-$(CONFIG_PCMCIA_VRC4173)	+= vrc4173_cardu.o
+ 
+ include $(TOPDIR)/Rules.make
+diff -Nur linux-2.4.30/drivers/pcmcia/au1000_db1x00.c linux-2.4.30-mips/drivers/pcmcia/au1000_db1x00.c
+--- linux-2.4.30/drivers/pcmcia/au1000_db1x00.c	2005-01-19 15:09:57.000000000 +0100
++++ linux-2.4.30-mips/drivers/pcmcia/au1000_db1x00.c	2005-02-03 07:35:30.000000000 +0100
 @@ -1,6 +1,6 @@
  /*
   *
@@ -16470,66 +18068,9 @@ diff -Nur linux-2.4.29/drivers/pcmcia/au1000_db1x00.c linux-mips/drivers/pcmcia/
  	return 0;
  }
  
-diff -Nur linux-2.4.29/drivers/pcmcia/Config.in linux-mips/drivers/pcmcia/Config.in
---- linux-2.4.29/drivers/pcmcia/Config.in	2004-02-18 14:36:31.000000000 +0100
-+++ linux-mips/drivers/pcmcia/Config.in	2004-02-22 06:21:34.000000000 +0100
-@@ -30,16 +30,14 @@
-       dep_tristate '  M8xx support' CONFIG_PCMCIA_M8XX $CONFIG_PCMCIA
-    fi
-    if [ "$CONFIG_SOC_AU1X00" = "y" ]; then
--      dep_tristate '  Au1x00 PCMCIA support' CONFIG_PCMCIA_AU1X00 $CONFIG_PCMCIA 
--      if [ "$CONFIG_PCMCIA_AU1X00" != "n" ]; then
--        bool '  Pb1x00 board support' CONFIG_PCMCIA_PB1X00
--        bool '  Db1x00 board support' CONFIG_PCMCIA_DB1X00
--        bool '  XXS1500 board support' CONFIG_PCMCIA_XXS1500
--      fi
-+      dep_tristate '  Au1x00 PCMCIA support' CONFIG_PCMCIA_AU1X00 $CONFIG_PCMCIA
-    fi
-    if [ "$CONFIG_SIBYTE_SB1xxx_SOC" = "y" ]; then
-       dep_bool '  SiByte PCMCIA support' CONFIG_PCMCIA_SIBYTE $CONFIG_PCMCIA $CONFIG_BLK_DEV_IDE_SIBYTE
-    fi
-+   if [ "$CONFIG_VRC4171" = "y" -o "$CONFIG_VRC4171" = "m" ]; then
-+      dep_tristate '  NEC VRC4171 Card Controllers support' CONFIG_PCMCIA_VRC4171 $CONFIG_PCMCIA
-+   fi
-    if [ "$CONFIG_VRC4173" = "y" -o "$CONFIG_VRC4173" = "m" ]; then
-       dep_tristate '  NEC VRC4173 CARDU support' CONFIG_PCMCIA_VRC4173 $CONFIG_PCMCIA
-    fi
-diff -Nur linux-2.4.29/drivers/pcmcia/Makefile linux-mips/drivers/pcmcia/Makefile
---- linux-2.4.29/drivers/pcmcia/Makefile	2004-02-18 14:36:31.000000000 +0100
-+++ linux-mips/drivers/pcmcia/Makefile	2005-02-03 07:35:30.000000000 +0100
-@@ -61,9 +61,18 @@
- 
- obj-$(CONFIG_PCMCIA_AU1X00)			+= au1x00_ss.o
- au1000_ss-objs-y				:= au1000_generic.o
--au1000_ss-objs-$(CONFIG_PCMCIA_PB1X00)		+= au1000_pb1x00.o
--au1000_ss-objs-$(CONFIG_PCMCIA_DB1X00)		+= au1000_db1x00.o
--au1000_ss-objs-$(CONFIG_PCMCIA_XXS1500) 	+= au1000_xxs1500.o
-+au1000_ss-objs-$(CONFIG_MIPS_PB1000)		+= au1000_pb1x00.o
-+au1000_ss-objs-$(CONFIG_MIPS_PB1100)		+= au1000_pb1x00.o
-+au1000_ss-objs-$(CONFIG_MIPS_PB1500)		+= au1000_pb1x00.o
-+au1000_ss-objs-$(CONFIG_MIPS_PB1550)		+= au1000_pb1550.o
-+au1000_ss-objs-$(CONFIG_MIPS_PB1200)		+= au1000_db1x00.o
-+au1000_ss-objs-$(CONFIG_MIPS_DB1000)		+= au1000_db1x00.o
-+au1000_ss-objs-$(CONFIG_MIPS_DB1100)		+= au1000_db1x00.o
-+au1000_ss-objs-$(CONFIG_MIPS_DB1500)		+= au1000_db1x00.o
-+au1000_ss-objs-$(CONFIG_MIPS_DB1550)		+= au1000_db1x00.o
-+au1000_ss-objs-$(CONFIG_MIPS_DB1200)		+= au1000_db1x00.o
-+au1000_ss-objs-$(CONFIG_MIPS_HYDROGEN3)		+= au1000_hydrogen3.o
-+au1000_ss-objs-$(CONFIG_MIPS_XXS1500) 		+= au1000_xxs1500.o
- 
- obj-$(CONFIG_PCMCIA_SA1100)	+= sa1100_cs.o
- obj-$(CONFIG_PCMCIA_M8XX)	+= m8xx_pcmcia.o
-@@ -89,6 +98,7 @@
- sa1100_cs-objs-$(CONFIG_SA1100_XP860)		+= sa1100_xp860.o sa1111_generic.o
- sa1100_cs-objs-$(CONFIG_SA1100_YOPY)		+= sa1100_yopy.o
- 
-+obj-$(CONFIG_PCMCIA_VRC4171)	+= vrc4171_card.o
- obj-$(CONFIG_PCMCIA_VRC4173)	+= vrc4173_cardu.o
- 
- include $(TOPDIR)/Rules.make
-diff -Nur linux-2.4.29/drivers/pcmcia/vrc4171_card.c linux-mips/drivers/pcmcia/vrc4171_card.c
---- linux-2.4.29/drivers/pcmcia/vrc4171_card.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-mips/drivers/pcmcia/vrc4171_card.c	2004-01-19 16:54:58.000000000 +0100
+diff -Nur linux-2.4.30/drivers/pcmcia/vrc4171_card.c linux-2.4.30-mips/drivers/pcmcia/vrc4171_card.c
+--- linux-2.4.30/drivers/pcmcia/vrc4171_card.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.30-mips/drivers/pcmcia/vrc4171_card.c	2004-01-19 16:54:58.000000000 +0100
 @@ -0,0 +1,886 @@
 +/*
 + * vrc4171_card.c, NEC VRC4171 Card Controller driver for Socket Services.
@@ -17417,9 +18958,9 @@ diff -Nur linux-2.4.29/drivers/pcmcia/vrc4171_card.c linux-mips/drivers/pcmcia/v
 +
 +module_init(vrc4171_card_init);
 +module_exit(vrc4171_card_exit);
-diff -Nur linux-2.4.29/drivers/scsi/NCR53C9x.h linux-mips/drivers/scsi/NCR53C9x.h
---- linux-2.4.29/drivers/scsi/NCR53C9x.h	2004-02-18 14:36:31.000000000 +0100
-+++ linux-mips/drivers/scsi/NCR53C9x.h	2003-12-15 19:19:51.000000000 +0100
+diff -Nur linux-2.4.30/drivers/scsi/NCR53C9x.h linux-2.4.30-mips/drivers/scsi/NCR53C9x.h
+--- linux-2.4.30/drivers/scsi/NCR53C9x.h	2004-02-18 14:36:31.000000000 +0100
++++ linux-2.4.30-mips/drivers/scsi/NCR53C9x.h	2003-12-15 19:19:51.000000000 +0100
 @@ -144,12 +144,7 @@
  
  #ifndef MULTIPLE_PAD_SIZES
@@ -17434,9 +18975,9 @@ diff -Nur linux-2.4.29/drivers/scsi/NCR53C9x.h linux-mips/drivers/scsi/NCR53C9x.
  #define esp_read(__reg) (__reg)
  
  struct ESP_regs {
-diff -Nur linux-2.4.29/drivers/sound/au1550_i2s.c linux-mips/drivers/sound/au1550_i2s.c
---- linux-2.4.29/drivers/sound/au1550_i2s.c	2005-01-19 15:10:04.000000000 +0100
-+++ linux-mips/drivers/sound/au1550_i2s.c	2005-02-08 08:07:50.000000000 +0100
+diff -Nur linux-2.4.30/drivers/sound/au1550_i2s.c linux-2.4.30-mips/drivers/sound/au1550_i2s.c
+--- linux-2.4.30/drivers/sound/au1550_i2s.c	2005-01-19 15:10:04.000000000 +0100
++++ linux-2.4.30-mips/drivers/sound/au1550_i2s.c	2005-02-08 08:07:50.000000000 +0100
 @@ -41,6 +41,7 @@
   *  675 Mass Ave, Cambridge, MA 02139, USA.
   *
@@ -18308,9 +19849,9 @@ diff -Nur linux-2.4.29/drivers/sound/au1550_i2s.c linux-mips/drivers/sound/au155
   err_dev1:
  	au1xxx_dbdma_chan_free(s->dma_adc.dmanr);
   err_dma2:
-diff -Nur linux-2.4.29/drivers/sound/au1550_psc.c linux-mips/drivers/sound/au1550_psc.c
---- linux-2.4.29/drivers/sound/au1550_psc.c	2005-01-19 15:10:04.000000000 +0100
-+++ linux-mips/drivers/sound/au1550_psc.c	2005-01-30 09:01:28.000000000 +0100
+diff -Nur linux-2.4.30/drivers/sound/au1550_psc.c linux-2.4.30-mips/drivers/sound/au1550_psc.c
+--- linux-2.4.30/drivers/sound/au1550_psc.c	2005-01-19 15:10:04.000000000 +0100
++++ linux-2.4.30-mips/drivers/sound/au1550_psc.c	2005-01-30 09:01:28.000000000 +0100
 @@ -30,6 +30,7 @@
   *  675 Mass Ave, Cambridge, MA 02139, USA.
   *
@@ -18469,9 +20010,9 @@ diff -Nur linux-2.4.29/drivers/sound/au1550_psc.c linux-mips/drivers/sound/au155
  	return 0;
  
   err_dev3:
-diff -Nur linux-2.4.29/drivers/tc/lk201.c linux-mips/drivers/tc/lk201.c
---- linux-2.4.29/drivers/tc/lk201.c	2004-02-18 14:36:31.000000000 +0100
-+++ linux-mips/drivers/tc/lk201.c	2004-09-28 02:53:04.000000000 +0200
+diff -Nur linux-2.4.30/drivers/tc/lk201.c linux-2.4.30-mips/drivers/tc/lk201.c
+--- linux-2.4.30/drivers/tc/lk201.c	2004-02-18 14:36:31.000000000 +0100
++++ linux-2.4.30-mips/drivers/tc/lk201.c	2004-09-28 02:53:04.000000000 +0200
 @@ -5,7 +5,7 @@
   * for more details.
   *
@@ -18749,9 +20290,9 @@ diff -Nur linux-2.4.29/drivers/tc/lk201.c linux-mips/drivers/tc/lk201.c
 +	if (!register_dec_serial_hook(keyb_line, &lk201_hook))
 +		unregister_dec_serial_hook(keyb_line);
  }
-diff -Nur linux-2.4.29/drivers/tc/zs.c linux-mips/drivers/tc/zs.c
---- linux-2.4.29/drivers/tc/zs.c	2005-01-19 15:10:05.000000000 +0100
-+++ linux-mips/drivers/tc/zs.c	2004-12-27 05:13:50.000000000 +0100
+diff -Nur linux-2.4.30/drivers/tc/zs.c linux-2.4.30-mips/drivers/tc/zs.c
+--- linux-2.4.30/drivers/tc/zs.c	2005-01-19 15:10:05.000000000 +0100
++++ linux-2.4.30-mips/drivers/tc/zs.c	2004-12-27 05:13:50.000000000 +0100
 @@ -68,6 +68,8 @@
  #include <asm/bitops.h>
  #include <asm/uaccess.h>
@@ -19140,9 +20681,9 @@ diff -Nur linux-2.4.29/drivers/tc/zs.c linux-mips/drivers/tc/zs.c
  }
  
  void __init zs_kgdb_hook(int tty_num)
-diff -Nur linux-2.4.29/drivers/tc/zs.h linux-mips/drivers/tc/zs.h
---- linux-2.4.29/drivers/tc/zs.h	2004-02-18 14:36:31.000000000 +0100
-+++ linux-mips/drivers/tc/zs.h	2004-07-01 15:28:54.000000000 +0200
+diff -Nur linux-2.4.30/drivers/tc/zs.h linux-2.4.30-mips/drivers/tc/zs.h
+--- linux-2.4.30/drivers/tc/zs.h	2004-02-18 14:36:31.000000000 +0100
++++ linux-2.4.30-mips/drivers/tc/zs.h	2004-07-01 15:28:54.000000000 +0200
 @@ -1,14 +1,18 @@
  /*
 - * macserial.h: Definitions for the Macintosh Z8530 serial driver.
@@ -19251,9 +20792,62 @@ diff -Nur linux-2.4.29/drivers/tc/zs.h linux-mips/drivers/tc/zs.h
  	unsigned char 		*xmit_buf;
  	int			xmit_head;
  	int			xmit_tail;
-diff -Nur linux-2.4.29/drivers/video/au1200fb.c linux-mips/drivers/video/au1200fb.c
---- linux-2.4.29/drivers/video/au1200fb.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-mips/drivers/video/au1200fb.c	2005-03-13 09:04:16.000000000 +0100
+diff -Nur linux-2.4.30/drivers/video/Config.in linux-2.4.30-mips/drivers/video/Config.in
+--- linux-2.4.30/drivers/video/Config.in	2004-02-18 14:36:31.000000000 +0100
++++ linux-2.4.30-mips/drivers/video/Config.in	2005-02-11 22:16:44.000000000 +0100
+@@ -87,8 +87,8 @@
+    if [ "$CONFIG_HP300" = "y" ]; then
+       define_bool CONFIG_FB_HP300 y
+    fi
+-   if [ "$ARCH" = "alpha" ]; then
+-      tristate '  TGA framebuffer support' CONFIG_FB_TGA
++   if [ "$ARCH" = "alpha" -o "$CONFIG_TC" = "y" ]; then
++      tristate '  TGA/SFB+ framebuffer support' CONFIG_FB_TGA
+    fi
+    if [ "$CONFIG_X86" = "y" ]; then
+       bool '  VESA VGA graphics console' CONFIG_FB_VESA
+@@ -121,6 +121,17 @@
+          hex '    Framebuffer Base Address' CONFIG_E1355_FB_BASE a8200000
+       fi
+    fi
++   if [ "$CONFIG_SOC_AU1100" = "y" ]; then
++      bool '  Au1100 LCD Driver' CONFIG_FB_AU1100
++   fi
++   
++   if [ "$CONFIG_SOC_AU1200" = "y" ]; then
++      bool '  Au1200 LCD Driver' CONFIG_FB_AU1200
++      if [ "$CONFIG_FB_AU1200" = "y" ]; then
++      int  '    Number of planes (1 to 4)' CONFIG_FB_AU1200_DEVS 1
++      fi
++   fi
++   
+    if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
+       if [ "$CONFIG_PCI" != "n" ]; then
+ 	 tristate '  Matrox acceleration (EXPERIMENTAL)' CONFIG_FB_MATROX
+@@ -178,9 +189,6 @@
+ 	     bool '    Use CRT on Pb1100 ' CONFIG_PB1500_CRT
+ 	     bool '    Use TFT Panel on Pb1100 ' CONFIG_PB1500_TFT
+            fi
+-           if [ "$CONFIG_SOC_AU1100" = "y" ]; then
+-	     bool '    Au1100 LCD Driver' CONFIG_FB_AU1100
+-           fi
+ 	 fi
+       fi
+    fi
+diff -Nur linux-2.4.30/drivers/video/Makefile linux-2.4.30-mips/drivers/video/Makefile
+--- linux-2.4.30/drivers/video/Makefile	2004-02-18 14:36:31.000000000 +0100
++++ linux-2.4.30-mips/drivers/video/Makefile	2005-02-11 22:16:44.000000000 +0100
+@@ -87,6 +87,7 @@
+ obj-$(CONFIG_FB_MAXINE)           += maxinefb.o
+ obj-$(CONFIG_FB_TX3912)           += tx3912fb.o
+ obj-$(CONFIG_FB_AU1100)		  += au1100fb.o fbgen.o
++obj-$(CONFIG_FB_AU1200)		  += au1200fb.o fbgen.o
+ obj-$(CONFIG_FB_IT8181)		  += it8181fb.o fbgen.o
+ 
+ subdir-$(CONFIG_STI_CONSOLE)      += sti
+diff -Nur linux-2.4.30/drivers/video/au1200fb.c linux-2.4.30-mips/drivers/video/au1200fb.c
+--- linux-2.4.30/drivers/video/au1200fb.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.30-mips/drivers/video/au1200fb.c	2005-03-13 09:04:16.000000000 +0100
 @@ -0,0 +1,1564 @@
 +/*
 + * BRIEF MODULE DESCRIPTION
@@ -20819,9 +22413,9 @@ diff -Nur linux-2.4.29/drivers/video/au1200fb.c linux-mips/drivers/video/au1200f
 +#endif /* MODULE */
 +
 +
-diff -Nur linux-2.4.29/drivers/video/au1200fb.h linux-mips/drivers/video/au1200fb.h
---- linux-2.4.29/drivers/video/au1200fb.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-mips/drivers/video/au1200fb.h	2005-02-11 22:16:44.000000000 +0100
+diff -Nur linux-2.4.30/drivers/video/au1200fb.h linux-2.4.30-mips/drivers/video/au1200fb.h
+--- linux-2.4.30/drivers/video/au1200fb.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.30-mips/drivers/video/au1200fb.h	2005-02-11 22:16:44.000000000 +0100
 @@ -0,0 +1,288 @@
 +/*
 + * BRIEF MODULE DESCRIPTION
@@ -21111,51 +22705,9 @@ diff -Nur linux-2.4.29/drivers/video/au1200fb.h linux-mips/drivers/video/au1200f
 +
 +/********************************************************************/
 +#endif /* _AU1200LCD_H */
-diff -Nur linux-2.4.29/drivers/video/Config.in linux-mips/drivers/video/Config.in
---- linux-2.4.29/drivers/video/Config.in	2004-02-18 14:36:31.000000000 +0100
-+++ linux-mips/drivers/video/Config.in	2005-02-11 22:16:44.000000000 +0100
-@@ -87,8 +87,8 @@
-    if [ "$CONFIG_HP300" = "y" ]; then
-       define_bool CONFIG_FB_HP300 y
-    fi
--   if [ "$ARCH" = "alpha" ]; then
--      tristate '  TGA framebuffer support' CONFIG_FB_TGA
-+   if [ "$ARCH" = "alpha" -o "$CONFIG_TC" = "y" ]; then
-+      tristate '  TGA/SFB+ framebuffer support' CONFIG_FB_TGA
-    fi
-    if [ "$CONFIG_X86" = "y" ]; then
-       bool '  VESA VGA graphics console' CONFIG_FB_VESA
-@@ -121,6 +121,17 @@
-          hex '    Framebuffer Base Address' CONFIG_E1355_FB_BASE a8200000
-       fi
-    fi
-+   if [ "$CONFIG_SOC_AU1100" = "y" ]; then
-+      bool '  Au1100 LCD Driver' CONFIG_FB_AU1100
-+   fi
-+   
-+   if [ "$CONFIG_SOC_AU1200" = "y" ]; then
-+      bool '  Au1200 LCD Driver' CONFIG_FB_AU1200
-+      if [ "$CONFIG_FB_AU1200" = "y" ]; then
-+      int  '    Number of planes (1 to 4)' CONFIG_FB_AU1200_DEVS 1
-+      fi
-+   fi
-+   
-    if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-       if [ "$CONFIG_PCI" != "n" ]; then
- 	 tristate '  Matrox acceleration (EXPERIMENTAL)' CONFIG_FB_MATROX
-@@ -178,9 +189,6 @@
- 	     bool '    Use CRT on Pb1100 ' CONFIG_PB1500_CRT
- 	     bool '    Use TFT Panel on Pb1100 ' CONFIG_PB1500_TFT
-            fi
--           if [ "$CONFIG_SOC_AU1100" = "y" ]; then
--	     bool '    Au1100 LCD Driver' CONFIG_FB_AU1100
--           fi
- 	 fi
-       fi
-    fi
-diff -Nur linux-2.4.29/drivers/video/fbmem.c linux-mips/drivers/video/fbmem.c
---- linux-2.4.29/drivers/video/fbmem.c	2005-01-19 15:10:09.000000000 +0100
-+++ linux-mips/drivers/video/fbmem.c	2005-02-11 22:16:44.000000000 +0100
+diff -Nur linux-2.4.30/drivers/video/fbmem.c linux-2.4.30-mips/drivers/video/fbmem.c
+--- linux-2.4.30/drivers/video/fbmem.c	2005-01-19 15:10:09.000000000 +0100
++++ linux-2.4.30-mips/drivers/video/fbmem.c	2005-02-11 22:16:44.000000000 +0100
 @@ -139,6 +139,8 @@
  extern int e1356fb_setup(char*);
  extern int au1100fb_init(void);
@@ -21175,9 +22727,9 @@ diff -Nur linux-2.4.29/drivers/video/fbmem.c linux-mips/drivers/video/fbmem.c
  #ifdef CONFIG_FB_IT8181
  	{ "it8181fb", it8181fb_init, it8181fb_setup },
  #endif
-diff -Nur linux-2.4.29/drivers/video/ims332.h linux-mips/drivers/video/ims332.h
---- linux-2.4.29/drivers/video/ims332.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-mips/drivers/video/ims332.h	2003-12-22 17:02:20.000000000 +0100
+diff -Nur linux-2.4.30/drivers/video/ims332.h linux-2.4.30-mips/drivers/video/ims332.h
+--- linux-2.4.30/drivers/video/ims332.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.30-mips/drivers/video/ims332.h	2003-12-22 17:02:20.000000000 +0100
 @@ -0,0 +1,275 @@
 +/*
 + *	linux/drivers/video/ims332.h
@@ -21454,20 +23006,9 @@ diff -Nur linux-2.4.29/drivers/video/ims332.h linux-mips/drivers/video/ims332.h
 +				IMS332_CTRL_A_BOOT_ENABLE_VTG);
 +	printk("\n");
 +}
-diff -Nur linux-2.4.29/drivers/video/Makefile linux-mips/drivers/video/Makefile
---- linux-2.4.29/drivers/video/Makefile	2004-02-18 14:36:31.000000000 +0100
-+++ linux-mips/drivers/video/Makefile	2005-02-11 22:16:44.000000000 +0100
-@@ -87,6 +87,7 @@
- obj-$(CONFIG_FB_MAXINE)           += maxinefb.o
- obj-$(CONFIG_FB_TX3912)           += tx3912fb.o
- obj-$(CONFIG_FB_AU1100)		  += au1100fb.o fbgen.o
-+obj-$(CONFIG_FB_AU1200)		  += au1200fb.o fbgen.o
- obj-$(CONFIG_FB_IT8181)		  += it8181fb.o fbgen.o
- 
- subdir-$(CONFIG_STI_CONSOLE)      += sti
-diff -Nur linux-2.4.29/drivers/video/maxinefb.h linux-mips/drivers/video/maxinefb.h
---- linux-2.4.29/drivers/video/maxinefb.h	2003-08-25 13:44:42.000000000 +0200
-+++ linux-mips/drivers/video/maxinefb.h	1970-01-01 01:00:00.000000000 +0100
+diff -Nur linux-2.4.30/drivers/video/maxinefb.h linux-2.4.30-mips/drivers/video/maxinefb.h
+--- linux-2.4.30/drivers/video/maxinefb.h	2003-08-25 13:44:42.000000000 +0200
++++ linux-2.4.30-mips/drivers/video/maxinefb.h	1970-01-01 01:00:00.000000000 +0100
 @@ -1,38 +0,0 @@
 -/*
 - *      linux/drivers/video/maxinefb.h
@@ -21507,9 +23048,9 @@ diff -Nur linux-2.4.29/drivers/video/maxinefb.h linux-mips/drivers/video/maxinef
 -#define IMS332_REG_COLOR_PALETTE        0x100	/* color palette, 256 entries */
 -#define IMS332_REG_CURSOR_COLOR_PALETTE	0x0a1	/* cursor color palette, */
 -						/* 3 entries             */
-diff -Nur linux-2.4.29/drivers/video/newport_con.c linux-mips/drivers/video/newport_con.c
---- linux-2.4.29/drivers/video/newport_con.c	2003-08-25 13:44:42.000000000 +0200
-+++ linux-mips/drivers/video/newport_con.c	2004-09-23 15:32:29.000000000 +0200
+diff -Nur linux-2.4.30/drivers/video/newport_con.c linux-2.4.30-mips/drivers/video/newport_con.c
+--- linux-2.4.30/drivers/video/newport_con.c	2003-08-25 13:44:42.000000000 +0200
++++ linux-2.4.30-mips/drivers/video/newport_con.c	2004-09-23 15:32:29.000000000 +0200
 @@ -22,6 +22,7 @@
  #include <linux/module.h>
  #include <linux/slab.h>
@@ -21743,9 +23284,9 @@ diff -Nur linux-2.4.29/drivers/video/newport_con.c linux-mips/drivers/video/newp
  }
  
  module_init(newport_console_init);
-diff -Nur linux-2.4.29/drivers/video/tgafb.c linux-mips/drivers/video/tgafb.c
---- linux-2.4.29/drivers/video/tgafb.c	2001-11-14 23:52:20.000000000 +0100
-+++ linux-mips/drivers/video/tgafb.c	2004-10-30 01:15:02.000000000 +0200
+diff -Nur linux-2.4.30/drivers/video/tgafb.c linux-2.4.30-mips/drivers/video/tgafb.c
+--- linux-2.4.30/drivers/video/tgafb.c	2001-11-14 23:52:20.000000000 +0100
++++ linux-2.4.30-mips/drivers/video/tgafb.c	2004-10-30 01:15:02.000000000 +0200
 @@ -45,6 +45,15 @@
  #include <linux/console.h>
  #include <asm/io.h>
@@ -21922,9 +23463,9 @@ diff -Nur linux-2.4.29/drivers/video/tgafb.c linux-mips/drivers/video/tgafb.c
      return 0;
  }
  
-diff -Nur linux-2.4.29/drivers/video/tgafb.h linux-mips/drivers/video/tgafb.h
---- linux-2.4.29/drivers/video/tgafb.h	2000-04-12 18:47:28.000000000 +0200
-+++ linux-mips/drivers/video/tgafb.h	2004-10-30 01:15:02.000000000 +0200
+diff -Nur linux-2.4.30/drivers/video/tgafb.h linux-2.4.30-mips/drivers/video/tgafb.h
+--- linux-2.4.30/drivers/video/tgafb.h	2000-04-12 18:47:28.000000000 +0200
++++ linux-2.4.30-mips/drivers/video/tgafb.h	2004-10-30 01:15:02.000000000 +0200
 @@ -36,6 +36,7 @@
  #define	TGA_RASTEROP_REG		0x0034
  #define	TGA_PIXELSHIFT_REG		0x0038
@@ -21933,9 +23474,9 @@ diff -Nur linux-2.4.29/drivers/video/tgafb.h linux-mips/drivers/video/tgafb.h
  #define	TGA_PIXELMASK_REG		0x005c
  #define	TGA_CURSOR_BASE_REG		0x0060
  #define	TGA_HORIZ_REG			0x0064
-diff -Nur linux-2.4.29/fs/binfmt_elf.c linux-mips/fs/binfmt_elf.c
---- linux-2.4.29/fs/binfmt_elf.c	2005-01-19 15:10:10.000000000 +0100
-+++ linux-mips/fs/binfmt_elf.c	2005-01-13 11:59:03.000000000 +0100
+diff -Nur linux-2.4.30/fs/binfmt_elf.c linux-2.4.30-mips/fs/binfmt_elf.c
+--- linux-2.4.30/fs/binfmt_elf.c	2005-04-04 03:42:20.000000000 +0200
++++ linux-2.4.30-mips/fs/binfmt_elf.c	2005-04-05 21:09:57.000000000 +0200
 @@ -660,6 +660,9 @@
  		    bprm->argc++;
  		  }
@@ -21946,7 +23487,7 @@ diff -Nur linux-2.4.29/fs/binfmt_elf.c linux-mips/fs/binfmt_elf.c
  	}
  
  	/* Flush all traces of the currently running executable */
-@@ -1208,7 +1211,11 @@
+@@ -1211,7 +1214,11 @@
  	elf.e_entry = 0;
  	elf.e_phoff = sizeof(elf);
  	elf.e_shoff = 0;
@@ -21958,9 +23499,9 @@ diff -Nur linux-2.4.29/fs/binfmt_elf.c linux-mips/fs/binfmt_elf.c
  	elf.e_ehsize = sizeof(elf);
  	elf.e_phentsize = sizeof(struct elf_phdr);
  	elf.e_phnum = segs+1;		/* Include notes */
-diff -Nur linux-2.4.29/fs/partitions/sgi.c linux-mips/fs/partitions/sgi.c
---- linux-2.4.29/fs/partitions/sgi.c	2001-10-02 05:03:26.000000000 +0200
-+++ linux-mips/fs/partitions/sgi.c	2004-08-11 22:30:07.000000000 +0200
+diff -Nur linux-2.4.30/fs/partitions/sgi.c linux-2.4.30-mips/fs/partitions/sgi.c
+--- linux-2.4.30/fs/partitions/sgi.c	2001-10-02 05:03:26.000000000 +0200
++++ linux-2.4.30-mips/fs/partitions/sgi.c	2004-08-11 22:30:07.000000000 +0200
 @@ -17,6 +17,11 @@
  #include "check.h"
  #include "sgi.h"
@@ -21984,9 +23525,9 @@ diff -Nur linux-2.4.29/fs/partitions/sgi.c linux-mips/fs/partitions/sgi.c
  		current_minor++;
  	}
  	printk("\n");
-diff -Nur linux-2.4.29/fs/proc/array.c linux-mips/fs/proc/array.c
---- linux-2.4.29/fs/proc/array.c	2005-01-19 15:10:11.000000000 +0100
-+++ linux-mips/fs/proc/array.c	2004-11-29 18:47:18.000000000 +0100
+diff -Nur linux-2.4.30/fs/proc/array.c linux-2.4.30-mips/fs/proc/array.c
+--- linux-2.4.30/fs/proc/array.c	2005-01-19 15:10:11.000000000 +0100
++++ linux-2.4.30-mips/fs/proc/array.c	2004-11-29 18:47:18.000000000 +0100
 @@ -368,15 +368,15 @@
  		task->cmin_flt,
  		task->maj_flt,
@@ -22027,9 +23568,9 @@ diff -Nur linux-2.4.29/fs/proc/array.c linux-mips/fs/proc/array.c
  
  	return len;
  }
-diff -Nur linux-2.4.29/fs/proc/proc_misc.c linux-mips/fs/proc/proc_misc.c
---- linux-2.4.29/fs/proc/proc_misc.c	2004-08-08 01:26:06.000000000 +0200
-+++ linux-mips/fs/proc/proc_misc.c	2004-08-14 20:39:01.000000000 +0200
+diff -Nur linux-2.4.30/fs/proc/proc_misc.c linux-2.4.30-mips/fs/proc/proc_misc.c
+--- linux-2.4.30/fs/proc/proc_misc.c	2004-08-08 01:26:06.000000000 +0200
++++ linux-2.4.30-mips/fs/proc/proc_misc.c	2004-08-14 20:39:01.000000000 +0200
 @@ -308,16 +308,16 @@
  {
  	int i, len = 0;
@@ -22066,9 +23607,9 @@ diff -Nur linux-2.4.29/fs/proc/proc_misc.c linux-mips/fs/proc/proc_misc.c
  				   + kstat.per_cpu_nice[cpu_logical_map(i)] \
  				   + kstat.per_cpu_system[cpu_logical_map(i)]));
  	proc_sprintf(page, &off, &len,
-diff -Nur linux-2.4.29/include/asm-alpha/param.h linux-mips/include/asm-alpha/param.h
---- linux-2.4.29/include/asm-alpha/param.h	2000-11-08 08:37:31.000000000 +0100
-+++ linux-mips/include/asm-alpha/param.h	2000-11-28 04:59:03.000000000 +0100
+diff -Nur linux-2.4.30/include/asm-alpha/param.h linux-2.4.30-mips/include/asm-alpha/param.h
+--- linux-2.4.30/include/asm-alpha/param.h	2000-11-08 08:37:31.000000000 +0100
++++ linux-2.4.30-mips/include/asm-alpha/param.h	2000-11-28 04:59:03.000000000 +0100
 @@ -13,6 +13,9 @@
  # else
  #  define HZ	1200
@@ -22079,9 +23620,9 @@ diff -Nur linux-2.4.29/include/asm-alpha/param.h linux-mips/include/asm-alpha/pa
  #endif
  
  #define EXEC_PAGESIZE	8192
-diff -Nur linux-2.4.29/include/asm-i386/param.h linux-mips/include/asm-i386/param.h
---- linux-2.4.29/include/asm-i386/param.h	2000-10-27 20:04:43.000000000 +0200
-+++ linux-mips/include/asm-i386/param.h	2000-11-23 03:00:55.000000000 +0100
+diff -Nur linux-2.4.30/include/asm-i386/param.h linux-2.4.30-mips/include/asm-i386/param.h
+--- linux-2.4.30/include/asm-i386/param.h	2000-10-27 20:04:43.000000000 +0200
++++ linux-2.4.30-mips/include/asm-i386/param.h	2000-11-23 03:00:55.000000000 +0100
 @@ -3,6 +3,9 @@
  
  #ifndef HZ
@@ -22092,9 +23633,9 @@ diff -Nur linux-2.4.29/include/asm-i386/param.h linux-mips/include/asm-i386/para
  #endif
  
  #define EXEC_PAGESIZE	4096
-diff -Nur linux-2.4.29/include/asm-ia64/param.h linux-mips/include/asm-ia64/param.h
---- linux-2.4.29/include/asm-ia64/param.h	2004-04-14 15:05:40.000000000 +0200
-+++ linux-mips/include/asm-ia64/param.h	2004-04-16 05:14:20.000000000 +0200
+diff -Nur linux-2.4.30/include/asm-ia64/param.h linux-2.4.30-mips/include/asm-ia64/param.h
+--- linux-2.4.30/include/asm-ia64/param.h	2004-04-14 15:05:40.000000000 +0200
++++ linux-2.4.30-mips/include/asm-ia64/param.h	2004-04-16 05:14:20.000000000 +0200
 @@ -7,9 +7,15 @@
   * Based on <asm-i386/param.h>.
   *
@@ -22112,9 +23653,9 @@ diff -Nur linux-2.4.29/include/asm-ia64/param.h linux-mips/include/asm-ia64/para
  #define EXEC_PAGESIZE	65536
  
  #ifndef NGROUPS
-diff -Nur linux-2.4.29/include/asm-m68k/param.h linux-mips/include/asm-m68k/param.h
---- linux-2.4.29/include/asm-m68k/param.h	2001-01-04 22:00:55.000000000 +0100
-+++ linux-mips/include/asm-m68k/param.h	2001-01-11 05:02:45.000000000 +0100
+diff -Nur linux-2.4.30/include/asm-m68k/param.h linux-2.4.30-mips/include/asm-m68k/param.h
+--- linux-2.4.30/include/asm-m68k/param.h	2001-01-04 22:00:55.000000000 +0100
++++ linux-2.4.30-mips/include/asm-m68k/param.h	2001-01-11 05:02:45.000000000 +0100
 @@ -3,6 +3,9 @@
  
  #ifndef HZ
@@ -22125,127 +23666,9 @@ diff -Nur linux-2.4.29/include/asm-m68k/param.h linux-mips/include/asm-m68k/para
  #endif
  
  #define EXEC_PAGESIZE	8192
-diff -Nur linux-2.4.29/include/asm-mips/au1000_gpio.h linux-mips/include/asm-mips/au1000_gpio.h
---- linux-2.4.29/include/asm-mips/au1000_gpio.h	2002-11-29 00:53:15.000000000 +0100
-+++ linux-mips/include/asm-mips/au1000_gpio.h	2005-01-30 09:01:28.000000000 +0100
-@@ -30,6 +30,13 @@
-  *  675 Mass Ave, Cambridge, MA 02139, USA.
-  */
- 
-+/*
-+ *  Revision history
-+ *    01/31/02  0.01   Initial release. Steve Longerbeam, MontaVista
-+ *    10/12/03  0.1    Added Au1100/Au1500, GPIO2, and bit operations. K.C. Nishio, AMD
-+ *    08/05/04  0.11   Added Au1550 and Au1200. K.C. Nishio
-+ */
-+
- #ifndef __AU1000_GPIO_H
- #define __AU1000_GPIO_H
- 
-@@ -44,13 +51,94 @@
- #define AU1000GPIO_TRISTATE	_IOW (AU1000GPIO_IOC_MAGIC, 4, int)
- #define AU1000GPIO_AVAIL_MASK	_IOR (AU1000GPIO_IOC_MAGIC, 5, int)
- 
-+// bit operations
-+#define AU1000GPIO_BIT_READ	_IOW (AU1000GPIO_IOC_MAGIC, 6, int)
-+#define AU1000GPIO_BIT_SET	_IOW (AU1000GPIO_IOC_MAGIC, 7, int)
-+#define AU1000GPIO_BIT_CLEAR	_IOW (AU1000GPIO_IOC_MAGIC, 8, int)
-+#define AU1000GPIO_BIT_TRISTATE	_IOW (AU1000GPIO_IOC_MAGIC, 9, int)
-+#define AU1000GPIO_BIT_INIT	_IOW (AU1000GPIO_IOC_MAGIC, 10, int)
-+#define AU1000GPIO_BIT_TERM	_IOW (AU1000GPIO_IOC_MAGIC, 11, int)
-+
-+/* set this major numer same as the CRIS GPIO driver */
-+#define AU1X00_GPIO_MAJOR	(120)
-+
-+#define ENABLED_ZERO		(0)
-+#define ENABLED_ONE		(1)
-+#define ENABLED_10		(0x2)
-+#define ENABLED_11		(0x3)
-+#define ENABLED_111		(0x7)
-+#define NOT_AVAIL		(-1)
-+#define AU1X00_MAX_PRIMARY_GPIO	(32) 
-+
-+#define AU1000_GPIO_MINOR_MAX	AU1X00_MAX_PRIMARY_GPIO
-+/* Au1100, 1500, 1550 and 1200 have the secondary GPIO block */
-+#define AU1XX0_GPIO_MINOR_MAX	(48)
-+
-+#define AU1X00_GPIO_NAME	"gpio"
-+
-+/* GPIO pins which are not multiplexed */
-+#if defined(CONFIG_SOC_AU1000)
-+  #define NATIVE_GPIOPIN	((1 << 15) | (1 << 8) | (1 << 7) | (1 << 1) | (1 << 0))
-+  #define NATIVE_GPIO2PIN	(0)
-+#elif defined(CONFIG_SOC_AU1100)
-+  #define NATIVE_GPIOPIN	((1 << 23) | (1 << 22) | (1 << 21) | (1 << 20) | (1 << 19) | (1 << 18) | \
-+				 (1 << 17) | (1 << 16) | (1 << 7) | (1 << 1) | (1 << 0))
-+  #define NATIVE_GPIO2PIN	(0)
-+#elif defined(CONFIG_SOC_AU1500)
-+  #define NATIVE_GPIOPIN	((1 << 15) | (1 << 8) | (1 << 7) | (1 << 1) | (1 << 0))
-+  /* exclude the PCI reset output signal: GPIO[200], DMA_REQ2 and DMA_REQ3 */
-+  #define NATIVE_GPIO2PIN	(0xfffe & ~((1 << 9) | (1 << 8))) 
-+#elif defined(CONFIG_SOC_AU1550)
-+  #define NATIVE_GPIOPIN	((1 << 15) | (1 << 8) | (1 << 7) | (1 << 6) | (1 << 1) | (1 << 0))
-+  /* please refere Au1550 Data Book, chapter 15 */
-+  #define NATIVE_GPIO2PIN	(1 << 5) 
-+#elif defined(CONFIG_SOC_AU1200)
-+  #define NATIVE_GPIOPIN	((1 << 7) | (1 << 5))
-+  #define NATIVE_GPIO2PIN	(0) 
-+#endif
-+
-+/* minor as u32 */
-+#define MINOR_TO_GPIOPIN(minor)		((minor < AU1X00_MAX_PRIMARY_GPIO) ? minor : (minor - AU1X00_MAX_PRIMARY_GPIO))
-+#define IS_PRIMARY_GPIOPIN(minor)	((minor < AU1X00_MAX_PRIMARY_GPIO) ? 1 : 0)
-+
-+/*
-+ * pin to minor mapping.
-+ * GPIO0-GPIO31, minor=0-31.
-+ * GPIO200-GPIO215, minor=32-47.
-+ */
-+typedef struct _au1x00_gpio_bit_ctl {
-+	int direction;	// The direction of this GPIO pin. 0: IN, 1: OUT.
-+	int data;	// Pin output when itized (0/1), or at the term. 0/1/-1 (tristate).
-+} au1x00_gpio_bit_ctl;
-+
-+typedef struct _au1x00_gpio_driver {
-+	const char	*driver_name;
-+	const char	*name;
-+	int		name_base;	/* offset of printed name */
-+	short		major;		/* major device number */
-+	short		minor_start;	/* start of minor device number*/
-+	short		num;		/* number of devices */
-+} au1x00_gpio_driver;
-+
- #ifdef __KERNEL__
--extern u32 get_au1000_avail_gpio_mask(void);
--extern int au1000gpio_tristate(u32 data);
--extern int au1000gpio_in(u32 *data);
--extern int au1000gpio_set(u32 data);
--extern int au1000gpio_clear(u32 data);
--extern int au1000gpio_out(u32 data);
-+extern u32 get_au1000_avail_gpio_mask(u32 *avail_gpio2);
-+extern int au1000gpio_tristate(u32 minor, u32 data);
-+extern int au1000gpio_in(u32 minor, u32 *data);
-+extern int au1000gpio_set(u32 minor, u32 data);
-+extern int au1000gpio_clear(u32 minor, u32 data);
-+extern int au1000gpio_out(u32 minor, u32 data);
-+extern int au1000gpio_bit_read(u32 minor, u32 *read_data);
-+extern int au1000gpio_bit_set(u32 minor);
-+extern int au1000gpio_bit_clear(u32 minor);
-+extern int au1000gpio_bit_tristate(u32 minor);
-+extern int check_minor_to_gpio(u32 minor);
-+extern int au1000gpio_bit_init(u32 minor, au1x00_gpio_bit_ctl *bit_opt);
-+extern int au1000gpio_bit_term(u32 minor, au1x00_gpio_bit_ctl *bit_opt);
-+
-+extern void gpio_register_devfs (au1x00_gpio_driver *driver, unsigned int flags, unsigned minor);
-+extern void gpio_unregister_devfs (au1x00_gpio_driver *driver, unsigned minor);
-+extern int gpio_register_driver(au1x00_gpio_driver *driver);
-+extern int gpio_unregister_driver(au1x00_gpio_driver *driver);
- #endif
- 
- #endif
-diff -Nur linux-2.4.29/include/asm-mips/au1000.h linux-mips/include/asm-mips/au1000.h
---- linux-2.4.29/include/asm-mips/au1000.h	2005-01-19 15:10:11.000000000 +0100
-+++ linux-mips/include/asm-mips/au1000.h	2005-01-30 09:01:28.000000000 +0100
+diff -Nur linux-2.4.30/include/asm-mips/au1000.h linux-2.4.30-mips/include/asm-mips/au1000.h
+--- linux-2.4.30/include/asm-mips/au1000.h	2005-01-19 15:10:11.000000000 +0100
++++ linux-2.4.30-mips/include/asm-mips/au1000.h	2005-01-30 09:01:28.000000000 +0100
 @@ -160,28 +160,356 @@
  #define ALLINTS (IE_IRQ0 | IE_IRQ1 | IE_IRQ2 | IE_IRQ3 | IE_IRQ4 | IE_IRQ5)
  #endif
@@ -22913,9 +24336,127 @@ diff -Nur linux-2.4.29/include/asm-mips/au1000.h linux-mips/include/asm-mips/au1
 +
 +#endif
 +
-diff -Nur linux-2.4.29/include/asm-mips/au1000_pcmcia.h linux-mips/include/asm-mips/au1000_pcmcia.h
---- linux-2.4.29/include/asm-mips/au1000_pcmcia.h	2005-01-19 15:10:11.000000000 +0100
-+++ linux-mips/include/asm-mips/au1000_pcmcia.h	2005-01-30 09:01:28.000000000 +0100
+diff -Nur linux-2.4.30/include/asm-mips/au1000_gpio.h linux-2.4.30-mips/include/asm-mips/au1000_gpio.h
+--- linux-2.4.30/include/asm-mips/au1000_gpio.h	2002-11-29 00:53:15.000000000 +0100
++++ linux-2.4.30-mips/include/asm-mips/au1000_gpio.h	2005-01-30 09:01:28.000000000 +0100
+@@ -30,6 +30,13 @@
+  *  675 Mass Ave, Cambridge, MA 02139, USA.
+  */
+ 
++/*
++ *  Revision history
++ *    01/31/02  0.01   Initial release. Steve Longerbeam, MontaVista
++ *    10/12/03  0.1    Added Au1100/Au1500, GPIO2, and bit operations. K.C. Nishio, AMD
++ *    08/05/04  0.11   Added Au1550 and Au1200. K.C. Nishio
++ */
++
+ #ifndef __AU1000_GPIO_H
+ #define __AU1000_GPIO_H
+ 
+@@ -44,13 +51,94 @@
+ #define AU1000GPIO_TRISTATE	_IOW (AU1000GPIO_IOC_MAGIC, 4, int)
+ #define AU1000GPIO_AVAIL_MASK	_IOR (AU1000GPIO_IOC_MAGIC, 5, int)
+ 
++// bit operations
++#define AU1000GPIO_BIT_READ	_IOW (AU1000GPIO_IOC_MAGIC, 6, int)
++#define AU1000GPIO_BIT_SET	_IOW (AU1000GPIO_IOC_MAGIC, 7, int)
++#define AU1000GPIO_BIT_CLEAR	_IOW (AU1000GPIO_IOC_MAGIC, 8, int)
++#define AU1000GPIO_BIT_TRISTATE	_IOW (AU1000GPIO_IOC_MAGIC, 9, int)
++#define AU1000GPIO_BIT_INIT	_IOW (AU1000GPIO_IOC_MAGIC, 10, int)
++#define AU1000GPIO_BIT_TERM	_IOW (AU1000GPIO_IOC_MAGIC, 11, int)
++
++/* set this major numer same as the CRIS GPIO driver */
++#define AU1X00_GPIO_MAJOR	(120)
++
++#define ENABLED_ZERO		(0)
++#define ENABLED_ONE		(1)
++#define ENABLED_10		(0x2)
++#define ENABLED_11		(0x3)
++#define ENABLED_111		(0x7)
++#define NOT_AVAIL		(-1)
++#define AU1X00_MAX_PRIMARY_GPIO	(32) 
++
++#define AU1000_GPIO_MINOR_MAX	AU1X00_MAX_PRIMARY_GPIO
++/* Au1100, 1500, 1550 and 1200 have the secondary GPIO block */
++#define AU1XX0_GPIO_MINOR_MAX	(48)
++
++#define AU1X00_GPIO_NAME	"gpio"
++
++/* GPIO pins which are not multiplexed */
++#if defined(CONFIG_SOC_AU1000)
++  #define NATIVE_GPIOPIN	((1 << 15) | (1 << 8) | (1 << 7) | (1 << 1) | (1 << 0))
++  #define NATIVE_GPIO2PIN	(0)
++#elif defined(CONFIG_SOC_AU1100)
++  #define NATIVE_GPIOPIN	((1 << 23) | (1 << 22) | (1 << 21) | (1 << 20) | (1 << 19) | (1 << 18) | \
++				 (1 << 17) | (1 << 16) | (1 << 7) | (1 << 1) | (1 << 0))
++  #define NATIVE_GPIO2PIN	(0)
++#elif defined(CONFIG_SOC_AU1500)
++  #define NATIVE_GPIOPIN	((1 << 15) | (1 << 8) | (1 << 7) | (1 << 1) | (1 << 0))
++  /* exclude the PCI reset output signal: GPIO[200], DMA_REQ2 and DMA_REQ3 */
++  #define NATIVE_GPIO2PIN	(0xfffe & ~((1 << 9) | (1 << 8))) 
++#elif defined(CONFIG_SOC_AU1550)
++  #define NATIVE_GPIOPIN	((1 << 15) | (1 << 8) | (1 << 7) | (1 << 6) | (1 << 1) | (1 << 0))
++  /* please refere Au1550 Data Book, chapter 15 */
++  #define NATIVE_GPIO2PIN	(1 << 5) 
++#elif defined(CONFIG_SOC_AU1200)
++  #define NATIVE_GPIOPIN	((1 << 7) | (1 << 5))
++  #define NATIVE_GPIO2PIN	(0) 
++#endif
++
++/* minor as u32 */
++#define MINOR_TO_GPIOPIN(minor)		((minor < AU1X00_MAX_PRIMARY_GPIO) ? minor : (minor - AU1X00_MAX_PRIMARY_GPIO))
++#define IS_PRIMARY_GPIOPIN(minor)	((minor < AU1X00_MAX_PRIMARY_GPIO) ? 1 : 0)
++
++/*
++ * pin to minor mapping.
++ * GPIO0-GPIO31, minor=0-31.
++ * GPIO200-GPIO215, minor=32-47.
++ */
++typedef struct _au1x00_gpio_bit_ctl {
++	int direction;	// The direction of this GPIO pin. 0: IN, 1: OUT.
++	int data;	// Pin output when itized (0/1), or at the term. 0/1/-1 (tristate).
++} au1x00_gpio_bit_ctl;
++
++typedef struct _au1x00_gpio_driver {
++	const char	*driver_name;
++	const char	*name;
++	int		name_base;	/* offset of printed name */
++	short		major;		/* major device number */
++	short		minor_start;	/* start of minor device number*/
++	short		num;		/* number of devices */
++} au1x00_gpio_driver;
++
+ #ifdef __KERNEL__
+-extern u32 get_au1000_avail_gpio_mask(void);
+-extern int au1000gpio_tristate(u32 data);
+-extern int au1000gpio_in(u32 *data);
+-extern int au1000gpio_set(u32 data);
+-extern int au1000gpio_clear(u32 data);
+-extern int au1000gpio_out(u32 data);
++extern u32 get_au1000_avail_gpio_mask(u32 *avail_gpio2);
++extern int au1000gpio_tristate(u32 minor, u32 data);
++extern int au1000gpio_in(u32 minor, u32 *data);
++extern int au1000gpio_set(u32 minor, u32 data);
++extern int au1000gpio_clear(u32 minor, u32 data);
++extern int au1000gpio_out(u32 minor, u32 data);
++extern int au1000gpio_bit_read(u32 minor, u32 *read_data);
++extern int au1000gpio_bit_set(u32 minor);
++extern int au1000gpio_bit_clear(u32 minor);
++extern int au1000gpio_bit_tristate(u32 minor);
++extern int check_minor_to_gpio(u32 minor);
++extern int au1000gpio_bit_init(u32 minor, au1x00_gpio_bit_ctl *bit_opt);
++extern int au1000gpio_bit_term(u32 minor, au1x00_gpio_bit_ctl *bit_opt);
++
++extern void gpio_register_devfs (au1x00_gpio_driver *driver, unsigned int flags, unsigned minor);
++extern void gpio_unregister_devfs (au1x00_gpio_driver *driver, unsigned minor);
++extern int gpio_register_driver(au1x00_gpio_driver *driver);
++extern int gpio_unregister_driver(au1x00_gpio_driver *driver);
+ #endif
+ 
+ #endif
+diff -Nur linux-2.4.30/include/asm-mips/au1000_pcmcia.h linux-2.4.30-mips/include/asm-mips/au1000_pcmcia.h
+--- linux-2.4.30/include/asm-mips/au1000_pcmcia.h	2005-01-19 15:10:11.000000000 +0100
++++ linux-2.4.30-mips/include/asm-mips/au1000_pcmcia.h	2005-01-30 09:01:28.000000000 +0100
 @@ -38,16 +38,41 @@
  #define AU1X_SOCK0_PHYS_MEM  0xF80000000
  
@@ -22967,9 +24508,9 @@ diff -Nur linux-2.4.29/include/asm-mips/au1000_pcmcia.h linux-mips/include/asm-m
  #endif
  
  struct pcmcia_state {
-diff -Nur linux-2.4.29/include/asm-mips/au1100_mmc.h linux-mips/include/asm-mips/au1100_mmc.h
---- linux-2.4.29/include/asm-mips/au1100_mmc.h	2005-01-19 15:10:11.000000000 +0100
-+++ linux-mips/include/asm-mips/au1100_mmc.h	2005-01-30 09:01:28.000000000 +0100
+diff -Nur linux-2.4.30/include/asm-mips/au1100_mmc.h linux-2.4.30-mips/include/asm-mips/au1100_mmc.h
+--- linux-2.4.30/include/asm-mips/au1100_mmc.h	2005-01-19 15:10:11.000000000 +0100
++++ linux-2.4.30-mips/include/asm-mips/au1100_mmc.h	2005-01-30 09:01:28.000000000 +0100
 @@ -39,16 +39,22 @@
  #define __ASM_AU1100_MMC_H
  
@@ -23011,9 +24552,9 @@ diff -Nur linux-2.4.29/include/asm-mips/au1100_mmc.h linux-mips/include/asm-mips
 +
  #endif /* __ASM_AU1100_MMC_H */
  
-diff -Nur linux-2.4.29/include/asm-mips/au1xxx_dbdma.h linux-mips/include/asm-mips/au1xxx_dbdma.h
---- linux-2.4.29/include/asm-mips/au1xxx_dbdma.h	2005-01-19 15:10:11.000000000 +0100
-+++ linux-mips/include/asm-mips/au1xxx_dbdma.h	2005-01-30 09:01:28.000000000 +0100
+diff -Nur linux-2.4.30/include/asm-mips/au1xxx_dbdma.h linux-2.4.30-mips/include/asm-mips/au1xxx_dbdma.h
+--- linux-2.4.30/include/asm-mips/au1xxx_dbdma.h	2005-01-19 15:10:11.000000000 +0100
++++ linux-2.4.30-mips/include/asm-mips/au1xxx_dbdma.h	2005-01-30 09:01:28.000000000 +0100
 @@ -43,7 +43,7 @@
  #define DDMA_GLOBAL_BASE	0xb4003000
  #define DDMA_CHANNEL_BASE	0xb4002000
@@ -23166,9 +24707,9 @@ diff -Nur linux-2.4.29/include/asm-mips/au1xxx_dbdma.h linux-mips/include/asm-mi
 +
  #endif /* _LANGUAGE_ASSEMBLY */
  #endif /* _AU1000_DBDMA_H_ */
-diff -Nur linux-2.4.29/include/asm-mips/au1xxx_gpio.h linux-mips/include/asm-mips/au1xxx_gpio.h
---- linux-2.4.29/include/asm-mips/au1xxx_gpio.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-mips/include/asm-mips/au1xxx_gpio.h	2005-01-30 09:01:28.000000000 +0100
+diff -Nur linux-2.4.30/include/asm-mips/au1xxx_gpio.h linux-2.4.30-mips/include/asm-mips/au1xxx_gpio.h
+--- linux-2.4.30/include/asm-mips/au1xxx_gpio.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.30-mips/include/asm-mips/au1xxx_gpio.h	2005-01-30 09:01:28.000000000 +0100
 @@ -0,0 +1,22 @@
 +
 +
@@ -23192,9 +24733,9 @@ diff -Nur linux-2.4.29/include/asm-mips/au1xxx_gpio.h linux-mips/include/asm-mip
 +} AU1X00_GPIO2;
 +
 +#endif //__AU1XXX_GPIO_H
-diff -Nur linux-2.4.29/include/asm-mips/au1xxx_psc.h linux-mips/include/asm-mips/au1xxx_psc.h
---- linux-2.4.29/include/asm-mips/au1xxx_psc.h	2005-01-19 15:10:11.000000000 +0100
-+++ linux-mips/include/asm-mips/au1xxx_psc.h	2005-01-30 09:01:28.000000000 +0100
+diff -Nur linux-2.4.30/include/asm-mips/au1xxx_psc.h linux-2.4.30-mips/include/asm-mips/au1xxx_psc.h
+--- linux-2.4.30/include/asm-mips/au1xxx_psc.h	2005-01-19 15:10:11.000000000 +0100
++++ linux-2.4.30-mips/include/asm-mips/au1xxx_psc.h	2005-01-30 09:01:28.000000000 +0100
 @@ -41,6 +41,11 @@
  #define PSC3_BASE_ADDR		0xb0d00000
  #endif
@@ -23216,9 +24757,9 @@ diff -Nur linux-2.4.29/include/asm-mips/au1xxx_psc.h linux-mips/include/asm-mips
  #define PSC_I2SCFG_WI		(1 << 15)
  
  #define PSC_I2SCFG_DIV_MASK	(3 << 13)
-diff -Nur linux-2.4.29/include/asm-mips/bootinfo.h linux-mips/include/asm-mips/bootinfo.h
---- linux-2.4.29/include/asm-mips/bootinfo.h	2004-02-18 14:36:32.000000000 +0100
-+++ linux-mips/include/asm-mips/bootinfo.h	2005-01-30 09:01:28.000000000 +0100
+diff -Nur linux-2.4.30/include/asm-mips/bootinfo.h linux-2.4.30-mips/include/asm-mips/bootinfo.h
+--- linux-2.4.30/include/asm-mips/bootinfo.h	2004-02-18 14:36:32.000000000 +0100
++++ linux-2.4.30-mips/include/asm-mips/bootinfo.h	2005-01-30 09:01:28.000000000 +0100
 @@ -180,6 +180,9 @@
  #define MACH_MTX1		7	/* 4G MTX-1 Au1500-based board */
  #define MACH_CSB250		8	/* Cogent Au1500 */
@@ -23229,9 +24770,9 @@ diff -Nur linux-2.4.29/include/asm-mips/bootinfo.h linux-mips/include/asm-mips/b
  
  /*
   * Valid machtype for group NEC_VR41XX
-diff -Nur linux-2.4.29/include/asm-mips/db1200.h linux-mips/include/asm-mips/db1200.h
---- linux-2.4.29/include/asm-mips/db1200.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-mips/include/asm-mips/db1200.h	2005-01-30 09:02:45.000000000 +0100
+diff -Nur linux-2.4.30/include/asm-mips/db1200.h linux-2.4.30-mips/include/asm-mips/db1200.h
+--- linux-2.4.30/include/asm-mips/db1200.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.30-mips/include/asm-mips/db1200.h	2005-01-30 09:02:45.000000000 +0100
 @@ -0,0 +1,214 @@
 +/*
 + * AMD Alchemy DB1200 Referrence Board
@@ -23447,9 +24988,9 @@ diff -Nur linux-2.4.29/include/asm-mips/db1200.h linux-mips/include/asm-mips/db1
 +
 +#endif /* __ASM_DB1200_H */
 +
-diff -Nur linux-2.4.29/include/asm-mips/db1x00.h linux-mips/include/asm-mips/db1x00.h
---- linux-2.4.29/include/asm-mips/db1x00.h	2005-01-19 15:10:11.000000000 +0100
-+++ linux-mips/include/asm-mips/db1x00.h	2005-01-30 09:06:19.000000000 +0100
+diff -Nur linux-2.4.30/include/asm-mips/db1x00.h linux-2.4.30-mips/include/asm-mips/db1x00.h
+--- linux-2.4.30/include/asm-mips/db1x00.h	2005-01-19 15:10:11.000000000 +0100
++++ linux-2.4.30-mips/include/asm-mips/db1x00.h	2005-01-30 09:06:19.000000000 +0100
 @@ -1,5 +1,5 @@
  /*
 - * AMD Alchemy DB1x00 Reference Boards
@@ -23555,9 +25096,9 @@ diff -Nur linux-2.4.29/include/asm-mips/db1x00.h linux-mips/include/asm-mips/db1
  
  #endif /* __ASM_DB1X00_H */
  
-diff -Nur linux-2.4.29/include/asm-mips/ficmmp.h linux-mips/include/asm-mips/ficmmp.h
---- linux-2.4.29/include/asm-mips/ficmmp.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-mips/include/asm-mips/ficmmp.h	2005-01-30 09:01:28.000000000 +0100
+diff -Nur linux-2.4.30/include/asm-mips/ficmmp.h linux-2.4.30-mips/include/asm-mips/ficmmp.h
+--- linux-2.4.30/include/asm-mips/ficmmp.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.30-mips/include/asm-mips/ficmmp.h	2005-01-30 09:01:28.000000000 +0100
 @@ -0,0 +1,156 @@
 +/*
 + * FIC MMP
@@ -23715,9 +25256,9 @@ diff -Nur linux-2.4.29/include/asm-mips/ficmmp.h linux-mips/include/asm-mips/fic
 +
 +#endif /* __ASM_FICMMP_H */
 +
-diff -Nur linux-2.4.29/include/asm-mips/hazards.h linux-mips/include/asm-mips/hazards.h
---- linux-2.4.29/include/asm-mips/hazards.h	2004-02-18 14:36:32.000000000 +0100
-+++ linux-mips/include/asm-mips/hazards.h	2004-11-25 23:18:38.000000000 +0100
+diff -Nur linux-2.4.30/include/asm-mips/hazards.h linux-2.4.30-mips/include/asm-mips/hazards.h
+--- linux-2.4.30/include/asm-mips/hazards.h	2004-02-18 14:36:32.000000000 +0100
++++ linux-2.4.30-mips/include/asm-mips/hazards.h	2004-11-25 23:18:38.000000000 +0100
 @@ -3,7 +3,7 @@
   * License.  See the file "COPYING" in the main directory of this archive
   * for more details.
@@ -23919,9 +25460,9 @@ diff -Nur linux-2.4.29/include/asm-mips/hazards.h linux-mips/include/asm-mips/ha
 +#endif /* __ASSEMBLY__ */
 +
  #endif /* _ASM_HAZARDS_H */
-diff -Nur linux-2.4.29/include/asm-mips/mipsregs.h linux-mips/include/asm-mips/mipsregs.h
---- linux-2.4.29/include/asm-mips/mipsregs.h	2005-01-19 15:10:12.000000000 +0100
-+++ linux-mips/include/asm-mips/mipsregs.h	2005-02-06 22:24:22.000000000 +0100
+diff -Nur linux-2.4.30/include/asm-mips/mipsregs.h linux-2.4.30-mips/include/asm-mips/mipsregs.h
+--- linux-2.4.30/include/asm-mips/mipsregs.h	2005-01-19 15:10:12.000000000 +0100
++++ linux-2.4.30-mips/include/asm-mips/mipsregs.h	2005-02-06 22:24:22.000000000 +0100
 @@ -757,10 +757,18 @@
  #define read_c0_config1()	__read_32bit_c0_register($16, 1)
  #define read_c0_config2()	__read_32bit_c0_register($16, 2)
@@ -23984,9 +25525,9 @@ diff -Nur linux-2.4.29/include/asm-mips/mipsregs.h linux-mips/include/asm-mips/m
  }
  
  /*
-diff -Nur linux-2.4.29/include/asm-mips/mmu_context.h linux-mips/include/asm-mips/mmu_context.h
---- linux-2.4.29/include/asm-mips/mmu_context.h	2005-01-19 15:10:12.000000000 +0100
-+++ linux-mips/include/asm-mips/mmu_context.h	2004-11-22 14:38:29.000000000 +0100
+diff -Nur linux-2.4.30/include/asm-mips/mmu_context.h linux-2.4.30-mips/include/asm-mips/mmu_context.h
+--- linux-2.4.30/include/asm-mips/mmu_context.h	2005-01-19 15:10:12.000000000 +0100
++++ linux-2.4.30-mips/include/asm-mips/mmu_context.h	2004-11-22 14:38:29.000000000 +0100
 @@ -27,7 +27,7 @@
  #define TLBMISS_HANDLER_SETUP_PGD(pgd) \
  	pgd_current[smp_processor_id()] = (unsigned long)(pgd)
@@ -23996,9 +25537,9 @@ diff -Nur linux-2.4.29/include/asm-mips/mmu_context.h linux-mips/include/asm-mip
  	TLBMISS_HANDLER_SETUP_PGD(swapper_pg_dir)
  extern unsigned long pgd_current[];
  
-diff -Nur linux-2.4.29/include/asm-mips/pb1100.h linux-mips/include/asm-mips/pb1100.h
---- linux-2.4.29/include/asm-mips/pb1100.h	2003-08-25 13:44:44.000000000 +0200
-+++ linux-mips/include/asm-mips/pb1100.h	2005-01-30 09:10:29.000000000 +0100
+diff -Nur linux-2.4.30/include/asm-mips/pb1100.h linux-2.4.30-mips/include/asm-mips/pb1100.h
+--- linux-2.4.30/include/asm-mips/pb1100.h	2003-08-25 13:44:44.000000000 +0200
++++ linux-2.4.30-mips/include/asm-mips/pb1100.h	2005-01-30 09:10:29.000000000 +0100
 @@ -1,5 +1,5 @@
  /*
 - * Alchemy Semi PB1100 Referrence Board
@@ -24165,9 +25706,9 @@ diff -Nur linux-2.4.29/include/asm-mips/pb1100.h linux-mips/include/asm-mips/pb1
  
  #endif /* __ASM_PB1100_H */
 +
-diff -Nur linux-2.4.29/include/asm-mips/pb1200.h linux-mips/include/asm-mips/pb1200.h
---- linux-2.4.29/include/asm-mips/pb1200.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-mips/include/asm-mips/pb1200.h	2005-01-30 09:01:28.000000000 +0100
+diff -Nur linux-2.4.30/include/asm-mips/pb1200.h linux-2.4.30-mips/include/asm-mips/pb1200.h
+--- linux-2.4.30/include/asm-mips/pb1200.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.30-mips/include/asm-mips/pb1200.h	2005-01-30 09:01:28.000000000 +0100
 @@ -0,0 +1,244 @@
 +/*
 + * AMD Alchemy PB1200 Referrence Board
@@ -24413,9 +25954,9 @@ diff -Nur linux-2.4.29/include/asm-mips/pb1200.h linux-mips/include/asm-mips/pb1
 +
 +#endif /* __ASM_PB1200_H */
 +
-diff -Nur linux-2.4.29/include/asm-mips/pb1550.h linux-mips/include/asm-mips/pb1550.h
---- linux-2.4.29/include/asm-mips/pb1550.h	2005-01-19 15:10:12.000000000 +0100
-+++ linux-mips/include/asm-mips/pb1550.h	2005-01-30 09:01:28.000000000 +0100
+diff -Nur linux-2.4.30/include/asm-mips/pb1550.h linux-2.4.30-mips/include/asm-mips/pb1550.h
+--- linux-2.4.30/include/asm-mips/pb1550.h	2005-01-19 15:10:12.000000000 +0100
++++ linux-2.4.30-mips/include/asm-mips/pb1550.h	2005-01-30 09:01:28.000000000 +0100
 @@ -30,13 +30,11 @@
  
  #define DBDMA_AC97_TX_CHAN DSCR_CMD0_PSC1_TX
@@ -24459,9 +26000,9 @@ diff -Nur linux-2.4.29/include/asm-mips/pb1550.h linux-mips/include/asm-mips/pb1
 +#define AU1XXX_SMC91111_IRQ		AU1000_GPIO_3
  
  #endif /* __ASM_PB1550_H */
-diff -Nur linux-2.4.29/include/asm-mips/tx4927/tx4927.h linux-mips/include/asm-mips/tx4927/tx4927.h
---- linux-2.4.29/include/asm-mips/tx4927/tx4927.h	2003-08-25 13:44:44.000000000 +0200
-+++ linux-mips/include/asm-mips/tx4927/tx4927.h	2004-11-22 19:02:10.000000000 +0100
+diff -Nur linux-2.4.30/include/asm-mips/tx4927/tx4927.h linux-2.4.30-mips/include/asm-mips/tx4927/tx4927.h
+--- linux-2.4.30/include/asm-mips/tx4927/tx4927.h	2003-08-25 13:44:44.000000000 +0200
++++ linux-2.4.30-mips/include/asm-mips/tx4927/tx4927.h	2004-11-22 19:02:10.000000000 +0100
 @@ -88,8 +88,8 @@
  
  
@@ -24530,9 +26071,9 @@ diff -Nur linux-2.4.29/include/asm-mips/tx4927/tx4927.h linux-mips/include/asm-m
  #define TX4927_ACLC_ACSEMAPH            0xf720
  #define TX4927_ACLC_ACGPIDAT            0xf740
  #define TX4927_ACLC_ACGPODAT            0xf744
-diff -Nur linux-2.4.29/include/asm-mips/unistd.h linux-mips/include/asm-mips/unistd.h
---- linux-2.4.29/include/asm-mips/unistd.h	2005-01-19 15:10:12.000000000 +0100
-+++ linux-mips/include/asm-mips/unistd.h	2004-11-24 21:30:06.000000000 +0100
+diff -Nur linux-2.4.30/include/asm-mips/unistd.h linux-2.4.30-mips/include/asm-mips/unistd.h
+--- linux-2.4.30/include/asm-mips/unistd.h	2005-01-19 15:10:12.000000000 +0100
++++ linux-2.4.30-mips/include/asm-mips/unistd.h	2004-11-24 21:30:06.000000000 +0100
 @@ -760,7 +760,7 @@
  	if (__a3 == 0) \
  		return (type) __v0; \
@@ -24614,9 +26155,9 @@ diff -Nur linux-2.4.29/include/asm-mips/unistd.h linux-mips/include/asm-mips/uni
  }
  
  #endif /* (_MIPS_SIM == _MIPS_SIM_NABI32) || (_MIPS_SIM == _MIPS_SIM_ABI64) */
-diff -Nur linux-2.4.29/include/asm-mips64/hazards.h linux-mips/include/asm-mips64/hazards.h
---- linux-2.4.29/include/asm-mips64/hazards.h	2004-02-18 14:36:32.000000000 +0100
-+++ linux-mips/include/asm-mips64/hazards.h	2004-11-25 23:18:38.000000000 +0100
+diff -Nur linux-2.4.30/include/asm-mips64/hazards.h linux-2.4.30-mips/include/asm-mips64/hazards.h
+--- linux-2.4.30/include/asm-mips64/hazards.h	2004-02-18 14:36:32.000000000 +0100
++++ linux-2.4.30-mips/include/asm-mips64/hazards.h	2004-11-25 23:18:38.000000000 +0100
 @@ -3,7 +3,7 @@
   * License.  See the file "COPYING" in the main directory of this archive
   * for more details.
@@ -24819,9 +26360,9 @@ diff -Nur linux-2.4.29/include/asm-mips64/hazards.h linux-mips/include/asm-mips6
 +#endif /* __ASSEMBLY__ */
 +
  #endif /* _ASM_HAZARDS_H */
-diff -Nur linux-2.4.29/include/asm-mips64/mipsregs.h linux-mips/include/asm-mips64/mipsregs.h
---- linux-2.4.29/include/asm-mips64/mipsregs.h	2005-01-19 15:10:12.000000000 +0100
-+++ linux-mips/include/asm-mips64/mipsregs.h	2005-02-06 22:24:22.000000000 +0100
+diff -Nur linux-2.4.30/include/asm-mips64/mipsregs.h linux-2.4.30-mips/include/asm-mips64/mipsregs.h
+--- linux-2.4.30/include/asm-mips64/mipsregs.h	2005-01-19 15:10:12.000000000 +0100
++++ linux-2.4.30-mips/include/asm-mips64/mipsregs.h	2005-02-06 22:24:22.000000000 +0100
 @@ -757,10 +757,18 @@
  #define read_c0_config1()	__read_32bit_c0_register($16, 1)
  #define read_c0_config2()	__read_32bit_c0_register($16, 2)
@@ -24884,9 +26425,9 @@ diff -Nur linux-2.4.29/include/asm-mips64/mipsregs.h linux-mips/include/asm-mips
  }
  
  /*
-diff -Nur linux-2.4.29/include/asm-mips64/unistd.h linux-mips/include/asm-mips64/unistd.h
---- linux-2.4.29/include/asm-mips64/unistd.h	2005-01-19 15:10:12.000000000 +0100
-+++ linux-mips/include/asm-mips64/unistd.h	2004-11-24 21:30:06.000000000 +0100
+diff -Nur linux-2.4.30/include/asm-mips64/unistd.h linux-2.4.30-mips/include/asm-mips64/unistd.h
+--- linux-2.4.30/include/asm-mips64/unistd.h	2005-01-19 15:10:12.000000000 +0100
++++ linux-2.4.30-mips/include/asm-mips64/unistd.h	2004-11-24 21:30:06.000000000 +0100
 @@ -760,7 +760,7 @@
  	if (__a3 == 0) \
  		return (type) __v0; \
@@ -24968,9 +26509,9 @@ diff -Nur linux-2.4.29/include/asm-mips64/unistd.h linux-mips/include/asm-mips64
  }
  
  #endif /* (_MIPS_SIM == _MIPS_SIM_NABI32) || (_MIPS_SIM == _MIPS_SIM_ABI64) */
-diff -Nur linux-2.4.29/include/asm-ppc/param.h linux-mips/include/asm-ppc/param.h
---- linux-2.4.29/include/asm-ppc/param.h	2003-06-13 16:51:38.000000000 +0200
-+++ linux-mips/include/asm-ppc/param.h	2003-07-05 05:23:46.000000000 +0200
+diff -Nur linux-2.4.30/include/asm-ppc/param.h linux-2.4.30-mips/include/asm-ppc/param.h
+--- linux-2.4.30/include/asm-ppc/param.h	2003-06-13 16:51:38.000000000 +0200
++++ linux-2.4.30-mips/include/asm-ppc/param.h	2003-07-05 05:23:46.000000000 +0200
 @@ -3,6 +3,9 @@
  
  #ifndef HZ
@@ -24981,9 +26522,9 @@ diff -Nur linux-2.4.29/include/asm-ppc/param.h linux-mips/include/asm-ppc/param.
  #endif
  
  #define EXEC_PAGESIZE	4096
-diff -Nur linux-2.4.29/include/asm-s390/param.h linux-mips/include/asm-s390/param.h
---- linux-2.4.29/include/asm-s390/param.h	2001-02-13 23:13:44.000000000 +0100
-+++ linux-mips/include/asm-s390/param.h	2001-03-09 21:34:48.000000000 +0100
+diff -Nur linux-2.4.30/include/asm-s390/param.h linux-2.4.30-mips/include/asm-s390/param.h
+--- linux-2.4.30/include/asm-s390/param.h	2001-02-13 23:13:44.000000000 +0100
++++ linux-2.4.30-mips/include/asm-s390/param.h	2001-03-09 21:34:48.000000000 +0100
 @@ -11,6 +11,9 @@
  
  #ifndef HZ
@@ -24994,9 +26535,9 @@ diff -Nur linux-2.4.29/include/asm-s390/param.h linux-mips/include/asm-s390/para
  #endif
  
  #define EXEC_PAGESIZE	4096
-diff -Nur linux-2.4.29/include/asm-sh/param.h linux-mips/include/asm-sh/param.h
---- linux-2.4.29/include/asm-sh/param.h	2001-01-04 22:19:13.000000000 +0100
-+++ linux-mips/include/asm-sh/param.h	2001-01-11 05:02:45.000000000 +0100
+diff -Nur linux-2.4.30/include/asm-sh/param.h linux-2.4.30-mips/include/asm-sh/param.h
+--- linux-2.4.30/include/asm-sh/param.h	2001-01-04 22:19:13.000000000 +0100
++++ linux-2.4.30-mips/include/asm-sh/param.h	2001-01-11 05:02:45.000000000 +0100
 @@ -3,6 +3,9 @@
  
  #ifndef HZ
@@ -25007,9 +26548,9 @@ diff -Nur linux-2.4.29/include/asm-sh/param.h linux-mips/include/asm-sh/param.h
  #endif
  
  #define EXEC_PAGESIZE	4096
-diff -Nur linux-2.4.29/include/asm-sparc/param.h linux-mips/include/asm-sparc/param.h
---- linux-2.4.29/include/asm-sparc/param.h	2000-10-30 23:34:12.000000000 +0100
-+++ linux-mips/include/asm-sparc/param.h	2000-11-23 03:00:56.000000000 +0100
+diff -Nur linux-2.4.30/include/asm-sparc/param.h linux-2.4.30-mips/include/asm-sparc/param.h
+--- linux-2.4.30/include/asm-sparc/param.h	2000-10-30 23:34:12.000000000 +0100
++++ linux-2.4.30-mips/include/asm-sparc/param.h	2000-11-23 03:00:56.000000000 +0100
 @@ -4,6 +4,9 @@
  
  #ifndef HZ
@@ -25020,9 +26561,9 @@ diff -Nur linux-2.4.29/include/asm-sparc/param.h linux-mips/include/asm-sparc/pa
  #endif
  
  #define EXEC_PAGESIZE	8192    /* Thanks for sun4's we carry baggage... */
-diff -Nur linux-2.4.29/include/asm-sparc64/param.h linux-mips/include/asm-sparc64/param.h
---- linux-2.4.29/include/asm-sparc64/param.h	2000-10-30 23:34:12.000000000 +0100
-+++ linux-mips/include/asm-sparc64/param.h	2000-11-23 03:00:56.000000000 +0100
+diff -Nur linux-2.4.30/include/asm-sparc64/param.h linux-2.4.30-mips/include/asm-sparc64/param.h
+--- linux-2.4.30/include/asm-sparc64/param.h	2000-10-30 23:34:12.000000000 +0100
++++ linux-2.4.30-mips/include/asm-sparc64/param.h	2000-11-23 03:00:56.000000000 +0100
 @@ -4,6 +4,9 @@
  
  #ifndef HZ
@@ -25033,9 +26574,9 @@ diff -Nur linux-2.4.29/include/asm-sparc64/param.h linux-mips/include/asm-sparc6
  #endif
  
  #define EXEC_PAGESIZE	8192    /* Thanks for sun4's we carry baggage... */
-diff -Nur linux-2.4.29/include/linux/i2c-algo-au1550.h linux-mips/include/linux/i2c-algo-au1550.h
---- linux-2.4.29/include/linux/i2c-algo-au1550.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-mips/include/linux/i2c-algo-au1550.h	2004-07-07 02:38:02.000000000 +0200
+diff -Nur linux-2.4.30/include/linux/i2c-algo-au1550.h linux-2.4.30-mips/include/linux/i2c-algo-au1550.h
+--- linux-2.4.30/include/linux/i2c-algo-au1550.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.4.30-mips/include/linux/i2c-algo-au1550.h	2004-07-07 02:38:02.000000000 +0200
 @@ -0,0 +1,31 @@
 +/*
 + * Copyright (C) 2004 Embedded Edge, LLC <dan@embeddededge.com>
@@ -25068,9 +26609,9 @@ diff -Nur linux-2.4.29/include/linux/i2c-algo-au1550.h linux-mips/include/linux/
 +int i2c_au1550_del_bus(struct i2c_adapter *);
 +
 +#endif /* I2C_ALGO_AU1550_H */
-diff -Nur linux-2.4.29/include/linux/i2c-id.h linux-mips/include/linux/i2c-id.h
---- linux-2.4.29/include/linux/i2c-id.h	2004-02-18 14:36:32.000000000 +0100
-+++ linux-mips/include/linux/i2c-id.h	2004-07-07 02:38:02.000000000 +0200
+diff -Nur linux-2.4.30/include/linux/i2c-id.h linux-2.4.30-mips/include/linux/i2c-id.h
+--- linux-2.4.30/include/linux/i2c-id.h	2004-02-18 14:36:32.000000000 +0100
++++ linux-2.4.30-mips/include/linux/i2c-id.h	2004-07-07 02:38:02.000000000 +0200
 @@ -156,6 +156,8 @@
  
  #define I2C_ALGO_SGI	0x130000	/* SGI algorithm		*/
@@ -25090,9 +26631,9 @@ diff -Nur linux-2.4.29/include/linux/i2c-id.h linux-mips/include/linux/i2c-id.h
  /* --- SMBus only adapters						*/
  #define I2C_HW_SMBUS_PIIX4	0x00
  #define I2C_HW_SMBUS_ALI15X3	0x01
-diff -Nur linux-2.4.29/include/linux/sched.h linux-mips/include/linux/sched.h
---- linux-2.4.29/include/linux/sched.h	2005-01-19 15:10:12.000000000 +0100
-+++ linux-mips/include/linux/sched.h	2004-11-29 18:47:18.000000000 +0100
+diff -Nur linux-2.4.30/include/linux/sched.h linux-2.4.30-mips/include/linux/sched.h
+--- linux-2.4.30/include/linux/sched.h	2005-01-19 15:10:12.000000000 +0100
++++ linux-2.4.30-mips/include/linux/sched.h	2004-11-29 18:47:18.000000000 +0100
 @@ -617,6 +617,10 @@
  extern int in_group_p(gid_t);
  extern int in_egroup_p(gid_t);
@@ -25104,9 +26645,9 @@ diff -Nur linux-2.4.29/include/linux/sched.h linux-mips/include/linux/sched.h
  extern void proc_caches_init(void);
  extern void flush_signals(struct task_struct *);
  extern void flush_signal_handlers(struct task_struct *);
-diff -Nur linux-2.4.29/include/linux/serial.h linux-mips/include/linux/serial.h
---- linux-2.4.29/include/linux/serial.h	2002-08-03 02:39:45.000000000 +0200
-+++ linux-mips/include/linux/serial.h	2004-07-31 02:17:57.000000000 +0200
+diff -Nur linux-2.4.30/include/linux/serial.h linux-2.4.30-mips/include/linux/serial.h
+--- linux-2.4.30/include/linux/serial.h	2002-08-03 02:39:45.000000000 +0200
++++ linux-2.4.30-mips/include/linux/serial.h	2004-07-31 02:17:57.000000000 +0200
 @@ -75,7 +75,8 @@
  #define PORT_16654	11
  #define PORT_16850	12
@@ -25117,9 +26658,9 @@ diff -Nur linux-2.4.29/include/linux/serial.h linux-mips/include/linux/serial.h
  
  #define SERIAL_IO_PORT	0
  #define SERIAL_IO_HUB6	1
-diff -Nur linux-2.4.29/include/linux/swap.h linux-mips/include/linux/swap.h
---- linux-2.4.29/include/linux/swap.h	2005-01-19 15:10:12.000000000 +0100
-+++ linux-mips/include/linux/swap.h	2004-11-29 18:47:18.000000000 +0100
+diff -Nur linux-2.4.30/include/linux/swap.h linux-2.4.30-mips/include/linux/swap.h
+--- linux-2.4.30/include/linux/swap.h	2005-01-19 15:10:12.000000000 +0100
++++ linux-2.4.30-mips/include/linux/swap.h	2004-11-29 18:47:18.000000000 +0100
 @@ -1,6 +1,12 @@
  #ifndef _LINUX_SWAP_H
  #define _LINUX_SWAP_H
@@ -25151,9 +26692,9 @@ diff -Nur linux-2.4.29/include/linux/swap.h linux-mips/include/linux/swap.h
  /*
   * Max bad pages in the new format..
   */
-diff -Nur linux-2.4.29/include/video/newport.h linux-mips/include/video/newport.h
---- linux-2.4.29/include/video/newport.h	2001-04-12 21:20:31.000000000 +0200
-+++ linux-mips/include/video/newport.h	2004-09-23 15:32:29.000000000 +0200
+diff -Nur linux-2.4.30/include/video/newport.h linux-2.4.30-mips/include/video/newport.h
+--- linux-2.4.30/include/video/newport.h	2001-04-12 21:20:31.000000000 +0200
++++ linux-2.4.30-mips/include/video/newport.h	2004-09-23 15:32:29.000000000 +0200
 @@ -291,8 +291,6 @@
  	unsigned int _unused2[0x1ef];
  	struct newport_cregs cgo;
@@ -25221,9 +26762,9 @@ diff -Nur linux-2.4.29/include/video/newport.h linux-mips/include/video/newport.
  	
          while ((rex->set.dcbdata0.bybytes.b3 & 3) != XM9_FIFO_EMPTY)
  		;
-diff -Nur linux-2.4.29/init/main.c linux-mips/init/main.c
---- linux-2.4.29/init/main.c	2004-11-17 12:54:22.000000000 +0100
-+++ linux-mips/init/main.c	2004-11-19 01:28:52.000000000 +0100
+diff -Nur linux-2.4.30/init/main.c linux-2.4.30-mips/init/main.c
+--- linux-2.4.30/init/main.c	2004-11-17 12:54:22.000000000 +0100
++++ linux-2.4.30-mips/init/main.c	2004-11-19 01:28:52.000000000 +0100
 @@ -296,7 +296,6 @@
  
  
@@ -25232,9 +26773,9 @@ diff -Nur linux-2.4.29/init/main.c linux-mips/init/main.c
  
  unsigned long wait_init_idle;
  
-diff -Nur linux-2.4.29/kernel/exit.c linux-mips/kernel/exit.c
---- linux-2.4.29/kernel/exit.c	2002-11-29 00:53:15.000000000 +0100
-+++ linux-mips/kernel/exit.c	2003-01-11 18:53:18.000000000 +0100
+diff -Nur linux-2.4.30/kernel/exit.c linux-2.4.30-mips/kernel/exit.c
+--- linux-2.4.30/kernel/exit.c	2002-11-29 00:53:15.000000000 +0100
++++ linux-2.4.30-mips/kernel/exit.c	2003-01-11 18:53:18.000000000 +0100
 @@ -26,7 +26,7 @@
  
  int getrusage(struct task_struct *, int, struct rusage *);
@@ -25244,9 +26785,9 @@ diff -Nur linux-2.4.29/kernel/exit.c linux-mips/kernel/exit.c
  {
  	if (p != current) {
  #ifdef CONFIG_SMP
-diff -Nur linux-2.4.29/kernel/signal.c linux-mips/kernel/signal.c
---- linux-2.4.29/kernel/signal.c	2004-02-18 14:36:32.000000000 +0100
-+++ linux-mips/kernel/signal.c	2004-01-20 16:10:34.000000000 +0100
+diff -Nur linux-2.4.30/kernel/signal.c linux-2.4.30-mips/kernel/signal.c
+--- linux-2.4.30/kernel/signal.c	2004-02-18 14:36:32.000000000 +0100
++++ linux-2.4.30-mips/kernel/signal.c	2004-01-20 16:10:34.000000000 +0100
 @@ -14,6 +14,7 @@
  #include <linux/init.h>
  #include <linux/sched.h>
@@ -25316,9 +26857,9 @@ diff -Nur linux-2.4.29/kernel/signal.c linux-mips/kernel/signal.c
  
  	status = tsk->exit_code & 0x7f;
  	why = SI_KERNEL;	/* shouldn't happen */
-diff -Nur linux-2.4.29/kernel/sys.c linux-mips/kernel/sys.c
---- linux-2.4.29/kernel/sys.c	2003-11-28 19:26:21.000000000 +0100
-+++ linux-mips/kernel/sys.c	2003-11-17 02:07:47.000000000 +0100
+diff -Nur linux-2.4.30/kernel/sys.c linux-2.4.30-mips/kernel/sys.c
+--- linux-2.4.30/kernel/sys.c	2003-11-28 19:26:21.000000000 +0100
++++ linux-2.4.30-mips/kernel/sys.c	2003-11-17 02:07:47.000000000 +0100
 @@ -801,16 +801,23 @@
  
  asmlinkage long sys_times(struct tms * tbuf)
@@ -25346,9 +26887,9 @@ diff -Nur linux-2.4.29/kernel/sys.c linux-mips/kernel/sys.c
  }
  
  /*
-diff -Nur linux-2.4.29/lib/Makefile linux-mips/lib/Makefile
---- linux-2.4.29/lib/Makefile	2004-04-14 15:05:40.000000000 +0200
-+++ linux-mips/lib/Makefile	2004-04-16 05:14:21.000000000 +0200
+diff -Nur linux-2.4.30/lib/Makefile linux-2.4.30-mips/lib/Makefile
+--- linux-2.4.30/lib/Makefile	2004-04-14 15:05:40.000000000 +0200
++++ linux-2.4.30-mips/lib/Makefile	2004-04-16 05:14:21.000000000 +0200
 @@ -27,6 +27,7 @@
  subdir-$(CONFIG_ZLIB_INFLATE) += zlib_inflate
  subdir-$(CONFIG_ZLIB_DEFLATE) += zlib_deflate
@@ -25357,40 +26898,3 @@ diff -Nur linux-2.4.29/lib/Makefile linux-mips/lib/Makefile
  include $(TOPDIR)/drivers/net/Makefile.lib
  include $(TOPDIR)/drivers/usb/Makefile.lib
  include $(TOPDIR)/drivers/bluetooth/Makefile.lib
-diff -Nur linux-2.4.29/Makefile linux-mips/Makefile
---- linux-2.4.29/Makefile	2005-01-19 15:10:14.000000000 +0100
-+++ linux-mips/Makefile	2005-01-20 03:19:21.000000000 +0100
-@@ -5,7 +5,7 @@
- 
- KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
- 
--ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/)
-+ARCH = mips
- KERNELPATH=kernel-$(shell echo $(KERNELRELEASE) | sed -e "s/-//g")
- 
- CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
-@@ -462,10 +462,11 @@
- 	$(MAKE) -C Documentation/DocBook mrproper
- 
- distclean: mrproper
--	rm -f core `find . \( -not -type d \) -and \
--		\( -name '*.orig' -o -name '*.rej' -o -name '*~' \
--		-o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
--		-o -name '.*.rej' -o -name '.SUMS' -o -size 0 \) -type f -print` TAGS tags
-+	find . \( -not -type d \) -and \
-+		\( -name core -o -name '*.orig' -o -name '*.rej' \
-+		-o -name '*~' -o -name '*.bak' -o -name '#*#' \
-+		-o -name '.*.rej' -o -name '.SUMS' -o -size 0 \
-+		-o -name TAGS -o -name tags \) -print | env -i xargs rm -f
- 
- backup: mrproper
- 	cd .. && tar cf - linux/ | gzip -9 > backup.gz
-@@ -492,7 +493,7 @@
- 	$(MAKE) -C Documentation/DocBook man
- 
- sums:
--	find . -type f -print | sort | xargs sum > .SUMS
-+	find . -type f -print | sort | env -i xargs sum > .SUMS
- 
- dep-files: scripts/mkdep archdep include/linux/version.h
- 	rm -f .depend .hdepend
diff --git a/openwrt/package/linux/kernel-source/drivers/net/diag/diag_led.c b/openwrt/package/linux/kernel-source/drivers/net/diag/diag_led.c
index 6f1ba9732..9945dbe00 100644
--- a/openwrt/package/linux/kernel-source/drivers/net/diag/diag_led.c
+++ b/openwrt/package/linux/kernel-source/drivers/net/diag/diag_led.c
@@ -1,11 +1,33 @@
-// replacement diag module
-// (c) 2004 openwrt 
-// mbm at alt dot org
-//
-// initial release 2004/03/28
-//
-// 2004/08/26 asus & buffalo support added
-// 2005/03/14 asus wl-500g deluxe and buffalo v2 support added
+/*
+ * diag_led.c - replacement diag module
+ *
+ * Copyright (C) 2004 Mike Baker,
+ *                    Imre Kaloz <kaloz@dune.hu>
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * $Id$
+ */
+
+/*
+ * ChangeLog:
+ * 2004/03/28 initial release 
+ * 2004/08/26 asus & buffalo support added
+ * 2005/03/14 asus wl-500g deluxe and buffalo v2 support added
+ * 2005/04/13 added licensing informations
+ */
 
 #include <linux/module.h>
 #include <linux/init.h>
@@ -222,5 +244,9 @@ static void __exit diag_exit()
 	unregister_sysctl_table(diag_sysctl_header);
 }
 
+EXPORT_NO_SYMBOLS;
+MODULE_AUTHOR("openwrt.org");
+MODULE_LICENSE("GPL");
+
 module_init(diag_init);
 module_exit(diag_exit);
diff --git a/openwrt/package/openvpn/Makefile b/openwrt/package/openvpn/Makefile
index 07b0c6395..98119a51e 100644
--- a/openwrt/package/openvpn/Makefile
+++ b/openwrt/package/openvpn/Makefile
@@ -3,9 +3,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openvpn
-PKG_VERSION:=2.0_rc20
+PKG_VERSION:=2.0_rc21
 PKG_RELEASE:=1
-PKG_MD5SUM:=9fd263078c0c18448f7d5a0e0a919f62
+PKG_MD5SUM:=949c51cb6c69da7054613d80042dc5a6
 
 PKG_SOURCE_URL:=http://openvpn.net/release @SF/openvpn
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
diff --git a/openwrt/package/quagga/Makefile b/openwrt/package/quagga/Makefile
index 81008f06b..dda5347d1 100644
--- a/openwrt/package/quagga/Makefile
+++ b/openwrt/package/quagga/Makefile
@@ -3,9 +3,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=quagga
-PKG_VERSION:=0.98.2
+PKG_VERSION:=0.98.3
 PKG_RELEASE:=1
-PKG_MD5SUM:=8757b155aa2458f6158ccd330d0e1b39
+PKG_MD5SUM:=68be5e911e4d604c0f5959338263356e
 
 PKG_SOURCE_URL:=http://www.quagga.net/download/ \
                 http://www.de.quagga.net/download/ \
diff --git a/openwrt/rules.mk b/openwrt/rules.mk
index b8ed526a0..875d515ad 100644
--- a/openwrt/rules.mk
+++ b/openwrt/rules.mk
@@ -69,7 +69,7 @@ TARGET_CC:=$(TARGET_CROSS)gcc
 STRIP:=$(STAGING_DIR)/bin/sstrip
 PATCH=$(SCRIPT_DIR)/patch-kernel.sh
 SED:=$(STAGING_DIR)/bin/sed -i -e
-LINUX_VERSION=2.4.29
+LINUX_VERSION=2.4.30
 LINUX_DIR:=$(BUILD_DIR)/linux
 LINUX_HEADERS_DIR:=$(TOOL_BUILD_DIR)/linux
 LINUX_KERNEL:=$(BUILD_DIR)/buildroot-kernel
diff --git a/openwrt/target/jffs2/Makefile b/openwrt/target/jffs2/Makefile
index 5f155fd70..0e14ac6f2 100644
--- a/openwrt/target/jffs2/Makefile
+++ b/openwrt/target/jffs2/Makefile
@@ -4,7 +4,7 @@ include ./jffs2root.mk
 
 TARGETS:= $(BIN_DIR)/openwrt-generic-jffs2-4MB.trx $(BIN_DIR)/openwrt-generic-jffs2-8MB.trx
 JFFS2OPTS :=  --pad --little-endian --squash -d $(TARGET_DIR)
-JFFS2OPTS += -Xlzo -msize -Xlzari
+#JFFS2OPTS += -Xlzo -msize -Xlzari
 
 prepare: $(MTD_DIR)/.unpacked
 compile: mtd
diff --git a/openwrt/toolchain/kernel-headers/kernel-headers.mk b/openwrt/toolchain/kernel-headers/kernel-headers.mk
index 35a2e6630..b69a6873a 100644
--- a/openwrt/toolchain/kernel-headers/kernel-headers.mk
+++ b/openwrt/toolchain/kernel-headers/kernel-headers.mk
@@ -1,7 +1,7 @@
 # linux kernel headers for toolchain
 
-LINUX_HEADERS_VERSION=2.4.29
-LINUX_KERNEL_MD5SUM:=fcf8b6bb620467f27b657c1c4a60bbff
+LINUX_HEADERS_VERSION=2.4.30
+LINUX_KERNEL_MD5SUM:=75d8ce40a3668603017cd186909efe8d
 LINUX_HEADERS_SITE=http://www.fi.kernel.org/pub/linux/kernel/v2.4 \
 		   http://www.fr.kernel.org/pub/linux/kernel/v2.4 \
 		   http://www.kernel.org/pub/linux/kernel/v2.4 \
author	kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>	2005-04-14 08:39:01 +0000
committer	kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>	2005-04-14 08:39:01 +0000
commit	1dcc8eb95bdfca4d0b492f3bdbec2ca632f47c74 (patch)
tree	bbf4dc9e387787dc6aaa3366f3f5978e877031fa /openwrt
parent	8e6558325dbdff4855cff5ed66235cd624d4c763 (diff)