usb, pci, and other patches

6 files changed, 346 insertions, 127 deletions

diff --git a/driver/add-more-scm-trees-to-maintainers.patch b/driver/add-more-scm-trees-to-maintainers.patch
new file mode 100644
index 0000000000000..ae8b25b9808ff
--- /dev/null
+++ b/driver/add-more-scm-trees-to-maintainers.patch
@@ -0,0 +1,157 @@
+From jwboyer@gmail.com Mon Nov 21 20:46:43 2005
+Message-ID: <625fc13d0511211911j10f8e87dha9be0b71a298c60d@mail.gmail.com>
+Date: Mon, 21 Nov 2005 21:11:49 -0600
+From: Josh Boyer <jwboyer@gmail.com>
+To: scjody@steamballoon.com, gregkh@suse.de, torvalds@osdl.org, akpm@osdl.org
+Subject: Add more SCM trees to MAINTAINERS
+Cc: linux-kernel@vger.kernel.org
+Content-Disposition: inline
+
+Greg requested a patch to update MAINTAINERS with more SCM entries.
+The patch below is what I've found so far.
+
+Signed-off-by: Josh Boyer <jwboyer@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ MAINTAINERS |   17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
+
+--- gregkh-2.6.orig/MAINTAINERS
++++ gregkh-2.6/MAINTAINERS
+@@ -227,6 +227,7 @@ AGPGART DRIVER
+ P:	Dave Jones
+ M:	davej@codemonkey.org.uk
+ W:	http://www.codemonkey.org.uk/projects/agp/
++T:	git kernel.org:/pub/scm/linux/kernel/git/davej/agpgart.git
+ S:	Maintained
+ 
+ AHA152X SCSI DRIVER
+@@ -384,6 +385,7 @@ P:	David Woodhouse
+ M:	dwmw2@infradead.org
+ L:	linux-audit@redhat.com
+ W:	http://people.redhat.com/sgrubb/audit/
++T:	git kernel.org:/pub/scm/linux/kernel/git/dwmw2/audit-2.6.git
+ S:	Maintained
+ 
+ AX.25 NETWORK LAYER
+@@ -432,6 +434,7 @@ L:	bluez-devel@lists.sf.net
+ W:	http://bluez.sf.net
+ W:	http://www.bluez.org
+ W:	http://www.holtmann.org/linux/bluetooth/
++T:	git kernel.org:/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6.git
+ S:	Maintained
+ 
+ BLUETOOTH RFCOMM LAYER
+@@ -547,6 +550,7 @@ P:	Steve French
+ M:	sfrench@samba.org
+ L:	samba-technical@lists.samba.org
+ W:	http://us1.samba.org/samba/Linux_CIFS_client.html
++T:	git kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git
+ S:	Supported	
+ 
+ CIRRUS LOGIC GENERIC FBDEV DRIVER
+@@ -608,6 +612,7 @@ P:	Dave Jones
+ M:	davej@codemonkey.org.uk
+ L:	cpufreq@lists.linux.org.uk
+ W:	http://www.codemonkey.org.uk/projects/cpufreq/
++T:	git kernel.org/pub/scm/linux/kernel/davej/cpufreq.git
+ S:	Maintained
+ 
+ CPUID/MSR DRIVER
+@@ -641,6 +646,7 @@ M:	herbert@gondor.apana.org.au
+ P:	David S. Miller
+ M:	davem@davemloft.net
+ L:	linux-crypto@vger.kernel.org
++T:	git kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
+ S:	Maintained
+ 
+ CYBERPRO FB DRIVER
+@@ -1185,6 +1191,7 @@ P:	Bartlomiej Zolnierkiewicz
+ M:	B.Zolnierkiewicz@elka.pw.edu.pl
+ L:	linux-kernel@vger.kernel.org
+ L:	linux-ide@vger.kernel.org
++T:	git kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6.git
+ S:	Maintained
+ 
+ IDE/ATAPI CDROM DRIVER
+@@ -1279,6 +1286,7 @@ P:	Vojtech Pavlik
+ M:	vojtech@suse.cz
+ L:	linux-input@atrey.karlin.mff.cuni.cz
+ L:	linux-joystick@atrey.karlin.mff.cuni.cz
++T:	git kernel.org:/pub/scm/linux/kernel/git/dtor/input.git
+ S:	Maintained
+ 
+ INOTIFY
+@@ -1392,6 +1400,7 @@ P:	Kai Germaschewski
+ M:	kai.germaschewski@gmx.de
+ L:	isdn4linux@listserv.isdn4linux.de
+ W:	http://www.isdn4linux.de
++T:	git kernel.org:/pub/scm/linux/kernel/kkeil/isdn-2.6.git
+ S:	Maintained
+ 
+ ISDN SUBSYSTEM (Eicon active card driver)
+@@ -1420,6 +1429,7 @@ P:	Dave Kleikamp
+ M:	shaggy@austin.ibm.com
+ L:	jfs-discussion@lists.sourceforge.net
+ W:	http://jfs.sourceforge.net/
++T:	git kernel.org:/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git
+ S:	Supported
+ 
+ KCONFIG
+@@ -1534,6 +1544,7 @@ P:	Paul Mackerras
+ M:	paulus@samba.org
+ W:	http://www.penguinppc.org/
+ L:	linuxppc-dev@ozlabs.org
++T:	git kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc.git
+ S:	Supported
+ 
+ LINUX FOR POWER MACINTOSH
+@@ -1601,6 +1612,7 @@ P:	Chris Wright
+ M:	chrisw@osdl.org
+ L:	linux-security-module@wirex.com
+ W:	http://lsm.immunix.org
++T:	git kernel.org:/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git
+ S:	Supported
+ 
+ LM83 HARDWARE MONITOR DRIVER
+@@ -1816,6 +1828,7 @@ M:	yoshfuji@linux-ipv6.org
+ P:	Patrick McHardy
+ M:	kaber@coreworks.de
+ L:	netdev@vger.kernel.org
++T:	git kernel.org:/pub/scm/linux/kernel/davem/net-2.6.git
+ S:	Maintained
+ 
+ IPVS
+@@ -1867,6 +1880,7 @@ M:	aia21@cantab.net
+ L:	linux-ntfs-dev@lists.sourceforge.net
+ L:	linux-kernel@vger.kernel.org
+ W:	http://linux-ntfs.sf.net/
++T:	git kernel.org:/pub/scm/linux/kernel/git/aia21/ntfs-2.6.git
+ S:	Maintained
+ 
+ NVIDIA (RIVA) FRAMEBUFFER DRIVER
+@@ -2390,6 +2404,7 @@ P:	Anton Blanchard
+ M:	anton@samba.org
+ L:	sparclinux@vger.kernel.org
+ L:	ultralinux@vger.kernel.org
++T:	git kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6.git
+ S:	Maintained
+ 
+ SHARP LH SUPPORT (LH7952X & LH7A40X)
+@@ -2528,6 +2543,7 @@ P:      Adrian Bunk
+ M:      trivial@kernel.org
+ L:      linux-kernel@vger.kernel.org
+ W:      http://www.kernel.org/pub/linux/kernel/people/bunk/trivial/
++T:      git kernel.org:/pub/scm/linux/kernel/git/bunk/trivial.git
+ S:      Maintained
+ 
+ TMS380 TOKEN-RING NETWORK DRIVER
+@@ -2861,6 +2877,7 @@ P:      Latchesar Ionkov
+ M:      lucho@ionkov.net
+ L:      v9fs-developer@lists.sourceforge.net
+ W:      http://v9fs.sf.net
++T:      git kernel.org:/pub/scm/linux/kernel/ericvh/v9fs-devel.git
+ S:      Maintained
+ 
+ VIDEO FOR LINUX
diff --git a/driver/clarify-t-field-in-maintainers.patch b/driver/clarify-t-field-in-maintainers.patch
new file mode 100644
index 0000000000000..2371d88ec2a35
--- /dev/null
+++ b/driver/clarify-t-field-in-maintainers.patch
@@ -0,0 +1,31 @@
+From scjody@conscoop.ottawa.on.ca Mon Nov 21 13:14:15 2005
+Date: Mon, 21 Nov 2005 15:30:23 -0500
+From: Jody McIntyre <scjody@steamballoon.com>
+To: Pavel Machek <pavel@suse.cz>
+Cc: Greg Kroah-Hartman <gregkh@suse.de>, Linus Torvalds <torvalds@osdl.org>, Andrew Morton <akpm@osdl.org>
+Subject: Clarify T: field in MAINTAINERS
+Message-ID: <20051121203023.GG20781@conscoop.ottawa.on.ca>
+Content-Disposition: inline
+
+Pavel Machek points out that for git repos, what we include is not
+actually a URL.  It is undesirable to use a URL since git repos can be
+accessed in many different ways.
+
+Signed-off-by: Jody McIntyre <scjody@steamballoon.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ MAINTAINERS |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- gregkh-2.6.orig/MAINTAINERS
++++ gregkh-2.6/MAINTAINERS
+@@ -58,7 +58,7 @@ P: Person
+ M: Mail patches to
+ L: Mailing list that is relevant to this area
+ W: Web-page with status/info
+-T: SCM tree type and URL.  Type is one of: git, hg, quilt.
++T: SCM tree type and location.  Type is one of: git, hg, quilt.
+ S: Status, one of the following:
+ 
+ 	Supported:	Someone is actually paid to look after this.
diff --git a/driver/kill-hotplug-word-from-driver-core.patch b/driver/kill-hotplug-word-from-driver-core.patch
index 0a5c91933a091..b68e3e15fb732 100644
--- a/driver/kill-hotplug-word-from-driver-core.patch
+++ b/driver/kill-hotplug-word-from-driver-core.patch
@@ -1001,7 +1001,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  struct input_dev *input_allocate_device(void)
 --- gregkh-2.6.orig/drivers/input/serio/serio.c
 +++ gregkh-2.6/drivers/input/serio/serio.c
