diff options
| author | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-01-03 16:56:54 +0000 |
|---|---|---|
| committer | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-01-03 16:56:54 +0000 |
| commit | c7b19c2d0c053ca21b7287c2fe0c16fbd3b9f4d4 (patch) | |
| tree | 2ae2c2f51ddf1f498163c848b8241bfa9991341f /target/linux/brcm47xx/patches-3.6/235-bcma-dont-expose-mips-irq.patch | |
| parent | 096fa4a7f7a970bbeaf814d8dbbdae43f9f98fbb (diff) | |
brcm47xx: various fixes and code cleanups for irq code
This is based on a patch send by Nathan Hintz <nlhintz@hotmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34997 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-3.6/235-bcma-dont-expose-mips-irq.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.6/235-bcma-dont-expose-mips-irq.patch | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/target/linux/brcm47xx/patches-3.6/235-bcma-dont-expose-mips-irq.patch b/target/linux/brcm47xx/patches-3.6/235-bcma-dont-expose-mips-irq.patch index 90d05bc8f..5df863605 100644 --- a/target/linux/brcm47xx/patches-3.6/235-bcma-dont-expose-mips-irq.patch +++ b/target/linux/brcm47xx/patches-3.6/235-bcma-dont-expose-mips-irq.patch @@ -1,6 +1,6 @@ --- a/include/linux/bcma/bcma_driver_mips.h +++ b/include/linux/bcma/bcma_driver_mips.h -@@ -49,6 +49,6 @@ static inline void bcma_core_mips_early_ +@@ -48,6 +48,6 @@ static inline void bcma_core_mips_early_ extern u32 bcma_cpu_clock(struct bcma_drv_mips *mcore); @@ -30,7 +30,7 @@ { struct bcma_device *mdev = dev->bus->drv_mips.core; u32 irqflag; -@@ -106,7 +106,12 @@ unsigned int bcma_core_mips_irq(struct b +@@ -103,7 +103,13 @@ unsigned int bcma_core_mips_irq(struct b return 5; } @@ -38,7 +38,8 @@ + +unsigned int bcma_core_irq(struct bcma_device *dev) +{ -+ return bcma_core_mips_irq(dev) + 2; ++ unsigned int mips_irq = bcma_core_mips_irq(dev); ++ return mips_irq <= 4 ? mips_irq + 2 : 0; +} +EXPORT_SYMBOL(bcma_core_irq); |