diff options
| author | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-03-13 17:24:28 +0000 |
|---|---|---|
| committer | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-03-13 17:24:28 +0000 |
| commit | f61f0b7178fa7591d9b4313b85cf8e47995d531c (patch) | |
| tree | 982e38238f465d6b03e83287949cbdbce14997e7 /target/linux/generic/patches-2.6.31/942-ssb_add_dma_dev.patch | |
| parent | b1ca5c48268904293815970fd82e2723fd648fe8 (diff) | |
ssb: update ssb to version from linux-next-20110311
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26127 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.31/942-ssb_add_dma_dev.patch')
| -rw-r--r-- | target/linux/generic/patches-2.6.31/942-ssb_add_dma_dev.patch | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/target/linux/generic/patches-2.6.31/942-ssb_add_dma_dev.patch b/target/linux/generic/patches-2.6.31/942-ssb_add_dma_dev.patch deleted file mode 100644 index 9251e2873..000000000 --- a/target/linux/generic/patches-2.6.31/942-ssb_add_dma_dev.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- 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; |