refresh the driver patches

8 files changed, 137 insertions, 110 deletions

diff --git a/driver/add-uevent_helper.patch b/driver/add-uevent_helper.patch
index 2d6e59f72c843..9fb9576a904ec 100644
--- a/driver/add-uevent_helper.patch
+++ b/driver/add-uevent_helper.patch
@@ -22,12 +22,13 @@ support truncate().)
 Signed-off-by: Kay Sievers <kay.sievers@suse.de>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
+---
  kernel/ksysfs.c |   25 ++++++++++++++++++++++---
  1 file changed, 22 insertions(+), 3 deletions(-)
 
---- gregkh-2.6.orig/kernel/ksysfs.c	2005-08-28 16:41:01.000000000 -0700
-+++ gregkh-2.6/kernel/ksysfs.c	2005-11-12 20:58:39.000000000 -0800
-@@ -23,11 +23,29 @@
+--- gregkh-2.6.orig/kernel/ksysfs.c
++++ gregkh-2.6/kernel/ksysfs.c
+@@ -23,11 +23,29 @@ static struct subsys_attribute _name##_a
  	__ATTR(_name, 0644, _name##_show, _name##_store)
  
  #ifdef CONFIG_HOTPLUG
@@ -59,7 +60,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  #endif
  
  #ifdef CONFIG_KEXEC
-@@ -45,7 +63,8 @@
+@@ -45,7 +63,8 @@ EXPORT_SYMBOL_GPL(kernel_subsys);
  
  static struct attribute * kernel_attrs[] = {
  #ifdef CONFIG_HOTPLUG
diff --git a/driver/driver-model-wakeup-03.patch b/driver/driver-model-wakeup-03.patch
index b9249e5b88acb..a05e5bff99846 100644
--- a/driver/driver-model-wakeup-03.patch
+++ b/driver/driver-model-wakeup-03.patch
@@ -24,9 +24,6 @@ more closely, and just grow a new "pci_dev_init" function.)
 Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
- drivers/pci/pci.c   |    4 ++++
- drivers/pci/probe.c |   16 +++++++++++++++-
- 2 files changed, 19 insertions(+), 1 deletion(-)
 
 --- gregkh-2.6.orig/drivers/pci/probe.c	2005-11-12 13:59:16.000000000 -0800
 +++ gregkh-2.6/drivers/pci/probe.c	2005-11-12 13:59:22.000000000 -0800
diff --git a/driver/merge-hotplug-and-uevent.patch b/driver/merge-hotplug-and-uevent.patch
index e00f80d3d0b5e..051ddb26e25b1 100644
--- a/driver/merge-hotplug-and-uevent.patch
+++ b/driver/merge-hotplug-and-uevent.patch
@@ -7,25 +7,30 @@ merge kobject_uevent and kobject_hotplug
 The distinction between hotplug and uevent does not make sense these
 days, netlink events are the default.
 
-udev depends entirely on netlink uevents these days. Only during
-early boot and in initramfs /sbin/hotplug is needed. So merge the
-two functions and provide only one interface.
+udev depends entirely on netlink uevents. Only during early boot and
+in initramfs, /sbin/hotplug is needed. So merge the two functions and
+provide only one interface without all the options.
 
 The netlink layer got a nice generic interface with named slots
-recently, which are a better facility to plug events for individual
-subsystems.
+recently, which is probably a better facility to plug events for
+subsystem specific events.
+Also the new poll() interface to /proc/mounts is a nicer way to
+notify about changes than sending events through the core.
+The uevents should only be used for driver core related requests to
+userspace now.
 
 Signed-off-by: Kay Sievers <kay.sievers@suse.de>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
+---
  drivers/scsi/ipr.c      |    2 
  include/linux/kobject.h |   27 +---
- lib/kobject_uevent.c    |  264 +++++++++++++++---------------------------------
- 3 files changed, 92 insertions(+), 201 deletions(-)
+ lib/kobject_uevent.c    |  283 ++++++++++++++++--------------------------------
+ 3 files changed, 104 insertions(+), 208 deletions(-)
 
---- gregkh-2.6.orig/drivers/scsi/ipr.c	2005-11-11 22:48:24.000000000 -0800
-+++ gregkh-2.6/drivers/scsi/ipr.c	2005-11-12 20:58:44.000000000 -0800
-@@ -2132,7 +2132,7 @@
+--- gregkh-2.6.orig/drivers/scsi/ipr.c
++++ gregkh-2.6/drivers/scsi/ipr.c
+@@ -2132,7 +2132,7 @@ restart:
  	}
  
  	spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
