kernel: fix some mistakes in ssb patch refresh in r22766, r22767 and r22768.
[openwrt.git] / target / linux / generic / patches-2.6.31 / 942-ssb_add_dma_dev.patch
1 --- a/drivers/ssb/main.c
2 +++ b/drivers/ssb/main.c
3 @@ -461,6 +461,7 @@
4 #ifdef CONFIG_SSB_PCIHOST
5 sdev->irq = bus->host_pci->irq;
6 dev->parent = &bus->host_pci->dev;
7 + sdev->dma_dev = dev->parent;
8 #endif
9 break;
10 case SSB_BUSTYPE_PCMCIA:
11 @@ -473,6 +474,7 @@
12 break;
13 case SSB_BUSTYPE_SSB:
14 dev->dma_mask = &dev->coherent_dma_mask;
15 + sdev->dma_dev = dev;
16 break;
17 }
18
19 --- a/include/linux/ssb/ssb.h
20 +++ b/include/linux/ssb/ssb.h
21 @@ -167,7 +167,7 @@
22 * is an optimization. */
23 const struct ssb_bus_ops *ops;
24
25 - struct device *dev;
26 + struct device *dev, *dma_dev;
27
28 struct ssb_bus *bus;
29 struct ssb_device_id id;
This page took 0.046118 seconds and 5 git commands to generate.