diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2011-11-13 10:48:05 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2011-11-13 10:48:05 +0000 |
| commit | e30803b3df8914dbd3864d0ba3dfc1e02dfa8524 (patch) | |
| tree | aa5d6eb24cbb7886936f09c1f3d28f7979c05ea4 /target/linux/omap24xx/patches-3.1/420-hci-h4p-interrupt-workaround.patch | |
| parent | b94c5c50310b7e0fa870a52cc9ade8a3220adf59 (diff) | |
| download | master-187ad058-e30803b3df8914dbd3864d0ba3dfc1e02dfa8524.tar.gz master-187ad058-e30803b3df8914dbd3864d0ba3dfc1e02dfa8524.tar.bz2 master-187ad058-e30803b3df8914dbd3864d0ba3dfc1e02dfa8524.zip | |
linux: update 3.1 to 3.1.1
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29007 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.patch | 12 |
1 files changed, 4 insertions, 8 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 3aa04adcf0..4e7c44018c 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,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 }; |