linux: update 3.1 to 3.1.1

[openwrt.git] / target / linux / omap24xx / patches-3.1 / 311-omapfb-clock-fixes.patch

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 668828a..6169215 100644 (file)
--- 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);
        }