aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/omap24xx/patches-3.1/311-omapfb-clock-fixes.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2011-11-13 10:48:05 +0000
committerJonas Gorski <jogo@openwrt.org>2011-11-13 10:48:05 +0000
commitd8acb75009ad7f674609664810fef3a11d72205e (patch)
treed66c7e0323af53562e5f0e4e0fd7d9ab49d3ca7a /target/linux/omap24xx/patches-3.1/311-omapfb-clock-fixes.patch
parenta8797d0de6fac61582e9e9212e55e0bc1449f4b1 (diff)
downloadupstream-d8acb75009ad7f674609664810fef3a11d72205e.tar.gz
upstream-d8acb75009ad7f674609664810fef3a11d72205e.tar.bz2
upstream-d8acb75009ad7f674609664810fef3a11d72205e.zip
linux: update 3.1 to 3.1.1
SVN-Revision: 29007
Diffstat (limited to 'target/linux/omap24xx/patches-3.1/311-omapfb-clock-fixes.patch')
-rw-r--r--target/linux/omap24xx/patches-3.1/311-omapfb-clock-fixes.patch12
1 files changed, 4 insertions, 8 deletions
diff --git a/target/linux/omap24xx/patches-3.1/311-omapfb-clock-fixes.patch b/target/linux/omap24xx/patches-3.1/311-omapfb-clock-fixes.patch
index 668828ad82..6169215fe6 100644
--- a/target/linux/omap24xx/patches-3.1/311-omapfb-clock-fixes.patch
+++ b/target/linux/omap24xx/patches-3.1/311-omapfb-clock-fixes.patch
@@ -1,7 +1,5 @@
-Index: linux-3.1/drivers/video/omap/dispc.c
-===================================================================
---- linux-3.1.orig/drivers/video/omap/dispc.c 2011-10-30 21:14:30.228268542 +0100
-+++ linux-3.1/drivers/video/omap/dispc.c 2011-10-30 21:14:49.416119695 +0100
+--- a/drivers/video/omap/dispc.c
++++ b/drivers/video/omap/dispc.c
@@ -922,14 +922,14 @@ static int get_dss_clocks(void)
return PTR_ERR(dispc.dss_ick);
}
@@ -19,10 +17,8 @@ Index: linux-3.1/drivers/video/omap/dispc.c
if (IS_ERR(dispc.dss_54m_fck)) {
dev_err(dispc.fbdev->dev, "can't get tv_fck\n");
clk_put(dispc.dss_ick);
-Index: linux-3.1/drivers/video/omap/rfbi.c
-===================================================================
---- linux-3.1.orig/drivers/video/omap/rfbi.c 2011-10-30 21:14:30.220268604 +0100
-+++ linux-3.1/drivers/video/omap/rfbi.c 2011-10-30 21:14:49.416119695 +0100
+--- a/drivers/video/omap/rfbi.c
++++ b/drivers/video/omap/rfbi.c
@@ -90,7 +90,7 @@ static int rfbi_get_clocks(void)
return PTR_ERR(rfbi.dss_ick);
}