@@ -34,9 +39,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	LEAVE;
  }
  
---- gregkh-2.6.orig/include/linux/kobject.h	2005-11-12 20:58:43.000000000 -0800
-+++ gregkh-2.6/include/linux/kobject.h	2005-11-12 20:58:44.000000000 -0800
-@@ -39,11 +39,11 @@
+--- gregkh-2.6.orig/include/linux/kobject.h
++++ gregkh-2.6/include/linux/kobject.h
+@@ -39,11 +39,11 @@ extern u64 hotplug_seqnum;
  /* the actions here must match the proper string in lib/kobject_uevent.c */
  typedef int __bitwise kobject_action_t;
  enum kobject_action {
@@ -53,7 +58,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  };
  
  struct kobject {
-@@ -262,28 +262,13 @@
+@@ -262,28 +262,13 @@ int add_hotplug_env_var(char **envp, int
  			char *buffer, int buffer_size, int *cur_len,
  			const char *format, ...)
  	__attribute__((format (printf, 7, 8)));
@@ -83,8 +88,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  #endif
  
  #endif /* __KERNEL__ */
---- gregkh-2.6.orig/lib/kobject_uevent.c	2005-11-12 20:58:43.000000000 -0800
-+++ gregkh-2.6/lib/kobject_uevent.c	2005-11-12 20:58:44.000000000 -0800
+--- gregkh-2.6.orig/lib/kobject_uevent.c
++++ gregkh-2.6/lib/kobject_uevent.c
 @@ -29,6 +29,7 @@
  char hotplug_path[HOTPLUG_PATH_LEN] = "/sbin/hotplug";
  u64 hotplug_seqnum;
@@ -93,7 +98,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  static char *action_to_string(enum kobject_action action)
  {
-@@ -48,123 +49,6 @@
+@@ -48,123 +49,6 @@ static char *action_to_string(enum kobje
  	}
  }
  
@@ -217,30 +222,40 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  /**
   * kobject_hotplug - notify userspace by executing /sbin/hotplug
   *
-@@ -180,88 +64,80 @@
+@@ -173,95 +57,84 @@ postcore_initcall(kobject_uevent_init);
+  */
+ void kobject_hotplug(struct kobject *kobj, enum kobject_action action)
+ {
+-	char *argv [3];
+-	char **envp = NULL;
+-	char *buffer = NULL;
+-	char *seq_buff;
++	char **envp;
++	char *buffer;
  	char *scratch;
++	const char *action_string;
++	const char *devpath = NULL;
++	const char *subsystem;
++	struct kobject *top_kobj;
++	struct kset *kset;
++	struct kset_hotplug_ops *hotplug_ops;
++	u64 seq;
++	char *seq_buff;
  	int i = 0;
  	int retval;
 -	char *kobj_path = NULL;
 -	const char *name = NULL;
-+	size_t len;
-+	char *devpath = NULL;
-+	const char *subsystem = NULL;
- 	char *action_string;
- 	u64 seq;
+-	char *action_string;
+-	u64 seq;
 -	struct kobject *top_kobj = kobj;
 -	struct kset *kset;
 -	static struct kset_hotplug_ops null_hotplug_ops;
 -	struct kset_hotplug_ops *hotplug_ops = &null_hotplug_ops;
-+	struct kobject *top_kobj;
-+	struct kset *kset = NULL;
-+	struct kset_hotplug_ops *hotplug_ops = NULL;
-+	struct sk_buff *skb;
-+
-+	pr_debug("%s\n", __FUNCTION__);
  
 -	/* If this kobj does not belong to a kset,
 -	   try to find a parent that does. */
++	pr_debug("%s\n", __FUNCTION__);
++
 +	action_string = action_to_string(action);
 +	if (!action_string)
 +		return;
@@ -254,15 +269,15 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	}
 -
 -	if (top_kobj->kset)
-+	if (top_kobj->kset) {
- 		kset = top_kobj->kset;
+-		kset = top_kobj->kset;
 -	else
--		return;
--
++	if (!top_kobj->kset)
+ 		return;
+ 
 -	if (kset->hotplug_ops)
- 		hotplug_ops = kset->hotplug_ops;
-+	} else
-+		return;
+-		hotplug_ops = kset->hotplug_ops;
++	kset = top_kobj->kset;
++	hotplug_ops = kset->hotplug_ops;
  
 -	/* If the kset has a filter operation, call it.
 -	   Skip the event, if the filter returns zero. */
@@ -272,13 +287,13 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  		if (!hotplug_ops->filter(kset, kobj))
  			return;
 -	}
