diff options
| author | Tony Lindgren <tony@atomide.com> | 2009-11-22 13:08:43 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-11-22 13:08:43 -0500 |
| commit | a76df42a675c9936e8bf3607226e74c8a5e2d847 (patch) | |
| tree | 96d93706d884dea956393653452fa4d78d8d7f76 /drivers/video/omap/blizzard.c | |
| parent | 648f4e3e50c4793d9dbf9a09afa193631f76fa26 (diff) | |
| parent | 8171d88089ad63fc442b2bf32af7c18653adc5cb (diff) | |
Merge 7xx-iosplit-plat-merge with omap-fixes
Merge branch '7xx-iosplit-plat-merge' into omap-for-linus
Diffstat (limited to 'drivers/video/omap/blizzard.c')
| -rw-r--r-- | drivers/video/omap/blizzard.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/omap/blizzard.c b/drivers/video/omap/blizzard.c index 70dadf9d2334..f5d75f22cef9 100644 --- a/drivers/video/omap/blizzard.c +++ b/drivers/video/omap/blizzard.c | |||
| @@ -26,9 +26,9 @@ | |||
| 26 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
| 27 | #include <linux/clk.h> | 27 | #include <linux/clk.h> |
| 28 | 28 | ||
| 29 | #include <mach/dma.h> | 29 | #include <plat/dma.h> |
| 30 | #include <mach/omapfb.h> | 30 | #include <plat/omapfb.h> |
| 31 | #include <mach/blizzard.h> | 31 | #include <plat/blizzard.h> |
| 32 | 32 | ||
| 33 | #include "dispc.h" | 33 | #include "dispc.h" |
| 34 | 34 | ||