From 7ad53024ba55ecb6fdacdee5198cccf2495ea37f Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 4 Feb 2013 15:35:26 -0800
Subject: [PATCH] --- yaml --- r: 354847 b: refs/heads/master c:
 16559ae48c76f1ceb970b9719dea62b77eb5d06b h: refs/heads/master i:   354845:
 b6283b02fd1852dd28cd7e30594c32f0266f4e9a   354843:
 53e2d37e8e4435c72ac8490414ffbfc85c903280   354839:
 ab24b28d5d159ba40fc3588be4d8dc100baed70f   354831:
 3577fa73d72d932e36c269d9410fb4e4174674a4   354815:
 c1e0d891adbcde8aced45f686ea5d6de9f3a57da v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/gpu/drm/gma500/cdv_intel_dp.c | 1 +
 trunk/drivers/tty/serial/kgdb_nmi.c         | 1 +
 trunk/drivers/video/auo_k190x.c             | 1 +
 trunk/drivers/video/backlight/ot200_bl.c    | 1 +
 trunk/include/linux/kgdb.h                  | 1 -
 trunk/kernel/debug/debug_core.c             | 1 +
 trunk/kernel/debug/gdbstub.c                | 1 +
 8 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1d43447b1f77..83526afc5fca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 85f024401bf80746ae08b7fd5809a9b16accf0b1
+refs/heads/master: 16559ae48c76f1ceb970b9719dea62b77eb5d06b
diff --git a/trunk/drivers/gpu/drm/gma500/cdv_intel_dp.c b/trunk/drivers/gpu/drm/gma500/cdv_intel_dp.c
index 51044cc55cf2..88d9ef6b5b4a 100644
--- a/trunk/drivers/gpu/drm/gma500/cdv_intel_dp.c
+++ b/trunk/drivers/gpu/drm/gma500/cdv_intel_dp.c
@@ -27,6 +27,7 @@
 
 #include <linux/i2c.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #include <drm/drmP.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_crtc_helper.h>
diff --git a/trunk/drivers/tty/serial/kgdb_nmi.c b/trunk/drivers/tty/serial/kgdb_nmi.c
index 26a50b0c868b..5dafcf1c227b 100644
--- a/trunk/drivers/tty/serial/kgdb_nmi.c
+++ b/trunk/drivers/tty/serial/kgdb_nmi.c
@@ -23,6 +23,7 @@
 #include <linux/tty.h>
 #include <linux/tty_driver.h>
 #include <linux/tty_flip.h>
+#include <linux/serial_core.h>
 #include <linux/interrupt.h>
 #include <linux/hrtimer.h>
 #include <linux/tick.h>
diff --git a/trunk/drivers/video/auo_k190x.c b/trunk/drivers/video/auo_k190x.c
index 97f79356141e..53846cb534d4 100644
--- a/trunk/drivers/video/auo_k190x.c
+++ b/trunk/drivers/video/auo_k190x.c
@@ -11,6 +11,7 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/gpio.h>
+#include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/fb.h>
 #include <linux/delay.h>
diff --git a/trunk/drivers/video/backlight/ot200_bl.c b/trunk/drivers/video/backlight/ot200_bl.c
index 469cf0f109d2..fdbb6ee5027c 100644
--- a/trunk/drivers/video/backlight/ot200_bl.c
+++ b/trunk/drivers/video/backlight/ot200_bl.c
@@ -14,6 +14,7 @@
 #include <linux/fb.h>
 #include <linux/backlight.h>
 #include <linux/gpio.h>
+#include <linux/platform_device.h>
 #include <linux/cs5535.h>
 
 static struct cs5535_mfgpt_timer *pwm_timer;
diff --git a/trunk/include/linux/kgdb.h b/trunk/include/linux/kgdb.h
index 4dff0c6ed58f..c6e091bf39a5 100644
--- a/trunk/include/linux/kgdb.h
+++ b/trunk/include/linux/kgdb.h
@@ -13,7 +13,6 @@
 #ifndef _KGDB_H_
 #define _KGDB_H_
 
-#include <linux/serial_8250.h>
 #include <linux/linkage.h>
 #include <linux/init.h>
 #include <linux/atomic.h>
diff --git a/trunk/kernel/debug/debug_core.c b/trunk/kernel/debug/debug_core.c
index 9a61738cefc8..c26278fd4851 100644
--- a/trunk/kernel/debug/debug_core.c
+++ b/trunk/kernel/debug/debug_core.c
@@ -29,6 +29,7 @@
  */
 #include <linux/pid_namespace.h>
 #include <linux/clocksource.h>
+#include <linux/serial_core.h>
 #include <linux/interrupt.h>
 #include <linux/spinlock.h>
 #include <linux/console.h>
diff --git a/trunk/kernel/debug/gdbstub.c b/trunk/kernel/debug/gdbstub.c
index ce615e064482..38573f35a5ad 100644
--- a/trunk/kernel/debug/gdbstub.c
+++ b/trunk/kernel/debug/gdbstub.c
@@ -31,6 +31,7 @@
 #include <linux/kernel.h>
 #include <linux/kgdb.h>
 #include <linux/kdb.h>
+#include <linux/serial_core.h>
 #include <linux/reboot.h>
 #include <linux/uaccess.h>
 #include <asm/cacheflush.h>