aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/omap24xx/patches-3.1/252-cbus-retu-tahvo-ack-fix.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2011-12-06 19:50:30 +0000
committerJonas Gorski <jogo@openwrt.org>2011-12-06 19:50:30 +0000
commite33bb9ec661d93935702cdd0ac78b11bc40054f5 (patch)
treecfd206dc037798fec8e26d5a1541962657daebbb /target/linux/omap24xx/patches-3.1/252-cbus-retu-tahvo-ack-fix.patch
parent6e2ae90f4ab5f90459da923069ed31dc6503918f (diff)
downloadupstream-e33bb9ec661d93935702cdd0ac78b11bc40054f5.tar.gz
upstream-e33bb9ec661d93935702cdd0ac78b11bc40054f5.tar.bz2
upstream-e33bb9ec661d93935702cdd0ac78b11bc40054f5.zip
linux: update 3.1 to 3.1.4
SVN-Revision: 29470
Diffstat (limited to 'target/linux/omap24xx/patches-3.1/252-cbus-retu-tahvo-ack-fix.patch')
-rw-r--r--target/linux/omap24xx/patches-3.1/252-cbus-retu-tahvo-ack-fix.patch12
1 files changed, 4 insertions, 8 deletions
diff --git a/target/linux/omap24xx/patches-3.1/252-cbus-retu-tahvo-ack-fix.patch b/target/linux/omap24xx/patches-3.1/252-cbus-retu-tahvo-ack-fix.patch
index 6793a3c600..86f2f770e9 100644
--- a/target/linux/omap24xx/patches-3.1/252-cbus-retu-tahvo-ack-fix.patch
+++ b/target/linux/omap24xx/patches-3.1/252-cbus-retu-tahvo-ack-fix.patch
@@ -1,7 +1,5 @@
-Index: linux-3.1.1/drivers/cbus/retu.c
-===================================================================
---- linux-3.1.1.orig/drivers/cbus/retu.c 2011-11-17 23:23:53.542699149 +0100
-+++ linux-3.1.1/drivers/cbus/retu.c 2011-11-17 23:23:55.830689859 +0100
+--- a/drivers/cbus/retu.c
++++ b/drivers/cbus/retu.c
@@ -53,9 +53,6 @@ struct retu {
int irq;
@@ -70,10 +68,8 @@ Index: linux-3.1.1/drivers/cbus/retu.c
irq_set_nested_thread(irq, 1);
retu_irq_setup(irq);
}
-Index: linux-3.1.1/drivers/cbus/tahvo.c
-===================================================================
---- linux-3.1.1.orig/drivers/cbus/tahvo.c 2011-11-17 23:23:54.358695836 +0100
-+++ linux-3.1.1/drivers/cbus/tahvo.c 2011-11-17 23:23:55.830689859 +0100
+--- a/drivers/cbus/tahvo.c
++++ b/drivers/cbus/tahvo.c
@@ -48,11 +48,9 @@ struct tahvo {
int irq_end;
int irq;