1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-28 16:28:07 +02:00
openwrt-xburst/target/linux/generic/patches-2.6.31/942-ssb_add_dma_dev.patch
nbd e3fc173c6b kernel: backport ssb dma_dev changes to fix b43 build
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22718 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-08-19 12:49:29 +00:00

30 lines
645 B
Diff

--- a/drivers/ssb/main.c
+++ b/drivers/ssb/main.c
@@ -461,6 +461,7 @@
#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:
@@ -473,6 +474,7 @@
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 @@
* 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;