2.6.14-git3 update

4 files changed, 7 insertions, 49 deletions

diff --git a/driver/driver-model-wakeup-03.patch b/driver/driver-model-wakeup-03.patch
index bd0e716853f5b..f495bffc7db44 100644
--- a/driver/driver-model-wakeup-03.patch
+++ b/driver/driver-model-wakeup-03.patch
@@ -77,7 +77,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
 --- gregkh-2.6.orig/drivers/pci/pci.c
 +++ gregkh-2.6/drivers/pci/pci.c
-@@ -540,6 +540,10 @@ int pci_enable_wake(struct pci_dev *dev,
+@@ -541,6 +541,10 @@ int pci_enable_wake(struct pci_dev *dev,
  	if (!pm) 
  		return enable ? -EIO : 0; 
  
diff --git a/driver/driver-sample.sh.patch b/driver/driver-sample.sh.patch
index 21d74574f4a6c..fb9747fd74f08 100644
--- a/driver/driver-sample.sh.patch
+++ b/driver/driver-sample.sh.patch
@@ -95,7 +95,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
 --- gregkh-2.6.orig/drivers/base/class.c
 +++ gregkh-2.6/drivers/base/class.c
-@@ -467,6 +467,13 @@ static ssize_t store_uevent(struct class
+@@ -468,6 +468,13 @@ static ssize_t store_uevent(struct class
  	return count;
  }
  
@@ -109,7 +109,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  void class_device_initialize(struct class_device *class_dev)
  {
  	kobj_set_kset_s(class_dev, class_obj_subsys);
-@@ -547,6 +554,21 @@ int class_device_add(struct class_device
+@@ -548,6 +555,21 @@ int class_device_add(struct class_device
  		attr->show = show_dev;
  		class_device_create_file(class_dev, attr);
  		class_dev->devt_attr = attr;
diff --git a/driver/speakup-core.patch b/driver/speakup-core.patch
index 9bedfcd33505d..7944a0ae03053 100644
--- a/driver/speakup-core.patch
+++ b/driver/speakup-core.patch
@@ -6,7 +6,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 ---
  MAINTAINERS                              |    7 
  arch/arm/Kconfig                         |    1 
- arch/mips/Kconfig                        |    2 
  drivers/Kconfig                          |    2 
  drivers/Makefile                         |    4 
  drivers/char/Makefile                    |    1 
@@ -52,7 +51,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  drivers/char/vt.c                        |   16 
  include/linux/keyboard.h                 |    2 
  include/linux/speakup.h                  |   33 
- 48 files changed, 8702 insertions(+), 9 deletions(-)
+ 47 files changed, 8700 insertions(+), 9 deletions(-)
 
 --- /dev/null
 +++ gregkh-2.6/drivers/char/speakup/cvsversion.h
@@ -8809,17 +8808,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  source "sound/Kconfig"
  
---- gregkh-2.6.orig/arch/mips/Kconfig
-+++ gregkh-2.6/arch/mips/Kconfig
-@@ -931,6 +931,8 @@ config SIBYTE_STANDALONE
- 	depends on SIBYTE_SB1xxx_SOC && !SIBYTE_CFE
- 	default y
- 
-+source "drivers/char/speakup/Kconfig"
-+
- config SIBYTE_STANDALONE_RAM_SIZE
- 	int "Memory size (in megabytes)"
- 	depends on SIBYTE_STANDALONE
 --- gregkh-2.6.orig/drivers/char/consolemap.c
 +++ gregkh-2.6/drivers/char/consolemap.c
 @@ -670,3 +670,4 @@ console_map_init(void)
@@ -8950,9 +8938,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	if (type != KT_SLOCK)
 --- gregkh-2.6.orig/drivers/char/Makefile
 +++ gregkh-2.6/drivers/char/Makefile
-@@ -83,6 +83,7 @@ obj-$(CONFIG_SCx200_GPIO) += scx200_gpio
- obj-$(CONFIG_GPIO_VR41XX) += vr41xx_giu.o
+@@ -84,6 +84,7 @@ obj-$(CONFIG_GPIO_VR41XX) += vr41xx_giu.
  obj-$(CONFIG_TANBAC_TB0219) += tb0219.o
+ obj-$(CONFIG_TELCLOCK) += tlclk.o
  
 +obj-$(CONFIG_SPEAKUP) += speakup/
  obj-$(CONFIG_WATCHDOG)	+= watchdog/
@@ -9119,7 +9107,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  #endif
 --- gregkh-2.6.orig/MAINTAINERS
 +++ gregkh-2.6/MAINTAINERS
-@@ -2321,6 +2321,13 @@ M:	wli@holomorphy.com
+@@ -2334,6 +2334,13 @@ M:	wli@holomorphy.com
  L:	sparclinux@vger.kernel.org
  S:	Maintained
  
diff --git a/driver/speakup-kconfig-fix-2.patch b/driver/speakup-kconfig-fix-2.patch
deleted file mode 100644
index 4489b6628d2e6..0000000000000
--- a/driver/speakup-kconfig-fix-2.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From bunk@stusta.de Wed Jul 27 11:45:57 2005
-Date: Wed, 27 Jul 2005 20:34:18 +0200
-From: Adrian Bunk <bunk@stusta.de>
-To: gregkh@suse.de
-Cc: linux-kernel@vger.kernel.org
-Subject: SPEAKUP: arch/mips/Kconfig mustn't include drivers/char/speakup/Kconfig
-Message-ID: <20050727183417.GJ3160@stusta.de>
-
-This broke configuring on mips since drivers/char/speakup/Kconfig 
-already gets included through drivers/Kconfig.
-
-
-Signed-off-by: Adrian Bunk <bunk@stusta.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- arch/mips/Kconfig |    2 --
- 1 file changed, 2 deletions(-)
-
---- gregkh-2.6.orig/arch/mips/Kconfig
-+++ gregkh-2.6/arch/mips/Kconfig
-@@ -931,8 +931,6 @@ config SIBYTE_STANDALONE
- 	depends on SIBYTE_SB1xxx_SOC && !SIBYTE_CFE
- 	default y
- 
--source "drivers/char/speakup/Kconfig"
--
- config SIBYTE_STANDALONE_RAM_SIZE
- 	int "Memory size (in megabytes)"
- 	depends on SIBYTE_STANDALONE