-@@ -794,16 +794,16 @@ static int serio_bus_match(struct device
+@@ -800,16 +800,16 @@ static int serio_bus_match(struct device
  
  #ifdef CONFIG_HOTPLUG
  
@@ -1021,7 +1021,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  {
  	struct serio *serio;
  	int i = 0;
-@@ -814,21 +814,21 @@ static int serio_hotplug(struct device *
+@@ -820,21 +820,21 @@ static int serio_hotplug(struct device *
  
  	serio = to_serio_port(dev);
  
@@ -1050,7 +1050,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  {
  	return -ENODEV;
  }
-@@ -902,7 +902,7 @@ static int __init serio_init(void)
+@@ -908,7 +908,7 @@ static int __init serio_init(void)
  	serio_bus.dev_attrs = serio_device_attrs;
  	serio_bus.drv_attrs = serio_driver_attrs;
  	serio_bus.match = serio_bus_match;
diff --git a/driver/mtd-git-tree-location-added-to-maintainers.patch b/driver/mtd-git-tree-location-added-to-maintainers.patch
new file mode 100644
index 0000000000000..6c0f4a7451a8b
--- /dev/null
+++ b/driver/mtd-git-tree-location-added-to-maintainers.patch
@@ -0,0 +1,30 @@
+From jwboyer@gmail.com Mon Nov 21 05:52:34 2005
+Message-ID: <625fc13d0511210612m7c659b9agb7f9a5e1a1de117f@mail.gmail.com>
+Date: Mon, 21 Nov 2005 08:12:56 -0600
+From: Josh Boyer <jwboyer@gmail.com>
+To: Greg KH <greg@kroah.com>
+Subject: MTD git tree location added to MAINTAINERS
+Cc: Greg Kroah-Hartman <gregkh@suse.de>, Linus Torvalds <torvalds@osdl.org>, Andrew Morton <akpm@osdl.org>, scjody@steamballoon.com
+Content-Disposition: inline
+
+Here's the MTD one.  More later as I find them.
+
+Signed-off-by: Josh Boyer <jwboyer@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+diff --git a/MAINTAINERS b/MAINTAINERS
+index c5cf7d7..1e84be3 100644
+---
+ MAINTAINERS |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- gregkh-2.6.orig/MAINTAINERS
++++ gregkh-2.6/MAINTAINERS
+@@ -1695,6 +1695,7 @@ P:	David Woodhouse
+ M:	dwmw2@infradead.org
+ W:	http://www.linux-mtd.infradead.org/
+ L:	linux-mtd@lists.infradead.org
++T:	git kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6.git
+ S:	Maintained
+ 
+ MICROTEK X6 SCANNER
diff --git a/driver/remove-KOBJECT_UEVENT.patch b/driver/remove-KOBJECT_UEVENT.patch
index 131b57a125d74..050c34669f0fe 100644
--- a/driver/remove-KOBJECT_UEVENT.patch
+++ b/driver/remove-KOBJECT_UEVENT.patch
@@ -24,7 +24,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 --- gregkh-2.6.orig/MAINTAINERS
 +++ gregkh-2.6/MAINTAINERS
-@@ -1464,12 +1464,6 @@ W:	http://nfs.sourceforge.net/
+@@ -1474,12 +1474,6 @@ W:	http://nfs.sourceforge.net/
  W:	http://www.cse.unsw.edu.au/~neilb/patches/linux-devel/
  S:	Maintained
  
diff --git a/driver/speakup-core.patch b/driver/speakup-core.patch
index eea4ba9d0c323..d655e6a661391 100644
--- a/driver/speakup-core.patch
+++ b/driver/speakup-core.patch
@@ -52,12 +52,13 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  include/linux/speakup.h                  |   33 
  47 files changed, 8701 insertions(+), 9 deletions(-)
 
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gregkh-2.6/drivers/char/speakup/cvsversion.h	2005-11-20 16:32:17.000000000 -0800
+---
+--- /dev/null
++++ gregkh-2.6/drivers/char/speakup/cvsversion.h
 @@ -0,0 +1 @@
 +#define CVSVERSION " CVS: Wed Mar 2 20:22:02 EST 2005 "
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gregkh-2.6/drivers/char/speakup/dtload.c	2005-11-20 16:32:17.000000000 -0800
+--- /dev/null
++++ gregkh-2.6/drivers/char/speakup/dtload.c
 @@ -0,0 +1,554 @@
 +/*
 + * This is the DECtalk PC firmware loader for the Linux kernel, version 1.0
@@ -613,8 +614,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +  if ( intest ) do_test( );
 +  exit( 0 );
 +}
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gregkh-2.6/drivers/char/speakup/dtload.h	2005-11-20 16:32:17.000000000 -0800
+--- /dev/null
++++ gregkh-2.6/drivers/char/speakup/dtload.h
 @@ -0,0 +1,57 @@
 +/*
 + * This is the DECtalk PC firmware loader for the Linux kernel, version 1.0
@@ -673,8 +674,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +struct dos_reloc {
 +	short int offset, segment;
 +};
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gregkh-2.6/drivers/char/speakup/dtpc_reg.h	2005-11-20 16:32:17.000000000 -0800
+--- /dev/null
++++ gregkh-2.6/drivers/char/speakup/dtpc_reg.h
 @@ -0,0 +1,132 @@
 +/*
 + * This is the DECtalk PC register constants (from DEC's DOS driver)
@@ -808,8 +809,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +#define	DT_DIGITAL_IN		0x08
 +#define	DMA_sync		0x06
 +#define	DMA_sync_char		0x07
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gregkh-2.6/drivers/char/speakup/genmap.c	2005-11-20 16:32:17.000000000 -0800
+--- /dev/null
++++ gregkh-2.6/drivers/char/speakup/genmap.c
 @@ -0,0 +1,204 @@
 +#include <stdlib.h>
 +#include <stdio.h>
@@ -1015,8 +1016,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +	printf( "\n\t0, %d\n", map_ver );
 +	exit( 0 );
 +}
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gregkh-2.6/drivers/char/speakup/Kconfig	2005-11-20 16:32:17.000000000 -0800
+--- /dev/null
++++ gregkh-2.6/drivers/char/speakup/Kconfig
 @@ -0,0 +1,211 @@
 +menu "Speakup console speech"
 +config SPEAKUP
@@ -1229,8 +1230,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +	default "none"
 +
 +endmenu
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gregkh-2.6/drivers/char/speakup/keyinfo.h	2005-11-20 16:32:17.000000000 -0800
+--- /dev/null
++++ gregkh-2.6/drivers/char/speakup/keyinfo.h
 @@ -0,0 +1,119 @@
 +/* spk_priv.h
 +   review functions for the speakup screen review package.
@@ -1351,8 +1352,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +#define PUNCT_INC PUNCT_DEC+1
 +#define VOICE_DEC PUNCT_DEC+2
 +#define VOICE_INC VOICE_DEC+1
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gregkh-2.6/drivers/char/speakup/Makefile	2005-11-20 16:32:17.000000000 -0800
+--- /dev/null
++++ gregkh-2.6/drivers/char/speakup/Makefile
 @@ -0,0 +1,36 @@
 +#
 +# Makefile for the speakup speech output system.
@@ -1390,8 +1391,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +
 +HOSTCFLAGS := -Iinclude -I/usr/include
 +hostprogs-y := makemapdata genmap
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gregkh-2.6/drivers/char/speakup/makemapdata.c	2005-11-20 16:32:17.000000000 -0800
+--- /dev/null
++++ gregkh-2.6/drivers/char/speakup/makemapdata.c
 @@ -0,0 +1,156 @@
 +#include <stdlib.h>
 +#include <stdio.h>
@@ -1549,8 +1550,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +	printf( "\t\".\", 0, 0\n};\n" );
 +	exit( 0 );
 +}
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gregkh-2.6/drivers/char/speakup/mapdata.h	2005-11-20 16:32:17.000000000 -0800
+--- /dev/null
++++ gregkh-2.6/drivers/char/speakup/mapdata.h
 @@ -0,0 +1,238 @@
 +t_key_init init_key_data[] = {
 +	"key_s", 31, -1,
@@ -1790,8 +1791,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +	"vol_inc", 79, -2,
 +	".", 0, 0
 +};
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gregkh-2.6/drivers/char/speakup/mod_code.c	2005-11-20 16:32:17.000000000 -0800
+--- /dev/null
++++ gregkh-2.6/drivers/char/speakup/mod_code.c
 @@ -0,0 +1,25 @@
 +/* this code is to modularize a synth specific file, included at the end */
 +
@@ -1818,8 +1819,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +MODULE_AUTHOR("Kirk Reiser <kirk@braille.uwo.ca>");
 +MODULE_DESCRIPTION("Synthesizer driver module for speakup for the  synth->long_name");
 +MODULE_LICENSE( "GPL" );
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gregkh-2.6/drivers/char/speakup/serialio.h	2005-11-20 16:32:17.000000000 -0800
+--- /dev/null
++++ gregkh-2.6/drivers/char/speakup/serialio.h
 @@ -0,0 +1,18 @@
 +#ifndef SSPK_SERIAL
 +#define SSPK_SERIAL
@@ -1839,8 +1840,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE)
 +
 +#endif
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gregkh-2.6/drivers/char/speakup/speakup_acnt.h	2005-11-20 16:32:17.000000000 -0800
+--- /dev/null
++++ gregkh-2.6/drivers/char/speakup/speakup_acnt.h
 @@ -0,0 +1,16 @@
 +/* speakup_acntpc.h - header file for speakups Accent-PC driver. */
 +
@@ -1858,8 +1859,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +#define SYNTH_FULL  'F' /* synth is full. */
 +#define SYNTH_ALMOST_EMPTY 'M' /* synth has les than 2 seconds of text left */
 +#define SYNTH_SPEAKING 's' /* synth is speaking and has a fare way to go */
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gregkh-2.6/drivers/char/speakup/speakup_acntpc.c	2005-11-20 16:32:17.000000000 -0800
+--- /dev/null
++++ gregkh-2.6/drivers/char/speakup/speakup_acntpc.c
 @@ -0,0 +1,160 @@
 +/*
 + * originially written by: Kirk Reiser <kirk@braille.uwo.ca>
@@ -2021,8 +2022,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +#ifdef MODULE
 +#include "mod_code.c"
 +#endif
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gregkh-2.6/drivers/char/speakup/speakup_acntsa.c	2005-11-20 16:32:17.000000000 -0800
+--- /dev/null
++++ gregkh-2.6/drivers/char/speakup/speakup_acntsa.c
 @@ -0,0 +1,184 @@
 +/*
 + * originially written by: Kirk Reiser <kirk@braille.uwo.ca>
@@ -2208,8 +2209,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +#ifdef MODULE
 +#include "mod_code.c"
 +#endif
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gregkh-2.6/drivers/char/speakup/speakup_apollo.c	2005-11-20 16:32:17.000000000 -0800
+--- /dev/null
++++ gregkh-2.6/drivers/char/speakup/speakup_apollo.c
 @@ -0,0 +1,195 @@
 +/*
 + * originially written by: Kirk Reiser <kirk@braille.uwo.ca>
@@ -2406,8 +2407,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +#ifdef MODULE
 +#include "mod_code.c"
 +#endif
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gregkh-2.6/drivers/char/speakup/speakup_audptr.c	2005-11-20 16:32:17.000000000 -0800
+--- /dev/null
++++ gregkh-2.6/drivers/char/speakup/speakup_audptr.c
 @@ -0,0 +1,201 @@
 +/*
 + * originially written by: Kirk Reiser <kirk@braille.uwo.ca>
@@ -2610,8 +2611,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +#ifdef MODULE
 +#include "mod_code.c"
 +#endif
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gregkh-2.6/drivers/char/speakup/speakup_bns.c	2005-11-20 16:32:17.000000000 -0800
+--- /dev/null
++++ gregkh-2.6/drivers/char/speakup/speakup_bns.c
 @@ -0,0 +1,174 @@
 +/*
 + * originially written by: Kirk Reiser <kirk@braille.uwo.ca>
@@ -2787,8 +2788,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +#ifdef MODULE
 +#include "mod_code.c"
 +#endif
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gregkh-2.6/drivers/char/speakup/speakup.c	2005-11-20 16:32:17.000000000 -0800
+--- /dev/null
++++ gregkh-2.6/drivers/char/speakup/speakup.c
 @@ -0,0 +1,2281 @@
 +/* speakup.c
 +   review functions for the speakup screen review package.
@@ -5071,8 +5072,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +module_exit( mod_speakup_exit );
 +
 +#endif
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gregkh-2.6/drivers/char/speakup/speakupconf	2005-11-20 16:32:17.000000000 -0800
+--- /dev/null
++++ gregkh-2.6/drivers/char/speakup/speakupconf
 @@ -0,0 +1,51 @@
 +#!/bin/sh
 +# script to load/save all the vars in speakup
@@ -5125,8 +5126,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +  exit 1
 +;;
 +esac
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gregkh-2.6/drivers/char/speakup/speakup_decext.c	2005-11-20 16:32:17.000000000 -0800
+--- /dev/null
++++ gregkh-2.6/drivers/char/speakup/speakup_decext.c
 @@ -0,0 +1,205 @@
 +/*
 + * originially written by: Kirk Reiser <kirk@braille.uwo.ca>
@@ -5333,8 +5334,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +#ifdef MODULE
 +#include "mod_code.c"
 +#endif
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gregkh-2.6/drivers/char/speakup/speakup_decpc.c	2005-11-20 16:32:17.000000000 -0800
+--- /dev/null
++++ gregkh-2.6/drivers/char/speakup/speakup_decpc.c
 @@ -0,0 +1,242 @@
 +/*
 +* written by David Borowski, david575@golden.net
@@ -5578,8 +5579,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +#ifdef MODULE
 +#include "mod_code.c"
 +#endif
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gregkh-2.6/drivers/char/speakup/speakup_dectlk.c	2005-11-20 16:32:17.000000000 -0800
+--- /dev/null
++++ gregkh-2.6/drivers/char/speakup/speakup_dectlk.c
 @@ -0,0 +1,221 @@
 +/*
 + * originially written by: Kirk Reiser <kirk@braille.uwo.ca>
@@ -5802,8 +5803,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +#ifdef MODULE
 +#include "mod_code.c"
 +#endif
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gregkh-2.6/drivers/char/speakup/speakup_drvcommon.c	2005-11-20 16:32:17.000000000 -0800
+--- /dev/null
++++ gregkh-2.6/drivers/char/speakup/speakup_drvcommon.c
 @@ -0,0 +1,879 @@
 +#define KERNEL
 +#include <linux/config.h>
@@ -6684,8 +6685,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +MODULE_AUTHOR("Kirk Reiser <kirk@braille.uwo.ca>");
 +MODULE_DESCRIPTION("Speakup module required by all synthesizer specific modules");
 +MODULE_LICENSE("GPL");
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gregkh-2.6/drivers/char/speakup/speakup_dtlk.c	2005-11-20 16:32:17.000000000 -0800
+--- /dev/null
++++ gregkh-2.6/drivers/char/speakup/speakup_dtlk.c
 @@ -0,0 +1,219 @@
 +/*
 + * originially written by: Kirk Reiser <kirk@braille.uwo.ca>
@@ -6906,8 +6907,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +#ifdef MODULE
 +#include "mod_code.c"
 +#endif
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gregkh-2.6/drivers/char/speakup/speakup_dtlk.h	2005-11-20 16:32:17.000000000 -0800
+--- /dev/null
++++ gregkh-2.6/drivers/char/speakup/speakup_dtlk.h
 @@ -0,0 +1,54 @@
 +/* speakup_dtlk.h - header file for speakups DoubleTalk driver. */
 +
@@ -6963,8 +6964,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +	                                 parameter block */
 +	u_char has_indexing;	/* nonzero if indexing is implemented */
 +};
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gregkh-2.6/drivers/char/speakup/speakup_keyhelp.c	2005-11-20 16:32:17.000000000 -0800
+--- /dev/null
++++ gregkh-2.6/drivers/char/speakup/speakup_keyhelp.c
 @@ -0,0 +1,294 @@
 +/* speakup_keyhelp.c
 +   help module for speakup
@@ -7260,8 +7261,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +MODULE_AUTHOR("David Borowski");
 +MODULE_DESCRIPTION("Speakup keyboard help MODULE");
 +MODULE_LICENSE("GPL");
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gregkh-2.6/drivers/char/speakup/speakup_keypc.c	2005-11-20 16:32:17.000000000 -0800
+--- /dev/null
++++ gregkh-2.6/drivers/char/speakup/speakup_keypc.c
 @@ -0,0 +1,189 @@
 +/*
 +* written by David Borowski
@@ -7452,8 +7453,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +#ifdef MODULE
 +#include "mod_code.c"
 +#endif
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gregkh-2.6/drivers/char/speakup/speakup_ltlk.c	2005-11-20 16:32:17.000000000 -0800
+--- /dev/null
++++ gregkh-2.6/drivers/char/speakup/speakup_ltlk.c
 @@ -0,0 +1,215 @@
 +/*
 + * originally written by: Kirk Reiser <kirk@braille.uwo.ca>
@@ -7670,8 +7671,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +#ifdef MODULE
 +#include "mod_code.c"
 +#endif
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gregkh-2.6/drivers/char/speakup/speakupmap.h	2005-11-20 16:32:17.000000000 -0800
+--- /dev/null
++++ gregkh-2.6/drivers/char/speakup/speakupmap.h
 @@ -0,0 +1,64 @@
 +	119, 61, 6,
 +	0, 16, 17, 32, 20, 48, 0,
@@ -7737,8 +7738,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +	109, 0, 7, 0, 0, 0, 0,
 +	125, 128, 128, 0, 0, 0, 0,
 +	0, 119
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gregkh-2.6/drivers/char/speakup/speakupmap.map	2005-11-20 16:32:17.000000000 -0800
+--- /dev/null
++++ gregkh-2.6/drivers/char/speakup/speakupmap.map
 @@ -0,0 +1,91 @@
 +spk key_f9 = punc_level_dec
 +spk key_f10 = punc_level_inc
@@ -7831,8 +7832,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +spk key_8 = speakup_paste
 +shift spk key_m = say_first_char
 + ctrl spk key_semicolon = say_last_char
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gregkh-2.6/drivers/char/speakup/speakup_sftsyn.c	2005-11-20 16:32:17.000000000 -0800
+--- /dev/null
++++ gregkh-2.6/drivers/char/speakup/speakup_sftsyn.c
 @@ -0,0 +1,175 @@
 +/* speakup_sftsynth.c - speakup driver to register and make available
 + * a user space device for software synthesizers.  written by: Kirk
@@ -8009,8 +8010,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +#ifdef MODULE
 +#include "mod_code.c"
 +#endif
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gregkh-2.6/drivers/char/speakup/speakup_spkout.c	2005-11-20 16:32:17.000000000 -0800
+--- /dev/null
++++ gregkh-2.6/drivers/char/speakup/speakup_spkout.c
 @@ -0,0 +1,188 @@
 +/*
 + * originially written by: Kirk Reiser <kirk@braille.uwo.ca>
@@ -8200,8 +8201,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +#ifdef MODULE
 +#include "mod_code.c"
 +#endif
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gregkh-2.6/drivers/char/speakup/speakup_txprt.c	2005-11-20 16:32:17.000000000 -0800
+--- /dev/null
++++ gregkh-2.6/drivers/char/speakup/speakup_txprt.c
 @@ -0,0 +1,195 @@
 +/*
 + * originially written by: Kirk Reiser <kirk@braille.uwo.ca>
@@ -8398,8 +8399,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +#ifdef MODULE
 +#include "mod_code.c"
 +#endif
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gregkh-2.6/drivers/char/speakup/spk_con_module.h	2005-11-20 16:32:17.000000000 -0800
+--- /dev/null
++++ gregkh-2.6/drivers/char/speakup/spk_con_module.h
 @@ -0,0 +1,43 @@
 +/* written bby David Borowski.
 +    Copyright (C ) 2003  David Borowski.
@@ -8444,8 +8445,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +}
 +
 +EXPORT_SYMBOL(speakup_set_addresses);
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gregkh-2.6/drivers/char/speakup/spk_priv.h	2005-11-20 16:32:17.000000000 -0800
+--- /dev/null
++++ gregkh-2.6/drivers/char/speakup/spk_priv.h
 @@ -0,0 +1,258 @@
 +/* spk_priv.h
 +   review functions for the speakup screen review package.
@@ -8705,8 +8706,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +#endif
 +
 +#endif
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gregkh-2.6/drivers/char/speakup/synthlist.h	2005-11-20 16:32:17.000000000 -0800
+--- /dev/null
++++ gregkh-2.6/drivers/char/speakup/synthlist.h
 @@ -0,0 +1,54 @@
 +/* this is included two times */
 +#if defined(PASS2)
@@ -8762,8 +8763,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +
 +#undef SYNTH_DECL
 +#undef CFG_TEST
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gregkh-2.6/include/linux/speakup.h	2005-11-20 16:32:17.000000000 -0800
+--- /dev/null
++++ gregkh-2.6/include/linux/speakup.h
 @@ -0,0 +1,33 @@
 +#ifndef __SPEAKUP_H
 +#define __SPEAKUP_H
@@ -8798,9 +8799,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +static inline void speakup_init(struct vc_data *vc) { }
 +#endif
 +#endif
---- gregkh-2.6.orig/arch/arm/Kconfig	2005-11-20 16:32:15.000000000 -0800
-+++ gregkh-2.6/arch/arm/Kconfig	2005-11-20 16:32:17.000000000 -0800
-@@ -741,6 +741,7 @@
+--- gregkh-2.6.orig/arch/arm/Kconfig
++++ gregkh-2.6/arch/arm/Kconfig
+@@ -741,6 +741,7 @@ source "drivers/mfd/Kconfig"
  source "drivers/media/Kconfig"
  
  source "drivers/video/Kconfig"
@@ -8808,15 +8809,15 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  source "sound/Kconfig"
  
---- gregkh-2.6.orig/drivers/char/consolemap.c	2005-11-20 16:32:15.000000000 -0800
-+++ gregkh-2.6/drivers/char/consolemap.c	2005-11-20 16:32:17.000000000 -0800
-@@ -668,3 +668,4 @@
+--- gregkh-2.6.orig/drivers/char/consolemap.c
++++ gregkh-2.6/drivers/char/consolemap.c
+@@ -668,3 +668,4 @@ console_map_init(void)
  }
  
  EXPORT_SYMBOL(con_copy_unimap);
 +EXPORT_SYMBOL(inverse_translate);
---- gregkh-2.6.orig/drivers/char/keyboard.c	2005-11-20 16:32:15.000000000 -0800
-+++ gregkh-2.6/drivers/char/keyboard.c	2005-11-20 16:32:17.000000000 -0800
+--- gregkh-2.6.orig/drivers/char/keyboard.c
++++ gregkh-2.6/drivers/char/keyboard.c
 @@ -40,6 +40,13 @@
  #include <linux/sysrq.h>
  #include <linux/input.h>
@@ -8831,7 +8832,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  static void kbd_disconnect(struct input_handle *handle);
  extern void ctrl_alt_del(void);
  
-@@ -64,6 +71,10 @@
+@@ -64,6 +71,10 @@ extern void ctrl_alt_del(void);
  
  #define KBD_DEFLOCK 0
  
@@ -8842,7 +8843,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  void compute_shiftstate(void);
  
  /*
-@@ -79,7 +90,7 @@
+@@ -79,7 +90,7 @@ void compute_shiftstate(void);
  typedef void (k_handler_fn)(struct vc_data *vc, unsigned char value,
  			    char up_flag, struct pt_regs *regs);
  static k_handler_fn K_HANDLERS;
@@ -8851,7 +8852,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  #define FN_HANDLERS\
  	fn_null,	fn_enter,	fn_show_ptregs,	fn_show_mem,\
-@@ -100,15 +111,18 @@
+@@ -100,15 +111,18 @@ static fn_handler_fn *fn_handler[] = { F
  const int max_vals[] = {
  	255, ARRAY_SIZE(func_table) - 1, ARRAY_SIZE(fn_handler) - 1, NR_PAD - 1,
  	NR_DEAD - 1, 255, 3, NR_SHIFT - 1, 255, NR_ASCII - 1, NR_LOCK - 1,
@@ -8872,7 +8873,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  int spawnpid, spawnsig;
  
  /*
-@@ -255,12 +269,14 @@
+@@ -255,12 +269,14 @@ void kd_mksound(unsigned int hz, unsigne
  				}
  			}
  		}
@@ -8889,7 +8890,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  /*
   * Setting the keyboard rate.
   */
-@@ -602,6 +618,7 @@
+@@ -602,6 +618,7 @@ static void k_spec(struct vc_data *vc, u
  	if (up_flag)
  		return;
  	if (value >= ARRAY_SIZE(fn_handler))
@@ -8897,7 +8898,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  		return;
  	if ((kbd->kbdmode == VC_RAW ||
  	     kbd->kbdmode == VC_MEDIUMRAW) &&
-@@ -1119,6 +1136,13 @@
+@@ -1119,6 +1136,13 @@ static void kbd_keycode(unsigned int key
  	key_map = key_maps[shift_final];
  
  	if (!key_map) {
@@ -8911,7 +8912,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  		compute_shiftstate();
  		kbd->slockstate = 0;
  		return;
-@@ -1137,8 +1161,15 @@
+@@ -1137,8 +1161,15 @@ static void kbd_keycode(unsigned int key
  	}
  
  	type -= 0xf0;
@@ -8928,7 +8929,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  		return;
  
  	if (type == KT_LETTER) {
-@@ -1149,7 +1180,6 @@
+@@ -1149,7 +1180,6 @@ static void kbd_keycode(unsigned int key
  				keysym = key_map[keycode];
  		}
  	}
@@ -8936,9 +8937,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	(*k_handler[type])(vc, keysym & 0xff, !down, regs);
  
  	if (type != KT_SLOCK)
---- gregkh-2.6.orig/drivers/char/Makefile	2005-11-20 16:32:15.000000000 -0800
-+++ gregkh-2.6/drivers/char/Makefile	2005-11-20 16:32:17.000000000 -0800
-@@ -84,6 +84,7 @@
+--- gregkh-2.6.orig/drivers/char/Makefile
++++ gregkh-2.6/drivers/char/Makefile
+@@ -84,6 +84,7 @@ obj-$(CONFIG_GPIO_VR41XX) += vr41xx_giu.
  obj-$(CONFIG_TANBAC_TB0219) += tb0219.o
  obj-$(CONFIG_TELCLOCK) += tlclk.o
  
@@ -8946,8 +8947,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  obj-$(CONFIG_WATCHDOG)	+= watchdog/
  obj-$(CONFIG_MWAVE) += mwave/
  obj-$(CONFIG_AGP) += agp/
---- gregkh-2.6.orig/drivers/char/vt.c	2005-11-20 16:32:15.000000000 -0800
-+++ gregkh-2.6/drivers/char/vt.c	2005-11-20 16:32:17.000000000 -0800
+--- gregkh-2.6.orig/drivers/char/vt.c
++++ gregkh-2.6/drivers/char/vt.c
 @@ -98,6 +98,10 @@
  #include <asm/system.h>
  #include <asm/uaccess.h>
@@ -8959,7 +8960,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  const struct consw *conswitchp;
  
-@@ -725,6 +729,7 @@
+@@ -725,6 +729,7 @@ int vc_allocate(unsigned int currcons)	/
  	    }
  	    vc->vc_kmalloced = 1;
  	    vc_init(vc, vc->vc_rows, vc->vc_cols, 1);
@@ -8967,7 +8968,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	}
  	return 0;
  }
-@@ -978,6 +983,7 @@
+@@ -978,6 +983,7 @@ static void lf(struct vc_data *vc)
  		vc->vc_pos += vc->vc_size_row;
  	}
  	vc->vc_need_wrap = 0;
@@ -8975,7 +8976,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  }
  
  static void ri(struct vc_data *vc)
-@@ -1006,6 +1012,7 @@
+@@ -1006,6 +1012,7 @@ static inline void bs(struct vc_data *vc
  		vc->vc_pos -= 2;
  		vc->vc_x--;
  		vc->vc_need_wrap = 0;
@@ -8983,7 +8984,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	}
  }
  
