Commit ece8ae49 authored by Ben Dooks's avatar Ben Dooks

ARM: Merge for-2635/defconfig3

Merge branch 'for-2635/defconfig3' into for-linus/2635-updates
parents 8fb9d2d7 2992bc06
# #
# Automatically generated make config: don't edit # Automatically generated make config: don't edit
# Linux kernel version: 2.6.34 # Linux kernel version: 2.6.34
# Wed May 26 19:04:29 2010 # Fri May 28 19:15:48 2010
# #
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_HAVE_PWM=y CONFIG_HAVE_PWM=y
...@@ -250,12 +250,15 @@ CONFIG_S3C_BOOT_UART_FORCE_FIFO=y ...@@ -250,12 +250,15 @@ CONFIG_S3C_BOOT_UART_FORCE_FIFO=y
CONFIG_S3C_LOWLEVEL_UART_PORT=0 CONFIG_S3C_LOWLEVEL_UART_PORT=0
CONFIG_SAMSUNG_CLKSRC=y CONFIG_SAMSUNG_CLKSRC=y
CONFIG_S3C_GPIO_CFG_S3C24XX=y CONFIG_S3C_GPIO_CFG_S3C24XX=y
CONFIG_S3C_GPIO_PULL_UPDOWN=y
CONFIG_S3C_GPIO_PULL_UP=y CONFIG_S3C_GPIO_PULL_UP=y
CONFIG_SAMSUNG_GPIO_EXTRA=0 CONFIG_SAMSUNG_GPIO_EXTRA=0
CONFIG_S3C_GPIO_SPACE=0 CONFIG_S3C_GPIO_SPACE=0
CONFIG_S3C_ADC=y CONFIG_S3C_ADC=y
CONFIG_S3C_DEV_HSMMC=y CONFIG_S3C_DEV_HSMMC=y
CONFIG_S3C_DEV_HSMMC1=y
CONFIG_S3C_DEV_HWMON=y CONFIG_S3C_DEV_HWMON=y
CONFIG_S3C_DEV_FB=y
CONFIG_S3C_DEV_USB_HOST=y CONFIG_S3C_DEV_USB_HOST=y
CONFIG_S3C_DEV_WDT=y CONFIG_S3C_DEV_WDT=y
CONFIG_S3C_DEV_NAND=y CONFIG_S3C_DEV_NAND=y
...@@ -322,11 +325,13 @@ CONFIG_MACH_SMDK2413=y ...@@ -322,11 +325,13 @@ CONFIG_MACH_SMDK2413=y
CONFIG_MACH_S3C2413=y CONFIG_MACH_S3C2413=y
CONFIG_MACH_SMDK2412=y CONFIG_MACH_SMDK2412=y
CONFIG_MACH_VSTMS=y CONFIG_MACH_VSTMS=y
CONFIG_CPU_S3C2416=y
CONFIG_S3C2416_DMA=y
# #
# S3C2416 Machines # S3C2416 Machines
# #
# CONFIG_MACH_SMDK2416 is not set CONFIG_MACH_SMDK2416=y
CONFIG_CPU_S3C2440=y CONFIG_CPU_S3C2440=y
CONFIG_CPU_S3C2442=y CONFIG_CPU_S3C2442=y
CONFIG_CPU_S3C244X=y CONFIG_CPU_S3C244X=y
...@@ -338,9 +343,9 @@ CONFIG_S3C2440_DMA=y ...@@ -338,9 +343,9 @@ CONFIG_S3C2440_DMA=y
# S3C2440 and S3C2442 Machines # S3C2440 and S3C2442 Machines
# #
CONFIG_MACH_ANUBIS=y CONFIG_MACH_ANUBIS=y
# CONFIG_MACH_NEO1973_GTA02 is not set CONFIG_MACH_NEO1973_GTA02=y
CONFIG_MACH_OSIRIS=y CONFIG_MACH_OSIRIS=y
# CONFIG_MACH_OSIRIS_DVS is not set CONFIG_MACH_OSIRIS_DVS=m
CONFIG_MACH_RX3715=y CONFIG_MACH_RX3715=y
CONFIG_ARCH_S3C2440=y CONFIG_ARCH_S3C2440=y
CONFIG_MACH_NEXCODER_2440=y CONFIG_MACH_NEXCODER_2440=y
...@@ -348,7 +353,7 @@ CONFIG_SMDK2440_CPU2440=y ...@@ -348,7 +353,7 @@ CONFIG_SMDK2440_CPU2440=y
CONFIG_SMDK2440_CPU2442=y CONFIG_SMDK2440_CPU2442=y
CONFIG_MACH_AT2440EVB=y CONFIG_MACH_AT2440EVB=y
CONFIG_MACH_MINI2440=y CONFIG_MACH_MINI2440=y
# CONFIG_MACH_RX1950 is not set CONFIG_MACH_RX1950=y
CONFIG_CPU_S3C2443=y CONFIG_CPU_S3C2443=y
CONFIG_S3C2443_DMA=y CONFIG_S3C2443_DMA=y
...@@ -1302,6 +1307,7 @@ CONFIG_INPUT_POWERMATE=m ...@@ -1302,6 +1307,7 @@ CONFIG_INPUT_POWERMATE=m
CONFIG_INPUT_YEALINK=m CONFIG_INPUT_YEALINK=m
CONFIG_INPUT_CM109=m CONFIG_INPUT_CM109=m
CONFIG_INPUT_UINPUT=m CONFIG_INPUT_UINPUT=m
# CONFIG_INPUT_PCF50633_PMU is not set
# CONFIG_INPUT_PCF8574 is not set # CONFIG_INPUT_PCF8574 is not set
CONFIG_INPUT_GPIO_ROTARY_ENCODER=m CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
...@@ -1490,7 +1496,16 @@ CONFIG_GPIOLIB=y ...@@ -1490,7 +1496,16 @@ CONFIG_GPIOLIB=y
# AC97 GPIO expanders: # AC97 GPIO expanders:
# #
# CONFIG_W1 is not set # CONFIG_W1 is not set
# CONFIG_POWER_SUPPLY is not set CONFIG_POWER_SUPPLY=y
# CONFIG_POWER_SUPPLY_DEBUG is not set
# CONFIG_PDA_POWER is not set
# CONFIG_APM_POWER is not set
# CONFIG_TEST_POWER is not set
# CONFIG_BATTERY_DS2760 is not set
# CONFIG_BATTERY_DS2782 is not set
# CONFIG_BATTERY_BQ27x00 is not set
# CONFIG_BATTERY_MAX17040 is not set
# CONFIG_CHARGER_PCF50633 is not set
CONFIG_HWMON=y CONFIG_HWMON=y
CONFIG_HWMON_VID=m CONFIG_HWMON_VID=m
# CONFIG_HWMON_DEBUG_CHIP is not set # CONFIG_HWMON_DEBUG_CHIP is not set
...@@ -1607,7 +1622,7 @@ CONFIG_MFD_SM501=y ...@@ -1607,7 +1622,7 @@ CONFIG_MFD_SM501=y
# CONFIG_HTC_PASIC3 is not set # CONFIG_HTC_PASIC3 is not set
# CONFIG_HTC_I2CPLD is not set # CONFIG_HTC_I2CPLD is not set
# CONFIG_UCB1400_CORE is not set # CONFIG_UCB1400_CORE is not set
# CONFIG_TPS65010 is not set CONFIG_TPS65010=m
# CONFIG_TWL4030_CORE is not set # CONFIG_TWL4030_CORE is not set
# CONFIG_MFD_TMIO is not set # CONFIG_MFD_TMIO is not set
# CONFIG_MFD_T7L66XB is not set # CONFIG_MFD_T7L66XB is not set
...@@ -1620,8 +1635,10 @@ CONFIG_MFD_SM501=y ...@@ -1620,8 +1635,10 @@ CONFIG_MFD_SM501=y
# CONFIG_MFD_WM831X is not set # CONFIG_MFD_WM831X is not set
# CONFIG_MFD_WM8350_I2C is not set # CONFIG_MFD_WM8350_I2C is not set
# CONFIG_MFD_WM8994 is not set # CONFIG_MFD_WM8994 is not set
# CONFIG_MFD_PCF50633 is not set CONFIG_MFD_PCF50633=y
# CONFIG_MFD_MC13783 is not set # CONFIG_MFD_MC13783 is not set
# CONFIG_PCF50633_ADC is not set
CONFIG_PCF50633_GPIO=y
# CONFIG_AB3100_CORE is not set # CONFIG_AB3100_CORE is not set
# CONFIG_EZX_PCAP is not set # CONFIG_EZX_PCAP is not set
# CONFIG_AB4500_CORE is not set # CONFIG_AB4500_CORE is not set
...@@ -1737,6 +1754,7 @@ CONFIG_SND_S3C24XX_SOC_I2S=y ...@@ -1737,6 +1754,7 @@ CONFIG_SND_S3C24XX_SOC_I2S=y
CONFIG_SND_S3C_I2SV2_SOC=m CONFIG_SND_S3C_I2SV2_SOC=m
CONFIG_SND_S3C2412_SOC_I2S=m CONFIG_SND_S3C2412_SOC_I2S=m
CONFIG_SND_S3C_SOC_AC97=m CONFIG_SND_S3C_SOC_AC97=m
# CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753 is not set
CONFIG_SND_S3C24XX_SOC_JIVE_WM8750=m CONFIG_SND_S3C24XX_SOC_JIVE_WM8750=m
CONFIG_SND_S3C24XX_SOC_SMDK2443_WM9710=m CONFIG_SND_S3C24XX_SOC_SMDK2443_WM9710=m
CONFIG_SND_S3C24XX_SOC_LN2440SBC_ALC650=m CONFIG_SND_S3C24XX_SOC_LN2440SBC_ALC650=m
...@@ -2045,6 +2063,7 @@ CONFIG_RTC_INTF_DEV=y ...@@ -2045,6 +2063,7 @@ CONFIG_RTC_INTF_DEV=y
# CONFIG_RTC_DRV_BQ4802 is not set # CONFIG_RTC_DRV_BQ4802 is not set
# CONFIG_RTC_DRV_RP5C01 is not set # CONFIG_RTC_DRV_RP5C01 is not set
# CONFIG_RTC_DRV_V3020 is not set # CONFIG_RTC_DRV_V3020 is not set
# CONFIG_RTC_DRV_PCF50633 is not set
# #
# on-CPU RTC drivers # on-CPU RTC drivers
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment