From 1a740a8103968697723556bbf3d7da9de488b573 Mon Sep 17 00:00:00 2001
From: Nishanth Menon <nm@ti.com>
Date: Tue, 4 Jan 2011 14:07:14 -0600
Subject: [PATCH] --- yaml --- r: 231105 b: refs/heads/master c:
 b97c374d8a44292c601146783aac61f3d5d1f46f h: refs/heads/master i:   231103:
 53e91ba0be2782071f8d44b6082d2ce5fbbb9c37 v: v3

---
 [refs]                             | 2 +-
 trunk/arch/arm/mach-omap2/pm_bus.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 57dd37e896c7..c37fa5bc0ddf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f7c5cc456211da7d0b0aefd3886e57b313a0e00f
+refs/heads/master: b97c374d8a44292c601146783aac61f3d5d1f46f
diff --git a/trunk/arch/arm/mach-omap2/pm_bus.c b/trunk/arch/arm/mach-omap2/pm_bus.c
index 784989f8f2f5..5acd2ab298b1 100644
--- a/trunk/arch/arm/mach-omap2/pm_bus.c
+++ b/trunk/arch/arm/mach-omap2/pm_bus.c
@@ -20,7 +20,7 @@
 #include <plat/omap-pm.h>
 
 #ifdef CONFIG_PM_RUNTIME
-int omap_pm_runtime_suspend(struct device *dev)
+static int omap_pm_runtime_suspend(struct device *dev)
 {
 	struct platform_device *pdev = to_platform_device(dev);
 	int r, ret = 0;
@@ -37,7 +37,7 @@ int omap_pm_runtime_suspend(struct device *dev)
 	return ret;
 };
 
-int omap_pm_runtime_resume(struct device *dev)
+static int omap_pm_runtime_resume(struct device *dev)
 {
 	struct platform_device *pdev = to_platform_device(dev);
 	int r;