linux: update 3.1 to 3.1.1

[openwrt/svn-archive/archive.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 3aa04adcf0f3e9c6ab41e7490660c32eb566741c..4e7c44018c498c14ddfcae50d56ccf609f62367f 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/arch/arm/mach-omap2/serial.c
-===================================================================
---- linux-3.1.orig/arch/arm/mach-omap2/serial.c        2011-10-30 00:48:28.997057205 +0200
-+++ linux-3.1/arch/arm/mach-omap2/serial.c     2011-10-30 00:48:53.917039979 +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/arch/arm/mach-omap2/serial.c
                }
        }
  }
-Index: linux-3.1/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c
-===================================================================
---- linux-3.1.orig/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c     2011-10-30 00:48:29.005057199 +0200
-+++ linux-3.1/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c  2011-10-30 00:48:53.917039979 +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
  };