diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-11 00:55:17 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-11 00:55:17 -0500 |
| commit | aa2cf420593b67cc93de7a3f675b2a88eba0505f (patch) | |
| tree | dfb3c73a8a3987c3b3ba08083f379ebc90942e03 /arch/arm/configs | |
| parent | d71cb81af3817193bc605de061da0499934263a6 (diff) | |
| parent | 178ff4c9175db447f93b7343954b1d44707c881b (diff) | |
Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux
* 'for-linus' of git://gitorious.org/linux-omap-dss2/linux:
MAINTAINERS: Add OMAP2/3 DSS and OMAPFB maintainer
OMAP: SDP: Enable DSS2 for OMAP3 SDP board
OMAP: DSS2: Taal DSI command mode panel driver
OMAP: DSS2: Add generic and Sharp panel drivers
OMAP: DSS2: omapfb driver
OMAP: DSS2: DSI driver
OMAP: DSS2: SDI driver
OMAP: DSS2: RFBI driver
OMAP: DSS2: Video encoder driver
OMAP: DSS2: DPI driver
OMAP: DSS2: DISPC
OMAP: DSS2: Add more core files
OMAP: DSS2: Display Subsystem Driver core
OMAP: DSS2: Documentation for DSS2
OMAP: Add support for VRFB rotation engine
OMAP: Add VRAM manager
OMAP: OMAPFB: add omapdss device
OMAP: OMAPFB: split omapfb.h
OMAP2: Add funcs for writing SMS_ROT_* registers
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/omap_3430sdp_defconfig | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/arch/arm/configs/omap_3430sdp_defconfig b/arch/arm/configs/omap_3430sdp_defconfig index 84829587d55..592457cfbbe 100644 --- a/arch/arm/configs/omap_3430sdp_defconfig +++ b/arch/arm/configs/omap_3430sdp_defconfig | |||
| @@ -963,10 +963,32 @@ CONFIG_FB_CFB_IMAGEBLIT=y | |||
| 963 | # | 963 | # |
| 964 | # CONFIG_FB_S1D13XXX is not set | 964 | # CONFIG_FB_S1D13XXX is not set |
| 965 | # CONFIG_FB_VIRTUAL is not set | 965 | # CONFIG_FB_VIRTUAL is not set |
| 966 | CONFIG_FB_OMAP=y | 966 | # CONFIG_FB_METRONOME is not set |
| 967 | # CONFIG_FB_OMAP_LCDC_EXTERNAL is not set | 967 | # CONFIG_FB_MB862XX is not set |
| 968 | # CONFIG_FB_BROADSHEET is not set | ||
| 969 | # CONFIG_FB_OMAP_LCD_VGA is not set | ||
| 968 | # CONFIG_FB_OMAP_BOOTLOADER_INIT is not set | 970 | # CONFIG_FB_OMAP_BOOTLOADER_INIT is not set |
| 969 | CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2 | 971 | CONFIG_OMAP2_VRAM=y |
| 972 | CONFIG_OMAP2_VRFB=y | ||
| 973 | CONFIG_OMAP2_DSS=y | ||
| 974 | CONFIG_OMAP2_VRAM_SIZE=4 | ||
| 975 | CONFIG_OMAP2_DSS_DEBUG_SUPPORT=y | ||
| 976 | # CONFIG_OMAP2_DSS_RFBI is not set | ||
| 977 | CONFIG_OMAP2_DSS_VENC=y | ||
| 978 | # CONFIG_OMAP2_DSS_SDI is not set | ||
| 979 | # CONFIG_OMAP2_DSS_DSI is not set | ||
| 980 | # CONFIG_OMAP2_DSS_FAKE_VSYNC is not set | ||
| 981 | CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=0 | ||
| 982 | CONFIG_FB_OMAP2=y | ||
| 983 | CONFIG_FB_OMAP2_DEBUG_SUPPORT=y | ||
| 984 | # CONFIG_FB_OMAP2_FORCE_AUTO_UPDATE is not set | ||
| 985 | CONFIG_FB_OMAP2_NUM_FBS=3 | ||
| 986 | |||
| 987 | # | ||
| 988 | # OMAP2/3 Display Device Drivers | ||
| 989 | # | ||
| 990 | CONFIG_PANEL_GENERIC=y | ||
| 991 | CONFIG_PANEL_SHARP_LS037V7DW01=y | ||
| 970 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 992 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
| 971 | 993 | ||
| 972 | # | 994 | # |