diff options
| author | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-07-11 18:50:55 +0000 |
|---|---|---|
| committer | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-07-11 18:50:55 +0000 |
| commit | a04d4f8ddb2065f634c872be00c32dcfaef91b85 (patch) | |
| tree | d40b15ac762ccdc461eb172b293e6c3efea5a204 /target | |
| parent | 3a46cb8e1685374eff5af1479145df2be5168ef6 (diff) | |
kernel: 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@22135 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
| -rw-r--r-- | target/linux/generic/patches-2.6.35/976-ssb_add_dma_dev.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/target/linux/generic/patches-2.6.35/976-ssb_add_dma_dev.patch b/target/linux/generic/patches-2.6.35/976-ssb_add_dma_dev.patch new file mode 100644 index 000000000..fd463b4a7 --- /dev/null +++ b/target/linux/generic/patches-2.6.35/976-ssb_add_dma_dev.patch @@ -0,0 +1,52 @@ +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(-) + +--- a/drivers/ssb/main.c ++++ b/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; + } + +--- a/include/linux/ssb/ssb.h ++++ b/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; |