2.6.14-git6 refresh

2 files changed, 129 insertions, 128 deletions

diff --git a/driver/driver-sample.sh.patch b/driver/driver-sample.sh.patch
index fb9747fd74f08..7e9b2e94334ca 100644
--- a/driver/driver-sample.sh.patch
+++ b/driver/driver-sample.sh.patch
@@ -22,7 +22,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 --- gregkh-2.6.orig/drivers/block/genhd.c
 +++ gregkh-2.6/drivers/block/genhd.c
-@@ -402,6 +402,14 @@ static ssize_t disk_stats_read(struct ge
+@@ -401,6 +401,14 @@ static ssize_t disk_stats_read(struct ge
  		jiffies_to_msecs(disk_stat_read(disk, io_ticks)),
  		jiffies_to_msecs(disk_stat_read(disk, time_in_queue)));
  }
@@ -37,7 +37,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  static struct disk_attribute disk_attr_uevent = {
  	.attr = {.name = "uevent", .mode = S_IWUSR },
  	.store	= disk_uevent_store
-@@ -426,6 +434,10 @@ static struct disk_attribute disk_attr_s
+@@ -425,6 +433,10 @@ static struct disk_attribute disk_attr_s
  	.attr = {.name = "stat", .mode = S_IRUGO },
  	.show	= disk_stats_read
  };
@@ -48,7 +48,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  static struct attribute * default_attrs[] = {
  	&disk_attr_uevent.attr,
-@@ -434,6 +446,7 @@ static struct attribute * default_attrs[
+@@ -433,6 +445,7 @@ static struct attribute * default_attrs[
  	&disk_attr_removable.attr,
  	&disk_attr_size.attr,
  	&disk_attr_stat.attr,
@@ -59,8 +59,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 --- gregkh-2.6.orig/fs/partitions/check.c
 +++ gregkh-2.6/fs/partitions/check.c
 @@ -249,6 +249,15 @@ static ssize_t part_stat_read(struct hd_
- 		       p->reads, (unsigned long long)p->read_sectors,
- 		       p->writes, (unsigned long long)p->write_sectors);
+ 		       p->ios[0], (unsigned long long)p->sectors[0],
+ 		       p->ios[1], (unsigned long long)p->sectors[1]);
  }
 +static ssize_t part_sample_read(struct hd_struct *p, char *page)
 +{
diff --git a/driver/speakup-core.patch b/driver/speakup-core.patch
index 788cda435ce0c..e3270d311e98a 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, 8700 insertions(+), 9 deletions(-)
 
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gregkh-2.6/drivers/char/speakup/cvsversion.h	2005-11-02 09:26:12.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-02 09:26:12.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-02 09:26:12.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-02 09:26:12.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-02 09:26:12.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-02 09:26:12.000000000 -0800
+--- /dev/null
++++ gregkh-2.6/drivers/char/speakup/Kconfig
 @@ -0,0 +1,210 @@
 +menu "Speakup console speech"
 +config SPEAKUP
@@ -1228,8 +1229,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-02 09:26:12.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.
@@ -1350,8 +1351,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-02 09:26:12.000000000 -0800
+--- /dev/null
++++ gregkh-2.6/drivers/char/speakup/Makefile
 @@ -0,0 +1,36 @@
 +#
 +# Makefile for the speakup speech output system.
@@ -1389,8 +1390,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-02 09:26:12.000000000 -0800
+--- /dev/null
++++ gregkh-2.6/drivers/char/speakup/makemapdata.c
 @@ -0,0 +1,156 @@
 +#include <stdlib.h>
 +#include <stdio.h>
@@ -1548,8 +1549,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-02 09:26:12.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,
@@ -1789,8 +1790,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-02 09:26:12.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 */
 +
@@ -1817,8 +1818,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-02 09:26:12.000000000 -0800
+--- /dev/null
++++ gregkh-2.6/drivers/char/speakup/serialio.h
 @@ -0,0 +1,18 @@
 +#ifndef SSPK_SERIAL
 +#define SSPK_SERIAL
@@ -1838,8 +1839,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-02 09:26:12.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. */
 +
@@ -1857,8 +1858,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-02 09:26:12.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>
@@ -2020,8 +2021,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-02 09:26:12.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>
@@ -2207,8 +2208,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-02 09:26:12.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>
@@ -2405,8 +2406,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-02 09:26:12.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>
@@ -2609,8 +2610,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-02 09:26:12.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>
@@ -2786,8 +2787,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-02 09:26:12.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.
@@ -5070,8 +5071,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-02 09:26:12.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
@@ -5124,8 +5125,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-02 09:26:12.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>
@@ -5332,8 +5333,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-02 09:26:12.000000000 -0800
+--- /dev/null
++++ gregkh-2.6/drivers/char/speakup/speakup_decpc.c
 @@ -0,0 +1,242 @@
 +/*
 +* written by David Borowski, david575@golden.net
@@ -5577,8 +5578,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-02 09:26:12.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>
@@ -5801,8 +5802,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-02 09:26:12.000000000 -0800
+--- /dev/null
++++ gregkh-2.6/drivers/char/speakup/speakup_drvcommon.c
 @@ -0,0 +1,879 @@
 +#define KERNEL
 +#include <linux/config.h>
@@ -6683,8 +6684,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-02 09:26:12.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>
@@ -6905,8 +6906,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-02 09:26:12.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. */
 +
@@ -6962,8 +6963,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-02 09:26:12.000000000 -0800
+--- /dev/null
++++ gregkh-2.6/drivers/char/speakup/speakup_keyhelp.c
 @@ -0,0 +1,294 @@
 +/* speakup_keyhelp.c
 +   help module for speakup
@@ -7259,8 +7260,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-02 09:26:12.000000000 -0800
+--- /dev/null
++++ gregkh-2.6/drivers/char/speakup/speakup_keypc.c
 @@ -0,0 +1,189 @@
 +/*
 +* written by David Borowski
@@ -7451,8 +7452,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-02 09:26:12.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>
@@ -7669,8 +7670,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-02 09:26:12.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,
@@ -7736,8 +7737,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-02 09:26:12.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
@@ -7830,8 +7831,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-02 09:26:12.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
@@ -8008,8 +8009,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-02 09:26:12.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>
@@ -8199,8 +8200,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-02 09:26:12.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>
@@ -8397,8 +8398,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-02 09:26:12.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.
@@ -8443,8 +8444,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-02 09:26:12.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.
@@ -8704,8 +8705,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-02 09:26:12.000000000 -0800
+--- /dev/null
++++ gregkh-2.6/drivers/char/speakup/synthlist.h
 @@ -0,0 +1,54 @@
 +/* this is included two times */
 +#if defined(PASS2)
@@ -8761,8 +8762,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-02 09:26:12.000000000 -0800
+--- /dev/null
++++ gregkh-2.6/include/linux/speakup.h
 @@ -0,0 +1,33 @@
 +#ifndef __SPEAKUP_H
 +#define __SPEAKUP_H
@@ -8797,9 +8798,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-02 09:26:10.000000000 -0800
-+++ gregkh-2.6/arch/arm/Kconfig	2005-11-02 09:26:12.000000000 -0800
-@@ -735,6 +735,7 @@
+--- gregkh-2.6.orig/arch/arm/Kconfig
++++ gregkh-2.6/arch/arm/Kconfig
+@@ -742,6 +742,7 @@ source "drivers/mfd/Kconfig"
  source "drivers/media/Kconfig"
  
  source "drivers/video/Kconfig"
@@ -8807,15 +8808,15 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  source "sound/Kconfig"
  
---- gregkh-2.6.orig/drivers/char/consolemap.c	2005-11-02 09:26:10.000000000 -0800
-+++ gregkh-2.6/drivers/char/consolemap.c	2005-11-02 09:26:12.000000000 -0800
-@@ -670,3 +670,4 @@
+--- gregkh-2.6.orig/drivers/char/consolemap.c
++++ gregkh-2.6/drivers/char/consolemap.c
+@@ -670,3 +670,4 @@ console_map_init(void)
  }
  
  EXPORT_SYMBOL(con_copy_unimap);
 +EXPORT_SYMBOL(inverse_translate);
---- gregkh-2.6.orig/drivers/char/keyboard.c	2005-11-02 09:26:10.000000000 -0800
-+++ gregkh-2.6/drivers/char/keyboard.c	2005-11-02 09:26:12.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>
@@ -8830,7 +8831,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
  
@@ -8841,7 +8842,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;
@@ -8850,7 +8851,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,
@@ -8871,7 +8872,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
  				}
  			}
  		}