-@@ -1543,6 +1550,7 @@
+@@ -1543,6 +1550,7 @@ static void do_con_trol(struct tty_struc
  				break;
  		}
  		vc->vc_pos += (vc->vc_x << 1);
@@ -8991,7 +8992,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  		return;
  	case 10: case 11: case 12:
  		lf(vc);
-@@ -2073,6 +2081,7 @@
+@@ -2073,6 +2081,7 @@ static int do_con_write(struct tty_struc
  			}
  			if (vc->vc_decim)
  				insert_char(vc, 1);
@@ -8999,7 +9000,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  			scr_writew(himask ?
  				     ((vc->vc_attr << 8) & ~himask) + ((tc & 0x100) ? himask : 0) + (tc & 0xff) :
  				     (vc->vc_attr << 8) + tc,
-@@ -2098,6 +2107,7 @@
+@@ -2098,6 +2107,7 @@ static int do_con_write(struct tty_struc
  	release_console_sem();
  
  out:
@@ -9007,7 +9008,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	return n;
  #undef FLUSH
  }
-@@ -2123,6 +2133,7 @@
+@@ -2123,6 +2133,7 @@ static void console_callback(void *ignor
  			/* we only changed when the console had already
  			   been allocated - a new console is not created
  			   in an interrupt routine */
@@ -9015,7 +9016,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  		}
  		want_console = -1;
  	}
