---

yaml --- r: 269495 b: refs/heads/master c: f80aee7 h: refs/heads/master i: 269493: 42363d8 269491: 42ebd01 269487: 25f5327 v: v3
git-mirror · Oct 7, 2011 · ad0945f · ad0945f
1 parent b9190a3
commit ad0945f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d4f4158dcda2f75ba8024e540d0bba070af1e67a
+refs/heads/master: f80aee7fd095d9014a92a250c688ff5dbc0a6649
diff --git a/trunk/drivers/input/keyboard/lm8323.c b/trunk/drivers/input/keyboard/lm8323.c
@@ -788,7 +788,7 @@ static int __devexit lm8323_remove(struct i2c_client *client)
 	return 0;
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 /*
  * We don't need to explicitly suspend the chip, as it already switches off
  * when there's no activity.