diff options
author | Tony Lindgren <tony@atomide.com> | 2013-02-11 17:46:00 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2013-03-04 14:12:16 -0500 |
commit | 0adcbaf78f6267baf4eecc201107d8f8ff3b200c (patch) | |
tree | cd3b716a0045af08478bb5e18452d332670ec00f /drivers/video | |
parent | 6dbe51c251a327e012439c4772097a13df43c5b8 (diff) |
ARM: OMAP1: Fix build related to kgdb.h no longer including serial_8250.h
Commit 16559ae4 (kgdb: remove #include <linux/serial_8250.h> from kgdb.h)
had a side effect of breaking omap1_defconfig build as some headers
were included indirectly:
arch/arm/mach-omap1/board-h2.c:249: error: ‘INT_KEYBOARD’ undeclared here (not in a function)
...
This worked earlier as linux/serial_8250.h included linux/serial_core.h,
via linux/serial_8250.h from linux/kgdb.h. Fix this by including the
necessary headers directly.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/omap/lcd_ams_delta.c | 1 | ||||
-rw-r--r-- | drivers/video/omap/lcd_osk.c | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/video/omap/lcd_ams_delta.c b/drivers/video/omap/lcd_ams_delta.c index ed4cad87fbcd..4a5f2cd3d3bf 100644 --- a/drivers/video/omap/lcd_ams_delta.c +++ b/drivers/video/omap/lcd_ams_delta.c | |||
@@ -27,6 +27,7 @@ | |||
27 | #include <linux/lcd.h> | 27 | #include <linux/lcd.h> |
28 | #include <linux/gpio.h> | 28 | #include <linux/gpio.h> |
29 | 29 | ||
30 | #include <mach/hardware.h> | ||
30 | #include <mach/board-ams-delta.h> | 31 | #include <mach/board-ams-delta.h> |
31 | 32 | ||
32 | #include "omapfb.h" | 33 | #include "omapfb.h" |
diff --git a/drivers/video/omap/lcd_osk.c b/drivers/video/omap/lcd_osk.c index 3aa62da89195..7fbe04bce0ed 100644 --- a/drivers/video/omap/lcd_osk.c +++ b/drivers/video/omap/lcd_osk.c | |||
@@ -24,7 +24,10 @@ | |||
24 | #include <linux/platform_device.h> | 24 | #include <linux/platform_device.h> |
25 | 25 | ||
26 | #include <asm/gpio.h> | 26 | #include <asm/gpio.h> |
27 | |||
28 | #include <mach/hardware.h> | ||
27 | #include <mach/mux.h> | 29 | #include <mach/mux.h> |
30 | |||
28 | #include "omapfb.h" | 31 | #include "omapfb.h" |
29 | 32 | ||
30 | static int osk_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev) | 33 | static int osk_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev) |