From 6d1124fb8da32ffa6a54fd91041d7224049f021c Mon Sep 17 00:00:00 2001 From: Maximilian Attems Date: Tue, 18 May 2010 13:43:16 +0000 Subject: [PATCH] refresh speakup-kbuild to apply svn path=/dists/trunk/linux-2.6/; revision=15739 --- .../features/all/speakup/speakup-kbuild.patch | 12 ++++++------ debian/patches/series/base | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/debian/patches/features/all/speakup/speakup-kbuild.patch b/debian/patches/features/all/speakup/speakup-kbuild.patch index aec7a485a..baf6f88cf 100644 --- a/debian/patches/features/all/speakup/speakup-kbuild.patch +++ b/debian/patches/features/all/speakup/speakup-kbuild.patch @@ -3,10 +3,10 @@ Subject: [PATCH] speakup: integrate into kbuild --- 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 @@ Subject: [PATCH] speakup: integrate into kbuild 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 diff --git a/debian/patches/series/base b/debian/patches/series/base index 84144d4f9..b410495dc 100644 --- a/debian/patches/series/base +++ b/debian/patches/series/base @@ -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