New upstream CVS snapshot.

- debian/patches/05_halt_on_panic_flag.patch: Sync.
- debian/patches/10_cdromlock.patch: Likewise.
- debian/patches/12_sis900.patch: Likewise.
- debian/patches/13_ide_dma.patch: Likewise.
- debian/patches/61_vm_resident-zoned.patch: Likewise.
- debian/patches/90_autoconf_autogen.patch: Likewise.
- debian/patches/23_ps2_mouse.patch: Removed, integrated upstream.
- debian/patches/50_mem_limit.patch: Likewise.

1 files changed, 31 insertions, 16 deletions

diff --git a/debian/patches/12_sis900.patch b/debian/patches/12_sis900.patch
index 03f2e06..427d518 100644
--- a/debian/patches/12_sis900.patch
+++ b/debian/patches/12_sis900.patch
@@ -11,9 +11,11 @@
 	* linux/src/drivers/net/sis900.h: Likewise.
 
 
---- i386/linux/configure.ac	2006-02-01 22:58:08.000000000 +0200
-+++ i386/linux/configure.ac	2006-02-01 23:31:33.000000000 +0200
-@@ -207,6 +207,7 @@
+Index: i386/linux/configure.ac
+===================================================================
+--- i386/linux/configure.ac.orig	2006-08-20 07:29:24.000000000 +0300
++++ i386/linux/configure.ac	2006-08-26 19:54:37.000000000 +0300
+@@ -212,6 +212,7 @@
  linux_DRIVER([elplus], [ELPLUS], [3c505], [net])
  linux_DRIVER([de600], [DE600], [de600], [net])
  linux_DRIVER([de620], [DE620], [de620], [net])
@@ -21,8 +23,10 @@
  linux_DRIVER([skg16], [SK_G16], [sk_g16], [net])
  linux_DRIVER([ni52], [NI52], [ni52], [net])
  linux_DRIVER([ni65], [NI65], [ni65], [net])
---- i386/linux/Makefile.in	2006-02-01 22:58:08.000000000 +0200
-+++ i386/linux/Makefile.in	2006-02-01 23:34:05.000000000 +0200
+Index: i386/linux/Makefile.in
+===================================================================
+--- i386/linux/Makefile.in.orig	2006-08-20 07:29:24.000000000 +0300
++++ i386/linux/Makefile.in	2006-08-26 19:54:37.000000000 +0300
 @@ -90,7 +90,7 @@
  	eexpress.c epic100.c eth16i.c ewrk3.c fmv18x.c hp-plus.c hp.c hp100.c \
  	lance.c ne.c ne2k-pci.c net_init.c ni52.c ni65.c pcnet32.c rtl8139.c \
@@ -32,17 +36,24 @@
  	cb_shim.c hamachi.c intel-gige.c myson803.c natsemi.c ns820.c \
  	starfire.c sundance.c winbond-840.c \
  	pci-scan.c \
---- i386/README-Drivers	2006-02-01 22:58:07.000000000 +0200
-+++ i386/README-Drivers	2006-02-01 23:34:52.000000000 +0200
-@@ -395,3 +395,6 @@
- 
+Index: i386/README-Drivers
+===================================================================
+--- i386/README-Drivers.orig	2006-08-20 07:29:21.000000000 +0300
++++ i386/README-Drivers	2006-08-26 19:55:48.000000000 +0300
+@@ -396,6 +396,9 @@
  Winbond W89c840 PCI Ethernet
    --enable-winbond-840			net/winbond-840.c
-+
+ 
 +SiS 900
 +  --enable-sis900			net/sis900.c
---- linux/dev/drivers/net/Space.c	2006-02-01 22:58:10.000000000 +0200
-+++ linux/dev/drivers/net/Space.c	2006-02-01 23:31:33.000000000 +0200
++
+ *** pcmcia bridge drivers
+ All source files are relative to .../gnumach/linux/pcmcia-cs.
+ 
+Index: linux/dev/drivers/net/Space.c
+===================================================================
+--- linux/dev/drivers/net/Space.c.orig	2006-02-01 22:58:10.000000000 +0200
++++ linux/dev/drivers/net/Space.c	2006-08-26 19:54:37.000000000 +0300
 @@ -93,6 +93,7 @@
  extern int eepro100_probe(struct device *);
  extern int epic100_probe(struct device *);
@@ -61,8 +72,10 @@
  #ifdef CONFIG_VIA_RHINE
  	&& via_rhine_probe(dev)
  #endif
---- linux/src/drivers/net/sis900.c	1970-01-01 02:00:00.000000000 +0200
-+++ linux/src/drivers/net/sis900.c	2006-02-01 23:31:33.000000000 +0200
+Index: linux/src/drivers/net/sis900.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux/src/drivers/net/sis900.c	2006-08-26 19:54:37.000000000 +0300
 @@ -0,0 +1,1803 @@
 +/* sis900.c: A SiS 900/7016 PCI Fast Ethernet driver for Linux.
 +   Copyright 1999 Silicon Integrated System Corporation
@@ -1867,8 +1880,10 @@
 +}
 +
 +#endif	/* MODULE */
---- linux/src/drivers/net/sis900.h	1970-01-01 02:00:00.000000000 +0200
-+++ linux/src/drivers/net/sis900.h	2006-02-01 23:31:33.000000000 +0200
+Index: linux/src/drivers/net/sis900.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux/src/drivers/net/sis900.h	2006-08-26 19:54:37.000000000 +0300
 @@ -0,0 +1,284 @@
 +/* sis900.h Definitions for SiS ethernet controllers including 7014/7016 and 900
 + * Copyright 1999 Silicon Integrated System Corporation