Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+6
+2
arch/arm/mach-omap1/common.h
··· 31 31 32 32 #include <plat/i2c.h> 33 33 34 + #include <mach/irqs.h> 35 + 34 36 #if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850) 35 37 void omap7xx_map_io(void); 36 38 #else
+1
drivers/video/omap/lcd_ams_delta.c
··· 27 27 #include <linux/lcd.h> 28 28 #include <linux/gpio.h> 29 29 30 + #include <mach/hardware.h> 30 31 #include <mach/board-ams-delta.h> 31 32 32 33 #include "omapfb.h"
+3
drivers/video/omap/lcd_osk.c
··· 24 24 #include <linux/platform_device.h> 25 25 26 26 #include <asm/gpio.h> 27 + 28 + #include <mach/hardware.h> 27 29 #include <mach/mux.h> 30 + 28 31 #include "omapfb.h" 29 32 30 33 static int osk_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev)