diff options
author | Florian Fainelli <florian@openwrt.org> | 2010-06-12 18:10:22 +0000 |
---|---|---|
committer | Florian Fainelli <florian@openwrt.org> | 2010-06-12 18:10:22 +0000 |
commit | 028489ba86cd1c53371d50b3f7de51abeb8e76fd (patch) | |
tree | 5a1ff048ab5c889e4129e8293f92e158c083a7ed | |
parent | 924c09e04c410f923fe90e8f9a4bcd0d3bef533c (diff) | |
download | master-187ad058-028489ba86cd1c53371d50b3f7de51abeb8e76fd.tar.gz master-187ad058-028489ba86cd1c53371d50b3f7de51abeb8e76fd.tar.bz2 master-187ad058-028489ba86cd1c53371d50b3f7de51abeb8e76fd.zip |
[package] add missing dma_dev member to struct ssb_device to make b43/b43legacy compile with current mac80211 version
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21770 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r-- | target/linux/generic-2.6/patches-2.6.34/976-ssb_add_dma_dev.patch | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.34/976-ssb_add_dma_dev.patch b/target/linux/generic-2.6/patches-2.6.34/976-ssb_add_dma_dev.patch new file mode 100644 index 0000000000..b207c094c6 --- /dev/null +++ b/target/linux/generic-2.6/patches-2.6.34/976-ssb_add_dma_dev.patch @@ -0,0 +1,59 @@ +From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> + +Add dma_dev, a pointer to struct device, to struct ssb_device. We pass it +to the generic DMA API with SSB_BUSTYPE_PCI and SSB_BUSTYPE_SSB. +ssb_devices_register() sets up it properly. + +This is preparation for replacing the ssb bus specific DMA API (ssb_dma_*) +with the generic DMA API. + +Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> +Acked-by: Michael Buesch <mb@bu3sch.de> +Cc: Gary Zambrano <zambrano@broadcom.com> +Cc: Stefano Brivio <stefano.brivio@polimi.it> +Cc: Larry Finger <Larry.Finger@lwfinger.net> +Cc: John W. Linville <linville@tuxdriver.com> +Acked-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Andrew Morton <akpm@linux-foundation.org> +--- + + drivers/ssb/main.c | 2 ++ + include/linux/ssb/ssb.h | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff -puN drivers/ssb/main.c~ssb-add-dma_dev-to-ssb_device-structure drivers/ssb/main.c +--- a/drivers/ssb/main.c~ssb-add-dma_dev-to-ssb_device-structure ++++ a/drivers/ssb/main.c +@@ -486,6 +486,7 @@ static int ssb_devices_register(struct s + #ifdef CONFIG_SSB_PCIHOST + sdev->irq = bus->host_pci->irq; + dev->parent = &bus->host_pci->dev; ++ sdev->dma_dev = dev->parent; + #endif + break; + case SSB_BUSTYPE_PCMCIA: +@@ -501,6 +502,7 @@ static int ssb_devices_register(struct s + break; + case SSB_BUSTYPE_SSB: + dev->dma_mask = &dev->coherent_dma_mask; ++ sdev->dma_dev = dev; + break; + } + +diff -puN include/linux/ssb/ssb.h~ssb-add-dma_dev-to-ssb_device-structure include/linux/ssb/ssb.h +--- a/include/linux/ssb/ssb.h~ssb-add-dma_dev-to-ssb_device-structure ++++ a/include/linux/ssb/ssb.h +@@ -167,7 +167,7 @@ struct ssb_device { + * is an optimization. */ + const struct ssb_bus_ops *ops; + +- struct device *dev; ++ struct device *dev, *dma_dev; + + struct ssb_bus *bus; + struct ssb_device_id id; +_ +-- +To unsubscribe from this list: send the line "unsubscribe linux-wireless" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html |