Skip to content
Snippets Groups Projects
Commit fe655729 authored by Felix Fietkau's avatar Felix Fietkau
Browse files

kernel: backport ssb dma_dev changes to fix b43 build

SVN-Revision: 22718
parent 48c7c56d
No related branches found
No related tags found
No related merge requests found
--- 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;
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment