diff options
| author | David S. Miller <davem@davemloft.net> | 2010-01-04 15:33:22 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-04 15:33:22 -0800 |
| commit | 5958eed76ccc8c361f872829bdc4b8c6dc9cd379 (patch) | |
| tree | 8f8dfcced082db674b0ae3ca3af9fdb6dde59dae /drivers/video/omap/omapfb_main.c | |
| parent | c7c17c2779075e675cb3c7fe2ecde67e226771fb (diff) | |
| parent | c5974b835a909ff15c3b7e6cf6789b5eb919f419 (diff) | |
| download | linux-5958eed76ccc8c361f872829bdc4b8c6dc9cd379.tar.gz linux-5958eed76ccc8c361f872829bdc4b8c6dc9cd379.tar.bz2 linux-5958eed76ccc8c361f872829bdc4b8c6dc9cd379.zip | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/video/omap/omapfb_main.c')
| -rw-r--r-- | drivers/video/omap/omapfb_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/omap/omapfb_main.c b/drivers/video/omap/omapfb_main.c index f900a43db8d7..c7f59a5ccdbc 100644 --- a/drivers/video/omap/omapfb_main.c +++ b/drivers/video/omap/omapfb_main.c @@ -29,8 +29,8 @@ #include <linux/uaccess.h> #include <plat/dma.h> -#include <plat/omapfb.h> +#include "omapfb.h" #include "lcdc.h" #include "dispc.h" |