---

yaml --- r: 255372 b: refs/heads/master c: 1bdcd09 h: refs/heads/master v: v3
git-mirror · Jun 1, 2011 · 5d43b84 · 5d43b84
1 parent 8aa0193
commit 5d43b84
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 24ca39d67968c42d377abc122f6dca635ebcdb79
+refs/heads/master: 1bdcd095e39a789135f8638a2ff76f74e3071d46
diff --git a/trunk/drivers/bcma/main.c b/trunk/drivers/bcma/main.c
@@ -89,6 +89,8 @@ static int bcma_register_cores(struct bcma_bus *bus)
 		switch (bus->hosttype) {
 		case BCMA_HOSTTYPE_PCI:
 			core->dev.parent = &bus->host_pci->dev;
+			core->dma_dev = &bus->host_pci->dev;
+			core->irq = bus->host_pci->irq;
 			break;
 		case BCMA_HOSTTYPE_NONE:
 		case BCMA_HOSTTYPE_SDIO:

diff --git a/trunk/include/linux/bcma/bcma.h b/trunk/include/linux/bcma/bcma.h
@@ -117,6 +117,8 @@ struct bcma_device {
 	struct bcma_device_id id;
 
 	struct device dev;
+	struct device *dma_dev;
+	unsigned int irq;
 	bool dev_registered;
 
 	u8 core_index;