diff options
| author | James Morris <jmorris@namei.org> | 2008-08-28 10:47:34 +1000 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-08-28 10:47:34 +1000 |
| commit | 86d688984deefa3ae5a802880c11f2b408b5d6cf (patch) | |
| tree | 7ea5e8189b0a774626d3ed7c3c87df2495a4c4a0 /drivers/video/omap/lcd_osk.c | |
| parent | 93c06cbbf9fea5d5be1778febb7fa9ab1a74e5f5 (diff) | |
| parent | 4c246edd2550304df5b766cc841584b2bb058843 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'drivers/video/omap/lcd_osk.c')
| -rw-r--r-- | drivers/video/omap/lcd_osk.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/omap/lcd_osk.c b/drivers/video/omap/lcd_osk.c index a38038840fd..a4a725f427a 100644 --- a/drivers/video/omap/lcd_osk.c +++ b/drivers/video/omap/lcd_osk.c @@ -23,9 +23,9 @@ #include <linux/module.h> #include <linux/platform_device.h> -#include <asm/arch/gpio.h> -#include <asm/arch/mux.h> -#include <asm/arch/omapfb.h> +#include <mach/gpio.h> +#include <mach/mux.h> +#include <mach/omapfb.h> static int osk_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev) { |