@@ -8888,7 +8889,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))
@@ -8896,7 +8897,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) {
@@ -8910,7 +8911,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;
@@ -8927,7 +8928,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];
  		}
  	}
@@ -8935,9 +8936,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-02 09:26:10.000000000 -0800
-+++ gregkh-2.6/drivers/char/Makefile	2005-11-02 09:26:12.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
  
@@ -8945,8 +8946,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-02 09:26:10.000000000 -0800
-+++ gregkh-2.6/drivers/char/vt.c	2005-11-02 09:26:12.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>
@@ -8958,7 +8959,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);
@@ -8966,7 +8967,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;
@@ -8974,7 +8975,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;
@@ -8982,7 +8983,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);
@@ -8990,7 +8991,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);
@@ -8998,7 +8999,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:
@@ -9006,7 +9007,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 */
@@ -9014,7 +9015,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;
  	}
@@ -9022,7 +9023,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 */
@@ -9030,7 +9031,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);
@@ -9038,7 +9039,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);
@@ -9046,14 +9047,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-02 09:26:10.000000000 -0800
-+++ gregkh-2.6/drivers/Kconfig	2005-11-02 09:26:12.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"
  
@@ -9062,14 +9063,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-02 09:26:10.000000000 -0800
-+++ gregkh-2.6/drivers/Makefile	2005-11-02 09:26:12.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>
-@@ -27,6 +26,8 @@
+@@ -27,6 +26,8 @@ obj-$(CONFIG_FB_INTEL)          += video
  # serial drivers start registering their serio ports
  obj-$(CONFIG_SERIO)		+= input/serio/
  obj-y				+= serial/
@@ -9078,7 +9079,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/
-@@ -50,7 +51,6 @@
+@@ -50,7 +51,6 @@ obj-$(CONFIG_TC)		+= tc/
  obj-$(CONFIG_USB)		+= usb/
  obj-$(CONFIG_USB_GADGET)	+= usb/gadget/
  obj-$(CONFIG_GAMEPORT)		+= input/gameport/
@@ -9086,9 +9087,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-02 09:26:10.000000000 -0800
-+++ gregkh-2.6/include/linux/keyboard.h	2005-11-02 09:26:12.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
@@ -9096,7 +9097,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
@@ -9104,9 +9105,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  #define MAX_DIACR	256
  #endif
---- gregkh-2.6.orig/MAINTAINERS	2005-11-02 09:26:10.000000000 -0800
-+++ gregkh-2.6/MAINTAINERS	2005-11-02 09:26:12.000000000 -0800
-@@ -2334,6 +2334,13 @@
+--- gregkh-2.6.orig/MAINTAINERS
++++ gregkh-2.6/MAINTAINERS
+@@ -2334,6 +2334,13 @@ M:	wli@holomorphy.com
  L:	sparclinux@vger.kernel.org
  S:	Maintained