[kernel] r15196 - in dists/trunk/linux-2.6/debian/patches: debian features/all/speakup
Maximilian Attems
maks at alioth.debian.org
Thu Feb 18 16:48:01 UTC 2010
Author: maks
Date: Thu Feb 18 16:47:58 2010
New Revision: 15196
Log:
Revert "Fix patch context for 2.6.33-rc8"
this applies to 2.6.33-rc8, so
this reverts commit c20fd20178e727e31442527c886204ec6ff50fd1.
Modified:
dists/trunk/linux-2.6/debian/patches/debian/scripts-kconfig-reportoldconfig.patch
dists/trunk/linux-2.6/debian/patches/features/all/speakup/speakup-kbuild.patch
Modified: dists/trunk/linux-2.6/debian/patches/debian/scripts-kconfig-reportoldconfig.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/scripts-kconfig-reportoldconfig.patch Thu Feb 18 16:44:24 2010 (r15195)
+++ dists/trunk/linux-2.6/debian/patches/debian/scripts-kconfig-reportoldconfig.patch Thu Feb 18 16:47:58 2010 (r15196)
@@ -11,7 +11,7 @@
ifdef KBUILD_KCONFIG
Kconfig := $(KBUILD_KCONFIG)
-@@ -26,9 +26,15 @@ config: $(obj)/conf
+@@ -26,10 +26,16 @@ config: $(obj)/conf
oldconfig: $(obj)/conf
$< -o $(Kconfig)
@@ -19,6 +19,7 @@
+ $< -R $(Kconfig)
+
silentoldconfig: $(obj)/conf
+ $(Q)mkdir -p include/generated
$< -s $(Kconfig)
+updateoldconfig: $(obj)/conf
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 Thu Feb 18 16:44:24 2010 (r15195)
+++ dists/trunk/linux-2.6/debian/patches/features/all/speakup/speakup-kbuild.patch Thu Feb 18 16:47:58 2010 (r15196)
@@ -3,10 +3,10 @@
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
-@@ -124,6 +124,8 @@
- source "drivers/staging/sep/Kconfig"
+@@ -126,6 +126,8 @@
+ source "drivers/staging/netwave/Kconfig"
- source "drivers/staging/iio/Kconfig"
+ source "drivers/staging/sm7xx/Kconfig"
+
+source "drivers/staging/speakup/Kconfig"
@@ -14,10 +14,10 @@
endif # STAGING
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
-@@ -44,3 +44,4 @@
- obj-$(CONFIG_RAR_REGISTER) += rar/
- obj-$(CONFIG_DX_SEP) += sep/
- obj-$(CONFIG_IIO) += iio/
+@@ -45,3 +45,4 @@
+ obj-$(CONFIG_PCMCIA_WAVELAN) += wavelan/
+ obj-$(CONFIG_PCMCIA_NETWAVE) += netwave/
+ obj-$(CONFIG_FB_SM7XX) += sm7xx/
+obj-$(CONFIG_SPEAKUP) += speakup/
--- a/drivers/staging/speakup/Kbuild
+++ b/drivers/staging/speakup/Kbuild
More information about the Kernel-svn-changes
mailing list