diff --git a/[refs] b/[refs]
index e3caba91f8f8..fd2e16067b6a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 320da0d23ed1f82a896e0cfc1549a896d267777a
+refs/heads/master: e51d8c90a5ead16810302b2dc5127724c9045e77
diff --git a/trunk/drivers/char/hvc_console.c b/trunk/drivers/char/hvc_console.c
index 0f9d356d3bd9..31980994fead 100644
--- a/trunk/drivers/char/hvc_console.c
+++ b/trunk/drivers/char/hvc_console.c
@@ -22,6 +22,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
+#include <linux/config.h>
 #include <linux/console.h>
 #include <linux/cpumask.h>
 #include <linux/init.h>