From dd0faabc824114b0422c1928bd353f2032df305d Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Sat, 4 Aug 2012 07:11:34 +0000
Subject: [PATCH] --- yaml --- r: 321537 b: refs/heads/master c:
 59596df640eb049952dbfe5e7e64ffe826abfe61 h: refs/heads/master i:   321535:
 695fbece37b82e09342dc3d0411b86d5532742a0 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/char/hw_random/omap-rng.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4563968e3ab5..518baac9be33 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4732cc636075ff1a0219bf933d8c23d1a99f41ed
+refs/heads/master: 59596df640eb049952dbfe5e7e64ffe826abfe61
diff --git a/trunk/drivers/char/hw_random/omap-rng.c b/trunk/drivers/char/hw_random/omap-rng.c
index d706bd0e9e80..4fbdceb6f773 100644
--- a/trunk/drivers/char/hw_random/omap-rng.c
+++ b/trunk/drivers/char/hw_random/omap-rng.c
@@ -160,7 +160,7 @@ static int __exit omap_rng_remove(struct platform_device *pdev)
 	return 0;
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 
 static int omap_rng_suspend(struct device *dev)
 {