From faa92218d5dd9df9298dbad6117af6655fc6c0c9 Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rjw@sisk.pl>
Date: Tue, 7 Aug 2012 01:15:02 +0200
Subject: [PATCH] --- yaml --- r: 328695 b: refs/heads/master c:
 a62595d359ba8ca0f25b93c06eab84ba97ca516f h: refs/heads/master i:   328693:
 ceeb24e663b1d419a018c031fed1fc415e958d32   328691:
 029519d29983b4b590997bd72ab7180f9dd85779   328687:
 b03059a8bee531e3bc546f77950433576dc8a9f8 v: v3

---
 [refs]                                                 | 2 +-
 trunk/arch/arm/mach-shmobile/include/mach/pm-rmobile.h | 2 --
 trunk/arch/arm/mach-shmobile/pm-rmobile.c              | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 7be374d6fa6b..35d63c4fca1a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 45e5ca575647ebbca932f34a1ed915ae7a581cbb
+refs/heads/master: a62595d359ba8ca0f25b93c06eab84ba97ca516f
diff --git a/trunk/arch/arm/mach-shmobile/include/mach/pm-rmobile.h b/trunk/arch/arm/mach-shmobile/include/mach/pm-rmobile.h
index 4c264c74760f..7fd9ad1fefe4 100644
--- a/trunk/arch/arm/mach-shmobile/include/mach/pm-rmobile.h
+++ b/trunk/arch/arm/mach-shmobile/include/mach/pm-rmobile.h
@@ -30,12 +30,10 @@ struct rmobile_pm_domain *to_rmobile_pd(struct generic_pm_domain *d)
 }
 
 #ifdef CONFIG_PM
-extern void rmobile_init_pm_domain(struct rmobile_pm_domain *rmobile_pd);
 extern void rmobile_init_domains(struct rmobile_pm_domain domains[], int num);
 extern void rmobile_add_device_to_domain(const char *domain_name,
 					struct platform_device *pdev);
 #else
-#define rmobile_init_pm_domain(pd) do { } while (0)
 #define rmobile_init_domains(domains, num) do { } while (0)
 #define rmobile_add_device_to_domain(name, pdev) do { } while (0)
 #endif /* CONFIG_PM */
diff --git a/trunk/arch/arm/mach-shmobile/pm-rmobile.c b/trunk/arch/arm/mach-shmobile/pm-rmobile.c
index 4b6f2ea3169f..63f35665df31 100644
--- a/trunk/arch/arm/mach-shmobile/pm-rmobile.c
+++ b/trunk/arch/arm/mach-shmobile/pm-rmobile.c
@@ -134,7 +134,7 @@ static int rmobile_pd_start_dev(struct device *dev)
 	return ret;
 }
 
-void rmobile_init_pm_domain(struct rmobile_pm_domain *rmobile_pd)
+static void rmobile_init_pm_domain(struct rmobile_pm_domain *rmobile_pd)
 {
 	struct generic_pm_domain *genpd = &rmobile_pd->genpd;
 	struct dev_power_governor *gov = rmobile_pd->gov;