aboutsummaryrefslogtreecommitdiffstats
path: root/driver
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2005-11-07 21:13:11 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2005-11-07 21:13:11 -0800
commit0d535b224a411112bf2b5f225f3d58258f2c6bc6 (patch)
treed7669b3bfe3f1f8afe9722f8beaa3f9e7a0bd84c /driver
parent32e87123541e8abdbd57f9341000c0adb3c48100 (diff)
downloadpatches-0d535b224a411112bf2b5f225f3d58258f2c6bc6.tar.gz
2.6.14-git10 update and new i2c patches
Diffstat (limited to 'driver')
-rw-r--r--driver/speakup-core.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/driver/speakup-core.patch b/driver/speakup-core.patch
index e3270d311e98a..b4901292e0f5a 100644
--- a/driver/speakup-core.patch
+++ b/driver/speakup-core.patch
@@ -8800,7 +8800,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+#endif
--- gregkh-2.6.orig/arch/arm/Kconfig
+++ gregkh-2.6/arch/arm/Kconfig
-@@ -742,6 +742,7 @@ source "drivers/mfd/Kconfig"
+@@ -741,6 +741,7 @@ source "drivers/mfd/Kconfig"
source "drivers/media/Kconfig"
source "drivers/video/Kconfig"
@@ -9107,7 +9107,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#endif
--- gregkh-2.6.orig/MAINTAINERS
+++ gregkh-2.6/MAINTAINERS
-@@ -2334,6 +2334,13 @@ M: wli@holomorphy.com
+@@ -2343,6 +2343,13 @@ M: wli@holomorphy.com
L: sparclinux@vger.kernel.org
S: Maintained