diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-03 13:28:46 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-03 13:28:46 -0400 |
| commit | f68ec0c24755e5cdb779be6240925f2175311d84 (patch) | |
| tree | a7b7128e61a8456385d82bd1c7ca5f14eecbf2ca /drivers/video/omap/lcd_inn1610.c | |
| parent | 98920dc3d1113b883cbc73e3293446d3525c6042 (diff) | |
| parent | 94aca1dac6f6d21f4b07e4864baf7768cabcc6e7 (diff) | |
Merge commit 'v2.6.27-rc8' into x86/setup
Diffstat (limited to 'drivers/video/omap/lcd_inn1610.c')
| -rw-r--r-- | drivers/video/omap/lcd_inn1610.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/omap/lcd_inn1610.c b/drivers/video/omap/lcd_inn1610.c index 5ef119c813e0..6a42c6a0cd99 100644 --- a/drivers/video/omap/lcd_inn1610.c +++ b/drivers/video/omap/lcd_inn1610.c | |||
| @@ -22,8 +22,8 @@ | |||
| 22 | #include <linux/module.h> | 22 | #include <linux/module.h> |
| 23 | #include <linux/platform_device.h> | 23 | #include <linux/platform_device.h> |
| 24 | 24 | ||
| 25 | #include <asm/arch/gpio.h> | 25 | #include <mach/gpio.h> |
| 26 | #include <asm/arch/omapfb.h> | 26 | #include <mach/omapfb.h> |
| 27 | 27 | ||
| 28 | #define MODULE_NAME "omapfb-lcd_h3" | 28 | #define MODULE_NAME "omapfb-lcd_h3" |
| 29 | 29 | ||