aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/omap24xx/patches-3.1/309-omapfb-circular-mutex-workaround.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/309-omapfb-circular-mutex-workaround.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/309-omapfb-circular-mutex-workaround.patch')
-rw-r--r--target/linux/omap24xx/patches-3.1/309-omapfb-circular-mutex-workaround.patch12
1 files changed, 4 insertions, 8 deletions
diff --git a/target/linux/omap24xx/patches-3.1/309-omapfb-circular-mutex-workaround.patch b/target/linux/omap24xx/patches-3.1/309-omapfb-circular-mutex-workaround.patch
index 161698ddd7..d7eece605a 100644
--- a/target/linux/omap24xx/patches-3.1/309-omapfb-circular-mutex-workaround.patch
+++ b/target/linux/omap24xx/patches-3.1/309-omapfb-circular-mutex-workaround.patch
@@ -1,7 +1,5 @@
-Index: linux-3.1.1/drivers/video/omap/omapfb_main.c
-===================================================================
---- linux-3.1.1.orig/drivers/video/omap/omapfb_main.c 2011-11-11 21:19:27.000000000 +0100
-+++ linux-3.1.1/drivers/video/omap/omapfb_main.c 2011-11-16 23:10:16.554325659 +0100
+--- a/drivers/video/omap/omapfb_main.c
++++ b/drivers/video/omap/omapfb_main.c
@@ -419,10 +419,10 @@ static void set_fb_fix(struct fb_info *f
fbi->screen_base = rg->vaddr;
@@ -28,10 +26,8 @@ Index: linux-3.1.1/drivers/video/omap/omapfb_main.c
}
}
}
-Index: linux-3.1.1/drivers/video/fbmem.c
-===================================================================
---- linux-3.1.1.orig/drivers/video/fbmem.c 2011-11-11 21:19:27.000000000 +0100
-+++ linux-3.1.1/drivers/video/fbmem.c 2011-11-16 23:20:56.055698968 +0100
+--- a/drivers/video/fbmem.c
++++ b/drivers/video/fbmem.c
@@ -1369,8 +1369,10 @@ fb_mmap(struct file *file, struct vm_are
}