diff options
author | Linus Walleij <linus.walleij@stericsson.com> | 2010-09-11 07:47:25 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-08 05:02:26 -0400 |
commit | 2da6d64a638eb982bebf34e2999f0b67cfb90f33 (patch) | |
tree | 159fd7a4c3483fd626d6cd81a4cdac7eb37e7b2e | |
parent | 6a7d520fc141ad8f72efab3a5a2a73b3655fee24 (diff) |
ARM: 6369/1: Update RealView SMP defconfig
This patches the condensed RealView SMP defconfig activating the
same 2.6.36 features mentioned in the vanilla RealView defconfig patch
submitted earlier.
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r-- | arch/arm/configs/realview-smp_defconfig | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/arch/arm/configs/realview-smp_defconfig b/arch/arm/configs/realview-smp_defconfig index 9312ef9f9bf4..5ca7a61f7c01 100644 --- a/arch/arm/configs/realview-smp_defconfig +++ b/arch/arm/configs/realview-smp_defconfig | |||
@@ -39,6 +39,7 @@ CONFIG_MTD_CFI=y | |||
39 | CONFIG_MTD_CFI_INTELEXT=y | 39 | CONFIG_MTD_CFI_INTELEXT=y |
40 | CONFIG_MTD_CFI_AMDSTD=y | 40 | CONFIG_MTD_CFI_AMDSTD=y |
41 | CONFIG_MTD_ARM_INTEGRATOR=y | 41 | CONFIG_MTD_ARM_INTEGRATOR=y |
42 | CONFIG_ARM_CHARLCD=y | ||
42 | CONFIG_NETDEVICES=y | 43 | CONFIG_NETDEVICES=y |
43 | CONFIG_SMSC_PHY=y | 44 | CONFIG_SMSC_PHY=y |
44 | CONFIG_NET_ETHERNET=y | 45 | CONFIG_NET_ETHERNET=y |
@@ -52,10 +53,13 @@ CONFIG_SERIAL_AMBA_PL011=y | |||
52 | CONFIG_SERIAL_AMBA_PL011_CONSOLE=y | 53 | CONFIG_SERIAL_AMBA_PL011_CONSOLE=y |
53 | CONFIG_LEGACY_PTY_COUNT=16 | 54 | CONFIG_LEGACY_PTY_COUNT=16 |
54 | # CONFIG_HW_RANDOM is not set | 55 | # CONFIG_HW_RANDOM is not set |
56 | CONFIG_I2C=y | ||
57 | CONFIG_I2C_VERSATILE=y | ||
58 | CONFIG_SPI=y | ||
59 | CONFIG_GPIOLIB=y | ||
55 | # CONFIG_HWMON is not set | 60 | # CONFIG_HWMON is not set |
56 | CONFIG_FB=y | 61 | CONFIG_FB=y |
57 | CONFIG_FB_ARMCLCD=y | 62 | CONFIG_FB_ARMCLCD=y |
58 | # CONFIG_VGA_CONSOLE is not set | ||
59 | CONFIG_FRAMEBUFFER_CONSOLE=y | 63 | CONFIG_FRAMEBUFFER_CONSOLE=y |
60 | CONFIG_LOGO=y | 64 | CONFIG_LOGO=y |
61 | # CONFIG_LOGO_LINUX_MONO is not set | 65 | # CONFIG_LOGO_LINUX_MONO is not set |
@@ -70,7 +74,13 @@ CONFIG_SND_ARMAACI=y | |||
70 | # CONFIG_USB_SUPPORT is not set | 74 | # CONFIG_USB_SUPPORT is not set |
71 | CONFIG_MMC=y | 75 | CONFIG_MMC=y |
72 | CONFIG_MMC_ARMMMCI=y | 76 | CONFIG_MMC_ARMMMCI=y |
73 | CONFIG_INOTIFY=y | 77 | CONFIG_NEW_LEDS=y |
78 | CONFIG_LEDS_CLASS=y | ||
79 | CONFIG_LEDS_TRIGGERS=y | ||
80 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y | ||
81 | CONFIG_RTC_CLASS=y | ||
82 | CONFIG_RTC_DRV_DS1307=y | ||
83 | CONFIG_RTC_DRV_PL031=y | ||
74 | CONFIG_VFAT_FS=y | 84 | CONFIG_VFAT_FS=y |
75 | CONFIG_TMPFS=y | 85 | CONFIG_TMPFS=y |
76 | CONFIG_CRAMFS=y | 86 | CONFIG_CRAMFS=y |
@@ -80,6 +90,7 @@ CONFIG_ROOT_NFS=y | |||
80 | CONFIG_NLS_CODEPAGE_437=y | 90 | CONFIG_NLS_CODEPAGE_437=y |
81 | CONFIG_NLS_ISO8859_1=y | 91 | CONFIG_NLS_ISO8859_1=y |
82 | CONFIG_MAGIC_SYSRQ=y | 92 | CONFIG_MAGIC_SYSRQ=y |
93 | CONFIG_DEBUG_FS=y | ||
83 | CONFIG_DEBUG_KERNEL=y | 94 | CONFIG_DEBUG_KERNEL=y |
84 | # CONFIG_SCHED_DEBUG is not set | 95 | # CONFIG_SCHED_DEBUG is not set |
85 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | 96 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set |