aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/configs/gta02_packaging_defconfig
diff options
context:
space:
mode:
authorThomas White <taw@bitwiz.org.uk>2009-04-25 19:23:57 +0100
committerThomas White <taw@bitwiz.org.uk>2009-04-25 19:23:57 +0100
commitca8cdf043c7c6d8e1b4b3d86f3cae12fc37756a2 (patch)
treedad605a1b3142e85d9ddc08a77d62f6bf09f22cc /arch/arm/configs/gta02_packaging_defconfig
parent16696dd08020690cff796fc4705b4d6bd14e91b0 (diff)
parentb4136a36f31a65d0998a328465df9e8e2ba93166 (diff)
Merge branch 'andy-tracking' into drm-tracking
Conflicts: drivers/mfd/glamo/Kconfig
Diffstat (limited to 'arch/arm/configs/gta02_packaging_defconfig')
-rw-r--r--arch/arm/configs/gta02_packaging_defconfig21
1 files changed, 9 insertions, 12 deletions
diff --git a/arch/arm/configs/gta02_packaging_defconfig b/arch/arm/configs/gta02_packaging_defconfig
index 5f9aa9338e9..237fd959510 100644
--- a/arch/arm/configs/gta02_packaging_defconfig
+++ b/arch/arm/configs/gta02_packaging_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.29-rc3
-# Tue Feb 24 02:12:40 2009
+# Sun Apr 19 22:57:25 2009
#
CONFIG_ARM=y
CONFIG_HAVE_PWM=y
@@ -204,6 +204,7 @@ CONFIG_S3C_GPIO_SPACE=0
CONFIG_S3C_GPIO_TRACK=y
CONFIG_S3C_DMA=y
CONFIG_S3C_PWM=y
+CONFIG_S3C_DEV_USB_HOST=y
#
# S3C2400 Machines
@@ -1032,8 +1033,8 @@ CONFIG_INPUT_MISC=y
# CONFIG_INPUT_YEALINK is not set
# CONFIG_INPUT_CM109 is not set
CONFIG_INPUT_UINPUT=m
-CONFIG_INPUT_PCF50633_PMU=y
CONFIG_INPUT_LIS302DL=y
+CONFIG_INPUT_PCF50633_PMU=y
#
# Hardware I/O ports
@@ -1282,6 +1283,7 @@ CONFIG_PCF50633_GPIO=y
# CONFIG_MFD_PCF50606 is not set
CONFIG_MFD_GLAMO=y
CONFIG_MFD_GLAMO_FB=y
+CONFIG_MFD_GLAMO_FB_XGLAMO_WORKAROUND=y
CONFIG_MFD_GLAMO_SPI_GPIO=y
CONFIG_MFD_GLAMO_SPI_FB=y
CONFIG_MFD_GLAMO_MCI=y
@@ -1803,17 +1805,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
@@ -1894,7 +1892,6 @@ CONFIG_NFS_FS=m
CONFIG_NFS_V3=y
CONFIG_NFS_V3_ACL=y
# CONFIG_NFS_V4 is not set
-CONFIG_ROOT_NFS=y
CONFIG_NFSD=m
CONFIG_NFSD_V2_ACL=y
CONFIG_NFSD_V3=y