diff options
| author | Tony Lindgren <tony@atomide.com> | 2009-11-10 21:10:34 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-11-10 21:10:34 -0500 |
| commit | 774facda20d2f8f0f61fa312d8028dad18ac5ee4 (patch) | |
| tree | a9068b769fa5956beaabc2445ebe1d575585d7d3 /drivers/video/omap/hwa742.c | |
| parent | b419148e567728f6af0c3b01965c1cc141e3e13a (diff) | |
| parent | ce491cf85466c3377228c5a852ea627ec5136956 (diff) | |
Merge branch '7xx-iosplit-plat' with omap-fixes
Diffstat (limited to 'drivers/video/omap/hwa742.c')
| -rw-r--r-- | drivers/video/omap/hwa742.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/omap/hwa742.c b/drivers/video/omap/hwa742.c index ca51583ec98a..17a975e4c9c9 100644 --- a/drivers/video/omap/hwa742.c +++ b/drivers/video/omap/hwa742.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/hwa742.h> | 31 | #include <plat/hwa742.h> |
| 32 | 32 | ||
| 33 | #define HWA742_REV_CODE_REG 0x0 | 33 | #define HWA742_REV_CODE_REG 0x0 |
| 34 | #define HWA742_CONFIG_REG 0x2 | 34 | #define HWA742_CONFIG_REG 0x2 |