aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/include/linux
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-04-15 19:15:00 -0700
committerDavid S. Miller <davem@davemloft.net>2008-04-15 19:15:00 -0700
commitc4cbb34bbdaaa841ef7c027f7b420db4c318c4fd (patch)
tree90f40954097eb686752e03ad7088bd9191345132 /include/linux
parentnetconsole: only set CON_PRINTBUFFER if the user specifies a netconsole (diff)
parentPS3: gelic: fix the oops on the broken IE returned from the hypervisor (diff)
downloadwireguard-linux-c4cbb34bbdaaa841ef7c027f7b420db4c318c4fd.tar.xz
wireguard-linux-c4cbb34bbdaaa841ef7c027f7b420db4c318c4fd.zip
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/ssb/ssb.h4
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 {
const struct ssb_bus_ops *ops;
struct device *dev;
+ /* Pointer to the device that has to be used for
+ * any DMA related operation. */
+ struct device *dma_dev;
+
struct ssb_bus *bus;
struct ssb_device_id id;