diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-15 22:15:00 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-15 22:15:00 -0400 |
| commit | c4cbb34bbdaaa841ef7c027f7b420db4c318c4fd (patch) | |
| tree | 90f40954097eb686752e03ad7088bd9191345132 /include | |
| parent | 0517deed78be9cc9ce9799bf15da58fd0d2078bb (diff) | |
| parent | b358492cd2a9c67bff352c5a60d86e7fc9627477 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ssb/ssb.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/ssb/ssb.h b/include/linux/ssb/ssb.h index 20add65215af..db53defde5ee 100644 --- a/include/linux/ssb/ssb.h +++ b/include/linux/ssb/ssb.h | |||
| @@ -129,6 +129,10 @@ struct ssb_device { | |||
| 129 | const struct ssb_bus_ops *ops; | 129 | const struct ssb_bus_ops *ops; |
| 130 | 130 | ||
| 131 | struct device *dev; | 131 | struct device *dev; |
| 132 | /* Pointer to the device that has to be used for | ||
| 133 | * any DMA related operation. */ | ||
| 134 | struct device *dma_dev; | ||
| 135 | |||
| 132 | struct ssb_bus *bus; | 136 | struct ssb_bus *bus; |
| 133 | struct ssb_device_id id; | 137 | struct ssb_device_id id; |
| 134 | 138 | ||