diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2012-04-13 19:35:40 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2012-04-13 19:35:40 +0000 |
| commit | 5af062a0e0b49bf83019a10e850c418d9b2eb56b (patch) | |
| tree | 79b510da8615158d8c424316720200df96151644 /target/linux/brcm47xx/patches-3.2/234-bcma-always-map-4-bytes.patch | |
| parent | 53e32542e15ab3480085f11f94ad1e08368f2f0f (diff) | |
| download | master-187ad058-5af062a0e0b49bf83019a10e850c418d9b2eb56b.tar.gz master-187ad058-5af062a0e0b49bf83019a10e850c418d9b2eb56b.tar.bz2 master-187ad058-5af062a0e0b49bf83019a10e850c418d9b2eb56b.zip | |
kernel: update bcma and ssb to version master-2012-04-12 from wireless-testing
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31278 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-3.2/234-bcma-always-map-4-bytes.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.2/234-bcma-always-map-4-bytes.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/brcm47xx/patches-3.2/234-bcma-always-map-4-bytes.patch b/target/linux/brcm47xx/patches-3.2/234-bcma-always-map-4-bytes.patch index d77f30df68..adaadcc031 100644 --- a/target/linux/brcm47xx/patches-3.2/234-bcma-always-map-4-bytes.patch +++ b/target/linux/brcm47xx/patches-3.2/234-bcma-always-map-4-bytes.patch @@ -1,6 +1,6 @@ --- a/drivers/bcma/driver_pci_host.c +++ b/drivers/bcma/driver_pci_host.c -@@ -118,7 +118,7 @@ static int bcma_extpci_read_config(struc +@@ -119,7 +119,7 @@ static int bcma_extpci_read_config(struc if (unlikely(!addr)) goto out; err = -ENOMEM; @@ -9,7 +9,7 @@ if (!mmio) goto out; -@@ -170,7 +170,7 @@ static int bcma_extpci_write_config(stru +@@ -171,7 +171,7 @@ static int bcma_extpci_write_config(stru addr = pc->core->addr + BCMA_CORE_PCI_PCICFG0; addr |= (func << 8); addr |= (off & 0xfc); @@ -18,7 +18,7 @@ if (!mmio) goto out; } -@@ -179,7 +179,7 @@ static int bcma_extpci_write_config(stru +@@ -180,7 +180,7 @@ static int bcma_extpci_write_config(stru if (unlikely(!addr)) goto out; err = -ENOMEM; |