From ae9e2a8b3156fd475bbc1b3cdad1f71ca105f1ea Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 13 Jan 2012 23:58:40 +0100
Subject: [PATCH] --- yaml --- r: 286204 b: refs/heads/master c:
 685a4ef0df23b97eea1842c2698da9a2e35fc976 h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/bcma/bcma_private.h | 1 +
 trunk/drivers/bcma/host_pci.c     | 2 +-
 trunk/drivers/bcma/main.c         | 5 +++++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5db55da0491e..2591188cba2b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d2031f2395728c765cf2bd7c1ebb6d51c4fe076
+refs/heads/master: 685a4ef0df23b97eea1842c2698da9a2e35fc976
diff --git a/trunk/drivers/bcma/bcma_private.h b/trunk/drivers/bcma/bcma_private.h
index fda56bde36b8..0def898a1d15 100644
--- a/trunk/drivers/bcma/bcma_private.h
+++ b/trunk/drivers/bcma/bcma_private.h
@@ -19,6 +19,7 @@ int __init bcma_bus_early_register(struct bcma_bus *bus,
 				   struct bcma_device *core_cc,
 				   struct bcma_device *core_mips);
 #ifdef CONFIG_PM
+int bcma_bus_suspend(struct bcma_bus *bus);
 int bcma_bus_resume(struct bcma_bus *bus);
 #endif
 
diff --git a/trunk/drivers/bcma/host_pci.c b/trunk/drivers/bcma/host_pci.c
index 86dfeea77e1a..f59244e33971 100644
--- a/trunk/drivers/bcma/host_pci.c
+++ b/trunk/drivers/bcma/host_pci.c
@@ -242,7 +242,7 @@ static int bcma_host_pci_suspend(struct device *dev)
 
 	bus->mapped_core = NULL;
 
-	return 0;
+	return bcma_bus_suspend(bus);
 }
 
 static int bcma_host_pci_resume(struct device *dev)
diff --git a/trunk/drivers/bcma/main.c b/trunk/drivers/bcma/main.c
index 10f92b371e58..b711d9d634a7 100644
--- a/trunk/drivers/bcma/main.c
+++ b/trunk/drivers/bcma/main.c
@@ -241,6 +241,11 @@ int __init bcma_bus_early_register(struct bcma_bus *bus,
 }
 
 #ifdef CONFIG_PM
+int bcma_bus_suspend(struct bcma_bus *bus)
+{
+	return 0;
+}
+
 int bcma_bus_resume(struct bcma_bus *bus)
 {
 	struct bcma_device *core;