diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-18 02:56:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-18 02:56:30 -0400 |
| commit | 1e42198609d73ed1a9adcba2af275c24c2678420 (patch) | |
| tree | 32fd4d9073bfc0f3909af8f9fb4bcff38951d01a /include/linux/ssb | |
| parent | 794eb6bf20ebf992c040ea831cd3a9c64b0c1f7a (diff) | |
| parent | 4b119e21d0c66c22e8ca03df05d9de623d0eb50f (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/ssb')
| -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 9f95afd0e9e3..50dfd0dc4093 100644 --- a/include/linux/ssb/ssb.h +++ b/include/linux/ssb/ssb.h | |||
| @@ -137,6 +137,10 @@ struct ssb_device { | |||
| 137 | const struct ssb_bus_ops *ops; | 137 | const struct ssb_bus_ops *ops; |
| 138 | 138 | ||
| 139 | struct device *dev; | 139 | struct device *dev; |
| 140 | /* Pointer to the device that has to be used for | ||
| 141 | * any DMA related operation. */ | ||
| 142 | struct device *dma_dev; | ||
| 143 | |||
| 140 | struct ssb_bus *bus; | 144 | struct ssb_bus *bus; |
| 141 | struct ssb_device_id id; | 145 | struct ssb_device_id id; |
| 142 | 146 | ||