-@@ -2141,6 +2152,7 @@
+@@ -2141,6 +2152,7 @@ static void console_callback(void *ignor
  		do_blank_screen(0);
  		blank_timer_expired = 0;
  	}
@@ -9023,7 +9024,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  	release_console_sem();
  }
-@@ -2198,6 +2210,7 @@
+@@ -2198,6 +2210,7 @@ static void vt_console_print(struct cons
  
  	/* Contrived structure to try to emulate original need_wrap behaviour
  	 * Problems caused when we have need_wrap set on '\n' character */
@@ -9031,7 +9032,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	while (count--) {
  		c = *b++;
  		if (c == 10 || c == 13 || c == 8 || vc->vc_need_wrap) {
-@@ -2242,6 +2255,7 @@
+@@ -2242,6 +2255,7 @@ static void vt_console_print(struct cons
  		}
  	}
  	set_cursor(vc);
@@ -9039,7 +9040,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  quit:
  	clear_bit(0, &printing);
-@@ -2587,6 +2601,7 @@
+@@ -2587,6 +2601,7 @@ static int __init con_init(void)
  	master_display_fg = vc = vc_cons[currcons].d;
  	set_origin(vc);
  	save_screen(vc);
@@ -9047,14 +9048,14 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	gotoxy(vc, vc->vc_x, vc->vc_y);
  	csi_J(vc, 0);
  	update_screen(vc);
-@@ -3279,3 +3294,4 @@
+@@ -3279,3 +3294,4 @@ EXPORT_SYMBOL(vc_cons);
  EXPORT_SYMBOL(take_over_console);
  EXPORT_SYMBOL(give_up_console);
  #endif
 +EXPORT_SYMBOL(screen_glyph);
---- gregkh-2.6.orig/drivers/Kconfig	2005-11-20 16:32:15.000000000 -0800
-+++ gregkh-2.6/drivers/Kconfig	2005-11-20 16:32:17.000000000 -0800
-@@ -56,6 +56,8 @@
+--- gregkh-2.6.orig/drivers/Kconfig
++++ gregkh-2.6/drivers/Kconfig
+@@ -56,6 +56,8 @@ source "drivers/media/Kconfig"
  
  source "drivers/video/Kconfig"
  
@@ -9063,14 +9064,14 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  source "sound/Kconfig"
  
  source "drivers/usb/Kconfig"
---- gregkh-2.6.orig/drivers/Makefile	2005-11-20 16:32:15.000000000 -0800
-+++ gregkh-2.6/drivers/Makefile	2005-11-20 16:32:17.000000000 -0800
+--- gregkh-2.6.orig/drivers/Makefile
++++ gregkh-2.6/drivers/Makefile
 @@ -1,4 +1,3 @@
 -#
  # Makefile for the Linux kernel device drivers.
  #
  # 15 Sep 2000, Christoph Hellwig <hch@infradead.org>
-@@ -28,6 +27,8 @@
+@@ -28,6 +27,8 @@ obj-$(CONFIG_FB_INTEL)          += video
  # serial drivers start registering their serio ports
  obj-$(CONFIG_SERIO)		+= input/serio/
  obj-y				+= serial/
@@ -9079,7 +9080,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  obj-$(CONFIG_PARPORT)		+= parport/
  obj-y				+= base/ block/ misc/ mfd/ net/ media/
  obj-$(CONFIG_NUBUS)		+= nubus/
-@@ -51,7 +52,6 @@
+@@ -51,7 +52,6 @@ obj-$(CONFIG_TC)		+= tc/
  obj-$(CONFIG_USB)		+= usb/
  obj-$(CONFIG_USB_GADGET)	+= usb/gadget/
  obj-$(CONFIG_GAMEPORT)		+= input/gameport/
@@ -9087,9 +9088,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  obj-$(CONFIG_I2O)		+= message/
  obj-$(CONFIG_I2C)		+= i2c/
  obj-$(CONFIG_W1)		+= w1/
---- gregkh-2.6.orig/include/linux/keyboard.h	2005-11-20 16:32:15.000000000 -0800
-+++ gregkh-2.6/include/linux/keyboard.h	2005-11-20 16:32:17.000000000 -0800
-@@ -44,6 +44,7 @@
+--- gregkh-2.6.orig/include/linux/keyboard.h
++++ gregkh-2.6/include/linux/keyboard.h
+@@ -44,6 +44,7 @@ extern unsigned short plain_map[NR_KEYS]
  #define KT_ASCII	9
  #define KT_LOCK		10
  #define KT_SLOCK	12
@@ -9097,7 +9098,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  #define K(t,v)		(((t)<<8)|(v))
  #define KTYP(x)		((x) >> 8)
-@@ -426,6 +427,7 @@
+@@ -426,6 +427,7 @@ extern unsigned short plain_map[NR_KEYS]
  #define K_CTRLR_SLOCK	K(KT_SLOCK,KG_CTRLR)
  
  #define NR_LOCK		8
@@ -9105,9 +9106,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  #define MAX_DIACR	256
  #endif
---- gregkh-2.6.orig/MAINTAINERS	2005-11-20 16:32:15.000000000 -0800
-+++ gregkh-2.6/MAINTAINERS	2005-11-20 16:32:17.000000000 -0800
-@@ -2410,6 +2410,13 @@
+--- gregkh-2.6.orig/MAINTAINERS
++++ gregkh-2.6/MAINTAINERS
+@@ -2426,6 +2426,13 @@ M:	wli@holomorphy.com
  L:	sparclinux@vger.kernel.org
  S:	Maintained