diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-16 18:28:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-16 18:28:04 -0400 |
| commit | 3879f5d6f03b66626af014cbb6071ad4d79b1c42 (patch) | |
| tree | 018c183306253f12c1d9da739a78d41be71e1cb3 /arch/arm | |
| parent | 607b067e161185d5c441aa366ff9fccd4fd676cb (diff) | |
| parent | 6e1588cbd88590273300403648aef70e6bdaf5af (diff) | |
Merge branch 'imx-fb-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx into devel
Conflicts:
drivers/video/mx3fb.c
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/mx3fb.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/arch/arm/plat-mxc/include/mach/mx3fb.h b/arch/arm/plat-mxc/include/mach/mx3fb.h index e391a76ca87d..ac24c5c4bc83 100644 --- a/arch/arm/plat-mxc/include/mach/mx3fb.h +++ b/arch/arm/plat-mxc/include/mach/mx3fb.h | |||
| @@ -14,25 +14,25 @@ | |||
| 14 | #include <linux/fb.h> | 14 | #include <linux/fb.h> |
| 15 | 15 | ||
| 16 | /* Proprietary FB_SYNC_ flags */ | 16 | /* Proprietary FB_SYNC_ flags */ |
| 17 | #define FB_SYNC_OE_ACT_HIGH 0x80000000 | 17 | #define FB_SYNC_OE_ACT_HIGH 0x80000000 |
| 18 | #define FB_SYNC_CLK_INVERT 0x40000000 | 18 | #define FB_SYNC_CLK_INVERT 0x40000000 |
| 19 | #define FB_SYNC_DATA_INVERT 0x20000000 | 19 | #define FB_SYNC_DATA_INVERT 0x20000000 |
| 20 | #define FB_SYNC_CLK_IDLE_EN 0x10000000 | 20 | #define FB_SYNC_CLK_IDLE_EN 0x10000000 |
| 21 | #define FB_SYNC_SHARP_MODE 0x08000000 | 21 | #define FB_SYNC_SHARP_MODE 0x08000000 |
| 22 | #define FB_SYNC_SWAP_RGB 0x04000000 | 22 | #define FB_SYNC_SWAP_RGB 0x04000000 |
| 23 | #define FB_SYNC_CLK_SEL_EN 0x02000000 | 23 | #define FB_SYNC_CLK_SEL_EN 0x02000000 |
| 24 | 24 | ||
| 25 | /** | 25 | /** |
| 26 | * struct mx3fb_platform_data - mx3fb platform data | 26 | * struct mx3fb_platform_data - mx3fb platform data |
| 27 | * | 27 | * |
| 28 | * @dma_dev: pointer to the dma-device, used for dma-slave connection | 28 | * @dma_dev: pointer to the dma-device, used for dma-slave connection |
| 29 | * @mode: pointer to a platform-provided per mxc_register_fb() videomode | 29 | * @mode: pointer to a platform-provided per mxc_register_fb() videomode |
| 30 | */ | 30 | */ |
| 31 | struct mx3fb_platform_data { | 31 | struct mx3fb_platform_data { |
| 32 | struct device *dma_dev; | 32 | struct device *dma_dev; |
| 33 | const char *name; | 33 | const char *name; |
| 34 | const struct fb_videomode *mode; | 34 | const struct fb_videomode *mode; |
| 35 | int num_modes; | 35 | int num_modes; |
| 36 | }; | 36 | }; |
| 37 | 37 | ||
| 38 | #endif | 38 | #endif |