summaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-3.2/234-bcma-always-map-4-bytes.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2012-04-13 19:35:40 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2012-04-13 19:35:40 +0000
commit6af575967c780fa41029bdb64fdd68646ab516d1 (patch)
treebf5fa402a077278c773200cb2aa941cc0b9e6883 /target/linux/brcm47xx/patches-3.2/234-bcma-always-map-4-bytes.patch
parent3f240440c76765426018151ab3ea019547108326 (diff)
downloadmaster-31e0f0ae-6af575967c780fa41029bdb64fdd68646ab516d1.tar.gz
master-31e0f0ae-6af575967c780fa41029bdb64fdd68646ab516d1.tar.bz2
master-31e0f0ae-6af575967c780fa41029bdb64fdd68646ab516d1.zip
kernel: update bcma and ssb to version master-2012-04-12 from wireless-testing
SVN-Revision: 31278
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.patch6
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;