aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/omap24xx/patches-3.1/420-hci-h4p-interrupt-workaround.patch
diff options
context:
space:
mode:
authorMichael Büsch <mb@bu3sch.de>2011-10-29 22:52:07 +0000
committerMichael Büsch <mb@bu3sch.de>2011-10-29 22:52:07 +0000
commit37ff2a430dec463b23881a37c84de51163928da1 (patch)
tree6e84584410f025e9b3a85138f060167e21d73e29 /target/linux/omap24xx/patches-3.1/420-hci-h4p-interrupt-workaround.patch
parent541b8d0d4b6702ce4c3b1c6ca0cb1dd84df08191 (diff)
downloadmaster-187ad058-37ff2a430dec463b23881a37c84de51163928da1.tar.gz
master-187ad058-37ff2a430dec463b23881a37c84de51163928da1.tar.bz2
master-187ad058-37ff2a430dec463b23881a37c84de51163928da1.zip
omap24xx: Refresh 3.1 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28676 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/omap24xx/patches-3.1/420-hci-h4p-interrupt-workaround.patch')
-rw-r--r--target/linux/omap24xx/patches-3.1/420-hci-h4p-interrupt-workaround.patch12
1 files changed, 6 insertions, 6 deletions
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 6eb9569891..3aa04adcf0 100644
--- 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,7 @@
-Index: linux-3.1-rc4/arch/arm/mach-omap2/serial.c
+Index: linux-3.1/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
+--- 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
@@ -546,10 +546,12 @@ static void omap_uart_idle_init(struct o
uart->padconf = 0;
}
@@ -43,10 +43,10 @@ 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
+Index: linux-3.1/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
+--- 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
@@ -253,7 +253,7 @@ struct omap_hwmod_irq_info omap2_timer11
};