aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorAndy Green <andy@openmoko.com>2008-11-28 10:05:52 +0000
committerAndy Green <agreen@pads.home.warmcat.com>2008-11-28 10:05:52 +0000
commit0ee98453b4f1998d0b40e916f5d50f9c520f7f95 (patch)
tree364e57a7df1a9db69e230b2faf358878009606f1 /arch
parent31ed0490bc03a22e3227352b7152e9206c2f8aea (diff)
config-gta02-uplevel-balaji-pcf50606-changes.patch
Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/gta02-moredrivers-defconfig12
1 files changed, 7 insertions, 5 deletions
diff --git a/arch/arm/configs/gta02-moredrivers-defconfig b/arch/arm/configs/gta02-moredrivers-defconfig
index c06002a88a1..10060398484 100644
--- a/arch/arm/configs/gta02-moredrivers-defconfig
+++ b/arch/arm/configs/gta02-moredrivers-defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.28-rc4
-# Thu Nov 27 13:55:13 2008
+# Fri Nov 28 10:03:49 2008
#
CONFIG_ARM=y
CONFIG_HAVE_PWM=y
@@ -175,6 +175,7 @@ CONFIG_S3C24XX_PWM=y
CONFIG_S3C2410_DMA=y
# CONFIG_S3C2410_DMA_DEBUG is not set
CONFIG_MACH_SMDK=y
+CONFIG_MACH_NEO1973=y
CONFIG_PLAT_S3C=y
CONFIG_CPU_LLSERIAL_S3C2410=y
CONFIG_CPU_LLSERIAL_S3C2440=y
@@ -802,7 +803,6 @@ CONFIG_MISC_DEVICES=y
# CONFIG_EEPROM_93CX6 is not set
CONFIG_LOW_MEMORY_KILLER=y
# CONFIG_ENCLOSURE_SERVICES is not set
-CONFIG_MACH_NEO1973=y
CONFIG_HAVE_IDE=y
# CONFIG_IDE is not set
@@ -1147,6 +1147,7 @@ CONFIG_APM_POWER=y
# CONFIG_BATTERY_BQ27x00 is not set
CONFIG_BATTERY_BQ27000_HDQ=y
CONFIG_GTA02_HDQ=y
+CONFIG_CHARGER_PCF50633=y
CONFIG_HWMON=y
# CONFIG_HWMON_VID is not set
# CONFIG_SENSORS_AD7414 is not set
@@ -1239,9 +1240,9 @@ CONFIG_SSB_POSSIBLE=y
# 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_PCF50633_ADC=y
+CONFIG_PCF50633_GPIO=y
+# CONFIG_MFD_PCF50606 is not set
CONFIG_MFD_GLAMO=y
CONFIG_MFD_GLAMO_FB=y
CONFIG_MFD_GLAMO_SPI_GPIO=y
@@ -1665,6 +1666,7 @@ CONFIG_RTC_INTF_DEV=y
# CONFIG_RTC_DRV_PCF8563 is not set
# CONFIG_RTC_DRV_PCF8583 is not set
CONFIG_RTC_DRV_PCF50633=y
+# CONFIG_RTC_DRV_PCF50606 is not set
# CONFIG_RTC_DRV_M41T80 is not set
# CONFIG_RTC_DRV_S35390A is not set
# CONFIG_RTC_DRV_FM3130 is not set