- 
+-
 -	pr_debug ("%s\n", __FUNCTION__);
 -
 -	action_string = action_to_string(action);
 -	if (!action_string)
 -		return;
--
+ 
 -	envp = kmalloc(NUM_ENVP * sizeof (char *), GFP_KERNEL);
 +	/* environment index */
 +	envp = kzalloc(NUM_ENVP * sizeof (char *), GFP_KERNEL);
@@ -307,20 +322,20 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +	devpath = kobject_get_path(kobj, GFP_KERNEL);
 +	if (!devpath)
 +		goto exit;
-+
+ 
+-	scratch = buffer;
 +	/* originating subsystem */
 +	if (hotplug_ops && hotplug_ops->name)
 +		subsystem = hotplug_ops->name(kset, kobj);
-+	if (!subsystem)
++	else
 +		subsystem = kobject_name(&kset->kobj);
-+
+ 
 +	/* event environemnt for helper process only */
 +	envp[i++] = "HOME=/";
 +	envp[i++] = "PATH=/sbin:/bin:/usr/sbin:/usr/bin";
- 
++
 +	/* default keys */
- 	scratch = buffer;
--
++	scratch = buffer;
  	envp [i++] = scratch;
  	scratch += sprintf(scratch, "ACTION=%s", action_string) + 1;
 -
@@ -349,7 +364,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  		retval = hotplug_ops->hotplug (kset, kobj,
  				  &envp[i], NUM_ENVP - i, scratch,
  				  BUFFER_SIZE - (scratch - buffer));
-@@ -272,27 +148,41 @@
+@@ -272,27 +145,49 @@ void kobject_hotplug(struct kobject *kob
  		}
  	}
  
@@ -362,26 +377,33 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 -	pr_debug ("%s: %s %s seq=%llu %s %s %s %s %s\n",
 -		  __FUNCTION__, argv[0], argv[1], (unsigned long long)seq,
 -		  envp[0], envp[1], envp[2], envp[3], envp[4]);
