diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-11 17:12:17 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-11 17:12:17 -0800 |
| commit | 501706565b2d4d2d40d0d301d5411ede099b8a6f (patch) | |
| tree | 142a18bf1f1e74a09dbfa27540b893ade0fd797d /drivers/video/omap/lcdc.c | |
| parent | e93737b0f0159a61772894943199fd3b6f315641 (diff) | |
| parent | 2fe77b81c77eed92c4c0439f74c8148a295b4a86 (diff) | |
| download | op-kernel-dev-501706565b2d4d2d40d0d301d5411ede099b8a6f.zip op-kernel-dev-501706565b2d4d2d40d0d301d5411ede099b8a6f.tar.gz | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
include/net/tcp.h
Diffstat (limited to 'drivers/video/omap/lcdc.c')
| -rw-r--r-- | drivers/video/omap/lcdc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/omap/lcdc.c b/drivers/video/omap/lcdc.c index 5f32caf..b831e1d 100644 --- a/drivers/video/omap/lcdc.c +++ b/drivers/video/omap/lcdc.c @@ -30,10 +30,11 @@ #include <linux/clk.h> #include <plat/dma.h> -#include <plat/omapfb.h> #include <asm/mach-types.h> +#include "omapfb.h" + #include "lcdc.h" #define MODULE_NAME "lcdc" |
