diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2013-01-18 11:44:42 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2013-01-18 11:44:42 +0000 |
| commit | 0de21d9747688e37cc9a9fb92c41abcdde9ef09f (patch) | |
| tree | 51801994cc7cff255ad19e00fccc9bfd511928fe /target/linux/generic/patches-3.7/025-bcma_backport.patch | |
| parent | 5a122f7e5f6129edf7f37c5638f6c19859c3513c (diff) | |
| download | upstream-0de21d9747688e37cc9a9fb92c41abcdde9ef09f.tar.gz upstream-0de21d9747688e37cc9a9fb92c41abcdde9ef09f.tar.bz2 upstream-0de21d9747688e37cc9a9fb92c41abcdde9ef09f.zip | |
kernel: update linux 3.7 to 3.7.3
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 35216
Diffstat (limited to 'target/linux/generic/patches-3.7/025-bcma_backport.patch')
| -rw-r--r-- | target/linux/generic/patches-3.7/025-bcma_backport.patch | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/target/linux/generic/patches-3.7/025-bcma_backport.patch b/target/linux/generic/patches-3.7/025-bcma_backport.patch index fa0ff31618..4bd1b11f39 100644 --- a/target/linux/generic/patches-3.7/025-bcma_backport.patch +++ b/target/linux/generic/patches-3.7/025-bcma_backport.patch @@ -734,17 +734,15 @@ } EXPORT_SYMBOL(bcma_core_mips_irq); -@@ -114,8 +121,8 @@ static void bcma_core_mips_set_irq(struc +@@ -114,7 +121,7 @@ static void bcma_core_mips_set_irq(struc bcma_write32(mdev, BCMA_MIPS_MIPS74K_INTMASK(0), bcma_read32(mdev, BCMA_MIPS_MIPS74K_INTMASK(0)) & ~(1 << irqflag)); - else -- bcma_write32(mdev, BCMA_MIPS_MIPS74K_INTMASK(irq), 0); + else if (oldirq != 5) -+ bcma_write32(mdev, BCMA_MIPS_MIPS74K_INTMASK(oldirq), 0); + bcma_write32(mdev, BCMA_MIPS_MIPS74K_INTMASK(oldirq), 0); /* assign the new one */ - if (irq == 0) { @@ -123,9 +130,9 @@ static void bcma_core_mips_set_irq(struc bcma_read32(mdev, BCMA_MIPS_MIPS74K_INTMASK(0)) | (1 << irqflag)); @@ -1357,7 +1355,7 @@ #endif /* LINUX_BCMA_REGS_H_ */ --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c -@@ -4656,7 +4656,7 @@ static int b43_wireless_core_init(struct +@@ -4684,7 +4684,7 @@ static int b43_wireless_core_init(struct switch (dev->dev->bus_type) { #ifdef CONFIG_B43_BCMA case B43_BUS_BCMA: |