diff options
| author | Olof Johansson <olof@lixom.net> | 2012-04-27 09:40:06 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-04-27 09:40:06 -0700 |
| commit | 6e76538b9ef2b2a14ad9b57d65dc35d151765917 (patch) | |
| tree | abb95e720792583a5656137650eb0549c8967c10 /arch/arm/configs | |
| parent | dadb3660a3ad162ac6e76be7262c72f48177f1aa (diff) | |
| parent | 9b4d1cbb1391ae603c20cbf8c0beb66e38397196 (diff) | |
Merge branch 'v3.4-samsung-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
* 'v3.4-samsung-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: SAMSUNG: add missing MMC_CAP2_BROKEN_VOLTAGE capability
ARM: EXYNOS: Fix compilation error when CONFIG_OF is not defined
ARM: EXYNOS: Fix resource on dev-dwmci.c
ARM: S3C24XX: Fix build warning for S3C2410_PM
ARM: mini2440_defconfig: Fix build error
ARM: EXYNOS: Fix incorrect initialization of GIC
ARM: EXYNOS: use 'exynos4-sdhci' as device name for sdhci controllers
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/mini2440_defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/mini2440_defconfig b/arch/arm/configs/mini2440_defconfig index 42da9183acc8..082175c54e7c 100644 --- a/arch/arm/configs/mini2440_defconfig +++ b/arch/arm/configs/mini2440_defconfig @@ -14,6 +14,8 @@ CONFIG_MODULE_FORCE_UNLOAD=y # CONFIG_BLK_DEV_BSG is not set CONFIG_BLK_DEV_INTEGRITY=y CONFIG_ARCH_S3C24XX=y +# CONFIG_CPU_S3C2410 is not set +CONFIG_CPU_S3C2440=y CONFIG_S3C_ADC=y CONFIG_S3C24XX_PWM=y CONFIG_MACH_MINI2440=y |