diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-20 14:39:18 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-20 14:39:18 +0400 |
| commit | 170465ee7f5a9a2d0ac71285507e52642e040353 (patch) | |
| tree | dbca81f04cde9e625170abbd6a72555cfbeb194e /drivers/video/omap/blizzard.c | |
| parent | 169ad16bb87c10a3f7c108bb7008ebc0270f617a (diff) | |
| parent | 1fca25427482387689fa27594c992a961d98768f (diff) | |
| download | linux-170465ee7f5a9a2d0ac71285507e52642e040353.tar.xz | |
Merge branch 'linus' into x86/xen
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 4d8ad9cd0e19..9dfcf39d3367 100644 --- a/drivers/video/omap/blizzard.c +++ b/drivers/video/omap/blizzard.c @@ -26,9 +26,9 @@ #include <linux/delay.h> #include <linux/clk.h> -#include <asm/arch/dma.h> -#include <asm/arch/omapfb.h> -#include <asm/arch/blizzard.h> +#include <mach/dma.h> +#include <mach/omapfb.h> +#include <mach/blizzard.h> #include "dispc.h" |