Include speakup modules under staging

svn path=/dists/trunk/linux-2.6/; revision=14380

debian/changelog

@@ -2,6 +2,7 @@ linux-2.6 (2.6.31-1~experimental.3) UNRELEASED; urgency=low
 
   [ Ben Hutchings ]
   * Include aufs2, marked as staging (Closes: #541828)
+  * Include speakup modules under staging
 
  -- Ben Hutchings <ben@decadent.org.uk>  Tue, 13 Oct 2009 02:18:40 +0100
 

debian/config/kernelarch-x86/config

@@ -389,6 +389,25 @@ CONFIG_RTL8187SE=m
 ##
 # CONFIG_SLICOSS is not set
 
+##
+## file: drivers/staging/speakup/Kconfig
+##
+CONFIG_SPEAKUP_SYNTH_ACNTSA=m
+CONFIG_SPEAKUP_SYNTH_ACNTPC=m
+CONFIG_SPEAKUP_SYNTH_APOLLO=m
+CONFIG_SPEAKUP_SYNTH_AUDPTR=m
+CONFIG_SPEAKUP_SYNTH_BNS=m
+CONFIG_SPEAKUP_SYNTH_DECTLK=m
+CONFIG_SPEAKUP_SYNTH_DECEXT=m
+CONFIG_SPEAKUP_SYNTH_DTLK=m
+CONFIG_SPEAKUP_SYNTH_KEYPC=m
+CONFIG_SPEAKUP_SYNTH_LTLK=m
+CONFIG_SPEAKUP_SYNTH_SOFT=m
+CONFIG_SPEAKUP_SYNTH_SPKOUT=m
+CONFIG_SPEAKUP_SYNTH_TXPRT=m
+CONFIG_SPEAKUP_SYNTH_DUMMY=m
+CONFIG_SPEAKUP=m
+
 ##
 ## file: drivers/staging/stlc45xx/Kconfig
 ##

debian/patches/features/all/speakup/speakup-kbuild.patch

@@ -0,0 +1,28 @@
+From: Ben Hutchings <ben@decadent.org.uk>
+Subject: [PATCH] speakup: integrate into kbuild
+
+--- a/drivers/staging/Kconfig
++++ b/drivers/staging/Kconfig
+@@ -126,6 +126,8 @@
+ source "drivers/staging/pata_rdc/Kconfig"
+ 
+ source "drivers/staging/udlfb/Kconfig"
++
++source "drivers/staging/speakup/Kconfig"
+ 
+ endif # !STAGING_EXCLUDE_BUILD
+ endif # STAGING
+--- a/drivers/staging/Makefile
++++ b/drivers/staging/Makefile
+@@ -45,3 +45,4 @@
+ obj-$(CONFIG_USB_CPC)		+= cpc-usb/
+ obj-$(CONFIG_RDC_17F3101X)	+= pata_rdc/
+ obj-$(CONFIG_FB_UDL)		+= udlfb/
++obj-$(CONFIG_SPEAKUP)		+= speakup/
+--- a/drivers/staging/speakup/Kbuild
++++ b/drivers/staging/speakup/Kbuild
+@@ -1,4 +1,3 @@
+-include $M/allmodule.mk
+ obj-$(CONFIG_SPEAKUP_SYNTH_ACNTSA) += speakup_acntsa.o
+ obj-$(CONFIG_SPEAKUP_SYNTH_ACNTPC) += speakup_acntpc.o
+ obj-$(CONFIG_SPEAKUP_SYNTH_APOLLO) += speakup_apollo.o

debian/patches/series/base

@@ -25,6 +25,11 @@
 # mark as staging/crap
 + features/all/aufs2/mark-as-staging.patch
 
+# 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
+
 + bugfix/sparc/drivers_net-broken.patch
 #+ bugfix/ia64/hardcode-arch-script-output.patch
 + bugfix/mips/disable-advansys.patch