[kernel] r15739 - in dists/trunk/linux-2.6/debian/patches: features/all/speakup series

[Maximilian Attems]

Author: maks
Date: Tue May 18 13:43:16 2010
New Revision: 15739

Log:
refresh speakup-kbuild to apply

Modified:
   dists/trunk/linux-2.6/debian/patches/features/all/speakup/speakup-kbuild.patch
   dists/trunk/linux-2.6/debian/patches/series/base

Modified: dists/trunk/linux-2.6/debian/patches/features/all/speakup/speakup-kbuild.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/features/all/speakup/speakup-kbuild.patch	Tue May 18 13:29:21 2010	(r15738)
+++ dists/trunk/linux-2.6/debian/patches/features/all/speakup/speakup-kbuild.patch	Tue May 18 13:43:16 2010	(r15739)
@@ -3,10 +3,10 @@
 
 --- a/drivers/staging/Kconfig
 +++ b/drivers/staging/Kconfig
-@@ -126,6 +126,8 @@
- source "drivers/staging/netwave/Kconfig"
+@@ -138,6 +138,8 @@
+ source "drivers/staging/dt3155/Kconfig"
  
- source "drivers/staging/sm7xx/Kconfig"
+ source "drivers/staging/crystalhd/Kconfig"
 +
 +source "drivers/staging/speakup/Kconfig"
  
@@ -14,10 +14,10 @@
  endif # STAGING
 --- a/drivers/staging/Makefile
 +++ b/drivers/staging/Makefile
-@@ -45,3 +45,4 @@
- obj-$(CONFIG_PCMCIA_WAVELAN)	+= wavelan/
- obj-$(CONFIG_PCMCIA_NETWAVE)	+= netwave/
+@@ -51,3 +51,4 @@
  obj-$(CONFIG_FB_SM7XX)		+= sm7xx/
+ obj-$(CONFIG_DT3155)		+= dt3155/
+ obj-$(CONFIG_CRYSTALHD)		+= crystalhd/
 +obj-$(CONFIG_SPEAKUP)		+= speakup/
 --- a/drivers/staging/speakup/Kbuild
 +++ b/drivers/staging/speakup/Kbuild

Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base	Tue May 18 13:29:21 2010	(r15738)
+++ dists/trunk/linux-2.6/debian/patches/series/base	Tue May 18 13:43:16 2010	(r15739)
@@ -24,7 +24,7 @@
 # content of src/ from speakup package; generated with:
 # diff -ur --unidirectional-new-file nonexistent src | filterdiff --strip=1 --addoldprefix=a/drivers/staging/speakup/ --addnewprefix=b/drivers/staging/speakup/
 + features/all/speakup/speakup-add.patch
-#+ features/all/speakup/speakup-kbuild.patch
++ features/all/speakup/speakup-kbuild.patch
 
 #+ bugfix/ia64/hardcode-arch-script-output.patch
 + bugfix/mips/disable-advansys.patch