linux: update 3.1 to 3.1.1

[openwrt.git] / target / linux / omap24xx / patches-3.1 / 420-hci-h4p-interrupt-workaround.patch

diff --git a/target/linux/omap24xx/patches-3.1/420-hci-h4p-interrupt-workaround.patch b/target/linux/omap24xx/patches-3.1/420-hci-h4p-interrupt-workaround.patch
index 6eb9569..4e7c440 100644 (file)
--- a/target/linux/omap24xx/patches-3.1/420-hci-h4p-interrupt-workaround.patch
+++ b/target/linux/omap24xx/patches-3.1/420-hci-h4p-interrupt-workaround.patch
@@ -1,7 +1,5 @@
-Index: linux-3.1-rc4/arch/arm/mach-omap2/serial.c
-===================================================================
---- linux-3.1-rc4.orig/arch/arm/mach-omap2/serial.c    2011-08-29 06:16:01.000000000 +0200
-+++ linux-3.1-rc4/arch/arm/mach-omap2/serial.c 2011-10-27 16:38:20.539265654 +0200
+--- a/arch/arm/mach-omap2/serial.c
++++ b/arch/arm/mach-omap2/serial.c
 @@ -546,10 +546,12 @@ static void omap_uart_idle_init(struct o
                uart->padconf = 0;
        }
@@ -43,10 +41,8 @@ Index: linux-3.1-rc4/arch/arm/mach-omap2/serial.c
                }
        }
  }
-Index: linux-3.1-rc4/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c
-===================================================================
---- linux-3.1-rc4.orig/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c 2011-08-29 06:16:01.000000000 +0200
-+++ linux-3.1-rc4/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c      2011-10-27 16:44:39.065885130 +0200
+--- a/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c
++++ b/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c
 @@ -253,7 +253,7 @@ struct omap_hwmod_irq_info omap2_timer11
  };