From 619f630c9287e582c7d606bab2a0b196eb83bb91 Mon Sep 17 00:00:00 2001
From: Paul Gortmaker <paul.gortmaker@windriver.com>
Date: Sun, 25 Mar 2012 20:02:55 -0400
Subject: [PATCH] --- yaml --- r: 299048 b: refs/heads/master c:
 58f743ee06d400a887a3e30353c69c3151eb64df h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/bcma/Kconfig           | 2 +-
 trunk/drivers/bcma/driver_pci_host.c | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a41ebdb0e7af..2924dabc1f07 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7ab2485b69571a3beb0313c591486626c3374c85
+refs/heads/master: 58f743ee06d400a887a3e30353c69c3151eb64df
diff --git a/trunk/drivers/bcma/Kconfig b/trunk/drivers/bcma/Kconfig
index c1172dafdffa..fb7c80fb721e 100644
--- a/trunk/drivers/bcma/Kconfig
+++ b/trunk/drivers/bcma/Kconfig
@@ -29,7 +29,7 @@ config BCMA_HOST_PCI
 
 config BCMA_DRIVER_PCI_HOSTMODE
 	bool "Driver for PCI core working in hostmode"
-	depends on BCMA && MIPS
+	depends on BCMA && MIPS && BCMA_HOST_PCI
 	help
 	  PCI core hostmode operation (external PCI bus).
 
diff --git a/trunk/drivers/bcma/driver_pci_host.c b/trunk/drivers/bcma/driver_pci_host.c
index 4e20bcfa7ec5..d2097a11c3c7 100644
--- a/trunk/drivers/bcma/driver_pci_host.c
+++ b/trunk/drivers/bcma/driver_pci_host.c
@@ -10,6 +10,7 @@
  */
 
 #include "bcma_private.h"
+#include <linux/pci.h>
 #include <linux/export.h>
 #include <linux/bcma/bcma.h>
 #include <asm/paccess.h>