diff options
| author | Thomas White <taw@bitwiz.org.uk> | 2009-07-15 12:02:49 +0100 |
|---|---|---|
| committer | Thomas White <taw@bitwiz.org.uk> | 2009-07-15 12:02:49 +0100 |
| commit | 7903aad4738b38f48fb8800782b186be8dfaa024 (patch) | |
| tree | a8b20157c57c9dc35f049725d38fb2ca645c816a /arch | |
| parent | d1bb1b43b8db0926715d4bb1bbd9abcb88a4c5ee (diff) | |
| parent | 5b85050a8f1e7db530f803627ba6371ca9c0ba9b (diff) | |
Merge branch 'drm-kms' into drm-tracking
Conflicts:
drivers/mfd/glamo/glamo-cmdq.c
drivers/mfd/glamo/glamo-cmdq.h
drivers/mfd/glamo/glamo-drm-drv.c
drivers/mfd/glamo/glamo-drm-private.h
Signed-off-by: Thomas White <taw@bitwiz.org.uk>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/configs/gta02_drm_defconfig | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/arch/arm/configs/gta02_drm_defconfig b/arch/arm/configs/gta02_drm_defconfig index adea7d4c8cd..c6bc8933ecc 100644 --- a/arch/arm/configs/gta02_drm_defconfig +++ b/arch/arm/configs/gta02_drm_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.29-rc3 -# Sun Apr 19 18:51:41 2009 +# Thu Jul 2 20:40:33 2009 # CONFIG_ARM=y CONFIG_HAVE_PWM=y @@ -35,7 +35,7 @@ CONFIG_EXPERIMENTAL=y CONFIG_BROKEN_ON_SMP=y CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 -CONFIG_LOCALVERSION="-mokodev" +CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y @@ -1084,7 +1084,7 @@ CONFIG_I2C=y CONFIG_I2C_BOARDINFO=y CONFIG_I2C_CHARDEV=y CONFIG_I2C_HELPER_AUTO=y -CONFIG_I2C_ALGOBIT=m +CONFIG_I2C_ALGOBIT=y # # I2C Hardware Bus support @@ -1283,11 +1283,14 @@ CONFIG_PCF50633_ADC=y CONFIG_PCF50633_GPIO=y # CONFIG_MFD_PCF50606 is not set CONFIG_MFD_GLAMO=y -CONFIG_MFD_GLAMO_FB=y + +# +# SMedia Glamo 336x/337x engine drivers +# +# CONFIG_MFD_GLAMO_FB is not set CONFIG_MFD_GLAMO_SPI_GPIO=y -CONFIG_MFD_GLAMO_SPI_FB=y CONFIG_MFD_GLAMO_MCI=y -CONFIG_MFD_GLAMO_DRM=m +CONFIG_MFD_GLAMO_DRM=y # # Multimedia devices @@ -1309,7 +1312,7 @@ CONFIG_DAB=y # # Graphics support # -CONFIG_DRM=m +CONFIG_DRM=y # CONFIG_VGASTATE is not set CONFIG_VIDEO_OUTPUT_CONTROL=y CONFIG_FB=y @@ -1807,17 +1810,13 @@ CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XIP is not set CONFIG_EXT3_FS=y # CONFIG_EXT3_FS_XATTR is not set -CONFIG_EXT4_FS=y -CONFIG_EXT4DEV_COMPAT=y -CONFIG_EXT4_FS_XATTR=y -# CONFIG_EXT4_FS_POSIX_ACL is not set -CONFIG_EXT4_FS_SECURITY=y +# CONFIG_EXT4_FS is not set CONFIG_JBD=y # CONFIG_JBD_DEBUG is not set -CONFIG_JBD2=y -# CONFIG_JBD2_DEBUG is not set -CONFIG_FS_MBCACHE=y -# CONFIG_REISERFS_FS is not set +CONFIG_REISERFS_FS=m +# CONFIG_REISERFS_CHECK is not set +# CONFIG_REISERFS_PROC_INFO is not set +# CONFIG_REISERFS_FS_XATTR is not set # CONFIG_JFS_FS is not set CONFIG_FS_POSIX_ACL=y CONFIG_FILE_LOCKING=y |