mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-01 22:35:20 +02:00
f210f1fdc9
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21802 3c298f89-4303-0410-b956-a3cf2f4a3e73
30 lines
763 B
Diff
30 lines
763 B
Diff
--- a/drivers/ssb/main.c
|
|
+++ b/drivers/ssb/main.c
|
|
@@ -465,6 +465,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:
|
|
@@ -475,6 +476,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;
|
|
default:
|
|
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;
|