diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-03-05 23:22:00 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-03-05 23:22:00 +0100 |
| commit | f01c28794c80cd4ca1520c73305ba7b82a657802 (patch) | |
| tree | 4d6ce6fdca54a10baedf70ff5e84ef2d1146379d /drivers | |
| parent | 4246a9c9682fcced5e5dd997614a3d4f606efe7a (diff) | |
| parent | b0ad0995e92fdf6b25056da76c906c51bb06d6a5 (diff) | |
| download | linux-stable-f01c28794c80cd4ca1520c73305ba7b82a657802.tar.gz linux-stable-f01c28794c80cd4ca1520c73305ba7b82a657802.tar.bz2 linux-stable-f01c28794c80cd4ca1520c73305ba7b82a657802.zip | |
Merge tag 'omap-for-v3.9-rc1/fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
Fix few regressions, omap3 pm init with device tree, and some
issues with the legacy mux code.
* tag 'omap-for-v3.9-rc1/fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP: RX-51: add missing USB phy binding
ARM: OMAP2+: Remove duplicate omap4430_init_late() declaration
ARM: OMAP2+: mux: correct wrong error messages
ARM: OMAP2+: mux: fix debugfs file permission
ARM: OMAP2+: Fix unmet direct dependencies for zoom for 8250 serial
ARM: OMAP3: board-generic: Add missing omap3_init_late
ARM: OMAP2+: Fix broken gpmc support
ARM: OMAP1: Fix build related to kgdb.h no longer including serial_8250.h
Diffstat (limited to 'drivers')
| -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 @@ #include <linux/lcd.h> #include <linux/gpio.h> +#include <mach/hardware.h> #include <mach/board-ams-delta.h> #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 @@ #include <linux/platform_device.h> #include <asm/gpio.h> + +#include <mach/hardware.h> #include <mach/mux.h> + #include "omapfb.h" static int osk_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev) |