Merge branch 'master' into upstream

[pandora-kernel.git] / kernel / power / main.c

diff --git a/kernel/power/main.c b/kernel/power/main.c
index 0a907f0..cdf0f07 100644 (file)
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -15,7 +15,7 @@
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/pm.h>
-
+#include <linux/console.h>
 
 #include "power.h"