diff options
author | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-01-10 14:05:18 +0000 |
---|---|---|
committer | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-01-10 14:05:18 +0000 |
commit | e676003d8704a75d5ee3b58ccf820e827f836de9 (patch) | |
tree | f3d6e1fbe661581152ae5ee189db20ea7f00ac5d /target/linux/brcm47xx/patches-3.6/185-bcma-rename-oldirqflag-to-irqinitmask-to-better-matc.patch | |
parent | 75662734f2aa2805f480b25bdf8c601e444d7633 (diff) |
kernel: update bcma and ssb to master-2013-01-09 from wireless-testing
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35080 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-3.6/185-bcma-rename-oldirqflag-to-irqinitmask-to-better-matc.patch')
-rw-r--r-- | target/linux/brcm47xx/patches-3.6/185-bcma-rename-oldirqflag-to-irqinitmask-to-better-matc.patch | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/target/linux/brcm47xx/patches-3.6/185-bcma-rename-oldirqflag-to-irqinitmask-to-better-matc.patch b/target/linux/brcm47xx/patches-3.6/185-bcma-rename-oldirqflag-to-irqinitmask-to-better-matc.patch deleted file mode 100644 index 5fb952f60..000000000 --- a/target/linux/brcm47xx/patches-3.6/185-bcma-rename-oldirqflag-to-irqinitmask-to-better-matc.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/drivers/bcma/driver_mips.c -+++ b/drivers/bcma/driver_mips.c -@@ -131,9 +131,9 @@ static void bcma_core_mips_set_irq(struc - bcma_read32(mdev, BCMA_MIPS_MIPS74K_INTMASK(0)) | - (1 << irqflag)); - } else { -- u32 oldirqflag = bcma_read32(mdev, -- BCMA_MIPS_MIPS74K_INTMASK(irq)); -- if (oldirqflag) { -+ u32 irqinitmask = bcma_read32(mdev, -+ BCMA_MIPS_MIPS74K_INTMASK(irq)); -+ if (irqinitmask) { - struct bcma_device *core; - - /* backplane irq line is in use, find out who uses -@@ -141,7 +141,7 @@ static void bcma_core_mips_set_irq(struc - */ - list_for_each_entry(core, &bus->cores, list) { - if ((1 << bcma_core_mips_irqflag(core)) == -- oldirqflag) { -+ irqinitmask) { - bcma_core_mips_set_irq(core, 0); - break; - } |