aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorAndy Green <andy@openmoko.com>2008-11-21 11:56:56 +0000
committerAndy Green <agreen@pads.home.warmcat.com>2008-11-21 11:56:56 +0000
commit804bceb50fd1beead43af784f5e453bdb9c1c07e (patch)
treee7434cafb813aca7531342e87a398afc1a936ba6 /arch
parentd0a6129d70085bfb8b41ef8e8c42f848746c6203 (diff)
config-gta03-balaji-uplevel.patch
Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/gta03_defconfig14
1 files changed, 8 insertions, 6 deletions
diff --git a/arch/arm/configs/gta03_defconfig b/arch/arm/configs/gta03_defconfig
index e03bc515125..8491c1b8d53 100644
--- a/arch/arm/configs/gta03_defconfig
+++ b/arch/arm/configs/gta03_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.28-rc3
-# Tue Nov 11 08:09:33 2008
+# Linux kernel version: 2.6.28-rc4
+# Wed Nov 19 20:29:48 2008
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -188,6 +188,7 @@ CONFIG_S3C_GPIO_PULL_UPDOWN=y
CONFIG_S3C_GPIO_CFG_S3C24XX=y
CONFIG_S3C_GPIO_CFG_S3C64XX=y
CONFIG_S3C_DEV_HSMMC=y
+CONFIG_S3C_DEV_HSMMC1=y
CONFIG_S3C_DEV_I2C1=y
CONFIG_CPU_S3C6410=y
CONFIG_S3C6410_SETUP_SDHCI=y
@@ -584,6 +585,7 @@ CONFIG_INPUT_MISC=y
# CONFIG_INPUT_CM109 is not set
# CONFIG_INPUT_UINPUT is not set
CONFIG_INPUT_LIS302DL=y
+CONFIG_INPUT_PCF50633_PMU=y
#
# Hardware I/O ports
@@ -807,6 +809,10 @@ CONFIG_SSB_POSSIBLE=y
# CONFIG_PMIC_DA903X is not set
# CONFIG_MFD_WM8400 is not set
# CONFIG_MFD_WM8350_I2C is not set
+CONFIG_MFD_PCF50633=y
+CONFIG_MFD_PCF50633_ADC=y
+CONFIG_MFD_PCF50633_MBC=y
+CONFIG_MFD_PCF50633_GPIO=y
# CONFIG_MFD_GLAMO is not set
#
@@ -1005,10 +1011,6 @@ CONFIG_ANDROID_LOGGER=y
# CONFIG_ANDROID_RAM_CONSOLE is not set
# CONFIG_ANDROID_TIMED_GPIO is not set
# CONFIG_ANDROID_PARANOID_NETWORK is not set
-
-#
-# Voltage and Current regulators
-#
CONFIG_REGULATOR=y
# CONFIG_REGULATOR_DEBUG is not set
# CONFIG_REGULATOR_FIXED_VOLTAGE is not set