-+	/* allocate netlink message with the maximum possible size */
-+	len = strlen(action_string) + strlen(devpath) + 2;
-+	skb = alloc_skb(len + BUFFER_SIZE, GFP_KERNEL);
-+	if (skb) {
-+		/* add header */
-+		scratch = skb_put(skb, len);
-+		sprintf(scratch, "%s@%s", action_string, devpath);
- 
--	send_uevent(action_string, kobj_path, envp, GFP_KERNEL);
-+		/* copy all keys to our continuous event payload buffer */
-+		for (i = 2; envp[i]; i++) {
-+			len = strlen(envp[i]) + 1;
++	/* send netlink message */
++	if (uevent_sock) {
++		struct sk_buff *skb;
++		size_t len;
++
++		/* allocate message with the maximum possible size */
++		len = strlen(action_string) + strlen(devpath) + 2;
++		skb = alloc_skb(len + BUFFER_SIZE, GFP_KERNEL);
++		if (skb) {
++			/* add header */
 +			scratch = skb_put(skb, len);
-+			strcpy(scratch, envp[i]);
-+		}
++			sprintf(scratch, "%s@%s", action_string, devpath);
++
++			/* copy keys to our continuous event payload buffer */
++			for (i = 2; envp[i]; i++) {
++				len = strlen(envp[i]) + 1;
++				scratch = skb_put(skb, len);
++				strcpy(scratch, envp[i]);
++			}
  
+-	send_uevent(action_string, kobj_path, envp, GFP_KERNEL);
+-
 -	if (!hotplug_path[0])
 -		goto exit;
-+		NETLINK_CB(skb).dst_group = 1;
-+		netlink_broadcast(uevent_sock, skb, 0, 1, GFP_KERNEL);
++			NETLINK_CB(skb).dst_group = 1;
++			netlink_broadcast(uevent_sock, skb, 0, 1, GFP_KERNEL);
++		}
 +	}
  
 -	retval = call_usermodehelper (argv[0], argv, envp, 0);
@@ -390,6 +412,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 -			  __FUNCTION__, retval);
 +	/* call uevent_helper, usually only enabled during early boot */
 +	if (hotplug_path[0]) {
++		char *argv [3];
++
 +		argv [0] = hotplug_path;
 +		argv [1] = (char *)subsystem;
 +		argv [2] = NULL;
@@ -402,7 +426,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	kfree(buffer);
  	kfree(envp);
  	return;
-@@ -350,4 +240,20 @@
+@@ -350,4 +245,20 @@ int add_hotplug_env_var(char **envp, int
  }
  EXPORT_SYMBOL(add_hotplug_env_var);
  
diff --git a/driver/move-pnpbios-usermod_helper.patch b/driver/move-pnpbios-usermod_helper.patch
index 55fe4329dca3a..56e344f194b81 100644
--- a/driver/move-pnpbios-usermod_helper.patch
+++ b/driver/move-pnpbios-usermod_helper.patch
@@ -15,11 +15,12 @@ core integration instead of forking binaries from the kernel.
 Signed-off-by: Kay Sievers <kay.sievers@suse.de>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
+---
  drivers/pnp/pnpbios/core.c |    8 +++-----
  1 file changed, 3 insertions(+), 5 deletions(-)
 
---- gregkh-2.6.orig/drivers/pnp/pnpbios/core.c	2005-11-03 23:40:47.000000000 -0800
-+++ gregkh-2.6/drivers/pnp/pnpbios/core.c	2005-11-12 20:58:31.000000000 -0800
+--- gregkh-2.6.orig/drivers/pnp/pnpbios/core.c
++++ gregkh-2.6/drivers/pnp/pnpbios/core.c
 @@ -56,7 +56,6 @@
  #include <linux/mm.h>
  #include <linux/smp.h>
@@ -28,7 +29,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  #include <linux/completion.h>
  #include <linux/spinlock.h>
  #include <linux/dmi.h>
-@@ -106,8 +105,6 @@
+@@ -106,8 +105,6 @@ static int pnp_dock_event(int dock, stru
  	char *argv [3], **envp, *buf, *scratch;
  	int i = 0, value;
  
@@ -37,7 +38,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	if (!current->fs->root) {
  		return -EAGAIN;
  	}
-@@ -119,8 +116,9 @@
+@@ -119,8 +116,9 @@ static int pnp_dock_event(int dock, stru
  		return -ENOMEM;
  	}
  
diff --git a/driver/remove-KOBJECT_UEVENT.patch b/driver/remove-KOBJECT_UEVENT.patch
index a7aa031481664..0c05e81086c32 100644
--- a/driver/remove-KOBJECT_UEVENT.patch
+++ b/driver/remove-KOBJECT_UEVENT.patch
@@ -11,6 +11,7 @@ kobject_uevent.h header into the kobject.h header file.
 Signed-off-by: Kay Sievers <kay.sievers@suse.de>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
+---
  MAINTAINERS                    |    6 ----
  drivers/input/input.c          |    1 
  drivers/s390/crypto/z90main.c  |    1 
@@ -21,9 +22,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  lib/kobject_uevent.c           |   24 +++--------------
  8 files changed, 40 insertions(+), 107 deletions(-)
 
---- gregkh-2.6.orig/MAINTAINERS	2005-11-12 20:19:31.000000000 -0800
-+++ gregkh-2.6/MAINTAINERS	2005-11-12 20:58:35.000000000 -0800
-@@ -1454,12 +1454,6 @@
+--- gregkh-2.6.orig/MAINTAINERS
++++ gregkh-2.6/MAINTAINERS
+@@ -1454,12 +1454,6 @@ W:	http://nfs.sourceforge.net/
  W:	http://www.cse.unsw.edu.au/~neilb/patches/linux-devel/
  S:	Maintained
  
@@ -36,8 +37,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  KEXEC
  P:	Eric Biederman
  P:	Randy Dunlap
---- gregkh-2.6.orig/drivers/input/input.c	2005-11-11 22:48:17.000000000 -0800
-+++ gregkh-2.6/drivers/input/input.c	2005-11-12 20:58:35.000000000 -0800
+--- gregkh-2.6.orig/drivers/input/input.c
++++ gregkh-2.6/drivers/input/input.c
 @@ -18,7 +18,6 @@
  #include <linux/random.h>
  #include <linux/major.h>
@@ -46,8 +47,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  #include <linux/interrupt.h>
  #include <linux/poll.h>
  #include <linux/device.h>
---- gregkh-2.6.orig/drivers/s390/crypto/z90main.c	2005-11-12 20:19:48.000000000 -0800
-+++ gregkh-2.6/drivers/s390/crypto/z90main.c	2005-11-12 20:58:35.000000000 -0800
+--- gregkh-2.6.orig/drivers/s390/crypto/z90main.c
++++ gregkh-2.6/drivers/s390/crypto/z90main.c
 @@ -34,7 +34,6 @@
  #include <linux/miscdevice.h>
  #include <linux/module.h>
@@ -56,8 +57,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  #include <linux/proc_fs.h>
  #include <linux/syscalls.h>
  #include "z90crypt.h"
---- gregkh-2.6.orig/include/linux/kobject.h	2005-11-11 22:48:35.000000000 -0800
-+++ gregkh-2.6/include/linux/kobject.h	2005-11-12 20:58:35.000000000 -0800
+--- gregkh-2.6.orig/include/linux/kobject.h
++++ gregkh-2.6/include/linux/kobject.h
 @@ -23,15 +23,31 @@
  #include <linux/spinlock.h>
  #include <linux/rwsem.h>
@@ -91,7 +92,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  struct kobject {
  	const char		* k_name;
  	char			name[KOBJ_NAME_LEN];
-@@ -243,16 +259,33 @@
+@@ -243,16 +259,33 @@ extern void subsys_remove_file(struct su
  
  #ifdef CONFIG_HOTPLUG
  void kobject_hotplug(struct kobject *kobj, enum kobject_action action);
@@ -125,8 +126,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  #endif
  
  #endif /* __KERNEL__ */
---- gregkh-2.6.orig/include/linux/kobject_uevent.h	2005-08-28 16:41:01.000000000 -0700
-+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
+--- gregkh-2.6.orig/include/linux/kobject_uevent.h
++++ /dev/null
 @@ -1,57 +0,0 @@
 -/*
 - * kobject_uevent.h - list of kobject user events that can be generated
@@ -185,9 +186,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 -#endif
 -
 -#endif
---- gregkh-2.6.orig/init/Kconfig	2005-11-11 22:48:36.000000000 -0800
-+++ gregkh-2.6/init/Kconfig	2005-11-12 20:58:35.000000000 -0800
-@@ -205,25 +205,6 @@
+--- gregkh-2.6.orig/init/Kconfig
++++ gregkh-2.6/init/Kconfig
+@@ -205,25 +205,6 @@ config HOTPLUG
  	  modules require HOTPLUG functionality, but a module built
  	  outside the kernel tree does. Such modules require Y here.
  
@@ -213,8 +214,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  config IKCONFIG
  	bool "Kernel .config support"
  	---help---
---- gregkh-2.6.orig/kernel/sysctl.c	2005-11-12 20:19:02.000000000 -0800
-+++ gregkh-2.6/kernel/sysctl.c	2005-11-12 20:58:35.000000000 -0800
+--- gregkh-2.6.orig/kernel/sysctl.c
++++ gregkh-2.6/kernel/sysctl.c
 @@ -31,6 +31,7 @@
  #include <linux/smp_lock.h>
  #include <linux/init.h>
@@ -223,7 +224,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  #include <linux/net.h>
  #include <linux/sysrq.h>
  #include <linux/highuid.h>
-@@ -83,9 +84,6 @@
+@@ -83,9 +84,6 @@ static int ngroups_max = NGROUPS_MAX;
  #ifdef CONFIG_KMOD
  extern char modprobe_path[];
  #endif
@@ -233,8 +234,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  #ifdef CONFIG_CHR_DEV_SG
  extern int sg_big_buff;
  #endif
---- gregkh-2.6.orig/lib/kobject_uevent.c	2005-11-11 22:48:36.000000000 -0800
-+++ gregkh-2.6/lib/kobject_uevent.c	2005-11-12 20:58:35.000000000 -0800
+--- gregkh-2.6.orig/lib/kobject_uevent.c
++++ gregkh-2.6/lib/kobject_uevent.c
 @@ -19,14 +19,17 @@
  #include <linux/skbuff.h>
  #include <linux/netlink.h>
@@ -255,7 +256,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  static char *action_to_string(enum kobject_action action)
  {
  	switch (action) {
-@@ -48,9 +51,7 @@
+@@ -48,9 +51,7 @@ static char *action_to_string(enum kobje
  		return NULL;
  	}
  }
@@ -265,7 +266,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  static struct sock *uevent_sock;
  
  /**
-@@ -168,21 +169,6 @@
+@@ -168,21 +169,6 @@ static int __init kobject_uevent_init(vo
  
  postcore_initcall(kobject_uevent_init);
  
diff --git a/driver/remove-mount-events.patch b/driver/remove-mount-events.patch
index b3c2283053b08..e0afc3a6d60d8 100644
--- a/driver/remove-mount-events.patch
+++ b/driver/remove-mount-events.patch
@@ -14,14 +14,16 @@ Thanks to Al, we have the proper solution now and can poll()
 Signed-off-by: Kay Sievers <kay.sievers@suse.de>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
+
+---
  fs/super.c              |   15 +--------------
  include/linux/kobject.h |    6 ++----
  lib/kobject_uevent.c    |    4 ----
  3 files changed, 3 insertions(+), 22 deletions(-)
 
---- gregkh-2.6.orig/fs/super.c	2005-11-11 22:48:30.000000000 -0800
-+++ gregkh-2.6/fs/super.c	2005-11-12 20:58:41.000000000 -0800
-@@ -665,16 +665,6 @@
+--- gregkh-2.6.orig/fs/super.c
++++ gregkh-2.6/fs/super.c
+@@ -665,16 +665,6 @@ static int test_bdev_super(struct super_
  	return (void *)s->s_bdev == data;
  }
  
@@ -38,7 +40,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  struct super_block *get_sb_bdev(struct file_system_type *fs_type,
  	int flags, const char *dev_name, void *data,
  	int (*fill_super)(struct super_block *, void *, int))
-@@ -717,10 +707,8 @@
+@@ -717,10 +707,8 @@ struct super_block *get_sb_bdev(struct f
  			up_write(&s->s_umount);
  			deactivate_super(s);
  			s = ERR_PTR(error);
@@ -50,7 +52,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	}
  
  	return s;
-@@ -736,7 +724,6 @@
+@@ -736,7 +724,6 @@ void kill_block_super(struct super_block
  {
  	struct block_device *bdev = sb->s_bdev;
  
@@ -58,9 +60,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	generic_shutdown_super(sb);
  	sync_blockdev(bdev);
  	close_bdev_excl(bdev);
---- gregkh-2.6.orig/include/linux/kobject.h	2005-11-12 20:58:38.000000000 -0800
-+++ gregkh-2.6/include/linux/kobject.h	2005-11-12 20:58:41.000000000 -0800
-@@ -42,10 +42,8 @@
+--- gregkh-2.6.orig/include/linux/kobject.h
++++ gregkh-2.6/include/linux/kobject.h
+@@ -42,10 +42,8 @@ enum kobject_action {
  	KOBJ_ADD	= (__force kobject_action_t) 0x01,	/* add event, for hotplug */
  	KOBJ_REMOVE	= (__force kobject_action_t) 0x02,	/* remove event, for hotplug */
  	KOBJ_CHANGE	= (__force kobject_action_t) 0x03,	/* a sysfs attribute file has changed */
@@ -73,9 +75,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  };
  
  struct kobject {
---- gregkh-2.6.orig/lib/kobject_uevent.c	2005-11-12 20:58:38.000000000 -0800
-+++ gregkh-2.6/lib/kobject_uevent.c	2005-11-12 20:58:41.000000000 -0800
-@@ -39,10 +39,6 @@
+--- gregkh-2.6.orig/lib/kobject_uevent.c
++++ gregkh-2.6/lib/kobject_uevent.c
+@@ -39,10 +39,6 @@ static char *action_to_string(enum kobje
  		return "remove";
  	case KOBJ_CHANGE:
  		return "change";
diff --git a/driver/speakup-core.patch b/driver/speakup-core.patch
index 2cd33d6b3a798..50607add5950f 100644
--- a/driver/speakup-core.patch
+++ b/driver/speakup-core.patch
@@ -3,6 +3,7 @@ This still needs lots of work before it can hit mainline...
 
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
+---
  MAINTAINERS                              |    7 
  arch/arm/Kconfig                         |    1 
  drivers/Kconfig                          |    2 
@@ -52,7 +53,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  include/linux/speakup.h                  |   33 
  47 files changed, 8701 insertions(+), 9 deletions(-)
 
----
 --- /dev/null
 +++ gregkh-2.6/drivers/char/speakup/cvsversion.h
 @@ -0,0 +1 @@
diff --git a/driver/speakup-kconfig-fix.patch b/driver/speakup-kconfig-fix.patch
index 2354dca598178..4f0a0f54b0691 100644
--- a/driver/speakup-kconfig-fix.patch
+++ b/driver/speakup-kconfig-fix.patch
@@ -19,12 +19,13 @@ that's the sane thing to do :)
 Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
+---
  drivers/char/speakup/Kconfig |    1 +
  1 file changed, 1 insertion(+)
 
---- gregkh-2.6.orig/drivers/char/speakup/Kconfig	2005-11-12 14:07:26.000000000 -0800
-+++ gregkh-2.6/drivers/char/speakup/Kconfig	2005-11-12 14:07:27.000000000 -0800
-@@ -205,6 +205,7 @@
+--- gregkh-2.6.orig/drivers/char/speakup/Kconfig
++++ gregkh-2.6/drivers/char/speakup/Kconfig
+@@ -205,6 +205,7 @@ if SPEAKUP != n
  endif
  
  config SPEAKUP_DEFAULT