Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: s3c2410_defconfig: update s3c2410_defconfig

According to merging s3c24xx, updates the current s3c2410_defconfig.

Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

+17 -38
+17 -38
arch/arm/configs/s3c2410_defconfig
··· 3 3 CONFIG_IKCONFIG=m 4 4 CONFIG_IKCONFIG_PROC=y 5 5 CONFIG_LOG_BUF_SHIFT=16 6 - CONFIG_SYSFS_DEPRECATED_V2=y 7 6 CONFIG_BLK_DEV_INITRD=y 8 7 CONFIG_SLAB=y 9 8 CONFIG_MODULES=y 10 9 CONFIG_MODULE_UNLOAD=y 11 10 # CONFIG_BLK_DEV_BSG is not set 11 + CONFIG_PARTITION_ADVANCED=y 12 + CONFIG_BSD_DISKLABEL=y 13 + CONFIG_SOLARIS_X86_PARTITION=y 12 14 CONFIG_ARCH_S3C24XX=y 13 15 CONFIG_S3C_BOOT_ERROR_RESET=y 14 16 CONFIG_S3C_ADC=y 15 17 CONFIG_S3C24XX_PWM=y 16 - CONFIG_ARCH_SMDK2410=y 18 + CONFIG_CPU_S3C2412=y 19 + CONFIG_CPU_S3C2416=y 20 + CONFIG_CPU_S3C2440=y 21 + CONFIG_CPU_S3C2442=y 22 + CONFIG_CPU_S3C2443=y 23 + CONFIG_MACH_AML_M5900=y 24 + CONFIG_ARCH_BAST=y 17 25 CONFIG_ARCH_H1940=y 18 26 CONFIG_MACH_N30=y 19 - CONFIG_ARCH_BAST=y 20 27 CONFIG_MACH_OTOM=y 21 - CONFIG_MACH_AML_M5900=y 28 + CONFIG_MACH_QT2410=y 29 + CONFIG_ARCH_SMDK2410=y 22 30 CONFIG_MACH_TCT_HAMMER=y 23 31 CONFIG_MACH_VR1000=y 24 - CONFIG_MACH_QT2410=y 25 32 CONFIG_MACH_JIVE=y 26 33 CONFIG_MACH_SMDK2412=y 27 34 CONFIG_MACH_VSTMS=y 28 35 CONFIG_MACH_SMDK2416=y 29 36 CONFIG_MACH_ANUBIS=y 30 - CONFIG_MACH_NEO1973_GTA02=y 37 + CONFIG_MACH_AT2440EVB=y 38 + CONFIG_MACH_MINI2440=y 39 + CONFIG_MACH_NEXCODER_2440=y 31 40 CONFIG_MACH_OSIRIS=y 32 41 CONFIG_MACH_OSIRIS_DVS=m 33 42 CONFIG_MACH_RX3715=y 34 43 CONFIG_ARCH_S3C2440=y 35 - CONFIG_MACH_NEXCODER_2440=y 36 - CONFIG_SMDK2440_CPU2442=y 37 - CONFIG_MACH_AT2440EVB=y 38 - CONFIG_MACH_MINI2440=y 44 + CONFIG_MACH_NEO1973_GTA02=y 39 45 CONFIG_MACH_RX1950=y 46 + CONFIG_SMDK2440_CPU2442=y 40 47 CONFIG_MACH_SMDK2443=y 41 48 # CONFIG_ARM_THUMB is not set 42 49 CONFIG_ZBOOT_ROM_TEXT=0x0 ··· 52 45 CONFIG_FPE_NWFPE=y 53 46 CONFIG_FPE_NWFPE_XP=y 54 47 CONFIG_BINFMT_AOUT=y 55 - CONFIG_PM=y 56 48 CONFIG_APM_EMULATION=m 57 49 CONFIG_NET=y 58 50 CONFIG_PACKET=y ··· 64 58 CONFIG_IP_PNP_DHCP=y 65 59 CONFIG_IP_PNP_BOOTP=y 66 60 CONFIG_NET_IPIP=m 67 - CONFIG_NET_IPGRE=m 68 61 CONFIG_INET_AH=m 69 62 CONFIG_INET_ESP=m 70 63 CONFIG_INET_IPCOMP=m ··· 85 80 CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m 86 81 CONFIG_IPV6_TUNNEL=m 87 82 CONFIG_NETFILTER=y 88 - CONFIG_NETFILTER_NETLINK_QUEUE=m 89 83 CONFIG_NF_CONNTRACK=m 90 84 CONFIG_NF_CONNTRACK_EVENTS=y 91 85 CONFIG_NF_CT_PROTO_DCCP=m ··· 142 138 CONFIG_NF_CONNTRACK_IPV4=m 143 139 CONFIG_IP_NF_QUEUE=m 144 140 CONFIG_IP_NF_IPTABLES=m 145 - CONFIG_IP_NF_MATCH_ADDRTYPE=m 146 141 CONFIG_IP_NF_MATCH_AH=m 147 142 CONFIG_IP_NF_MATCH_ECN=m 148 143 CONFIG_IP_NF_MATCH_TTL=m ··· 153 150 CONFIG_IP_NF_TARGET_MASQUERADE=m 154 151 CONFIG_IP_NF_TARGET_NETMAP=m 155 152 CONFIG_IP_NF_TARGET_REDIRECT=m 156 - CONFIG_NF_NAT_SNMP_BASIC=m 157 153 CONFIG_IP_NF_MANGLE=m 158 154 CONFIG_IP_NF_TARGET_CLUSTERIP=m 159 155 CONFIG_IP_NF_TARGET_ECN=m ··· 179 177 CONFIG_IP6_NF_MANGLE=m 180 178 CONFIG_IP6_NF_RAW=m 181 179 CONFIG_BT=m 182 - CONFIG_BT_L2CAP=m 183 - CONFIG_BT_SCO=m 184 180 CONFIG_BT_RFCOMM=m 185 181 CONFIG_BT_RFCOMM_TTY=y 186 182 CONFIG_BT_BNEP=m ··· 199 199 CONFIG_MAC80211_LEDS=y 200 200 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 201 201 CONFIG_MTD=y 202 - CONFIG_MTD_PARTITIONS=y 203 202 CONFIG_MTD_REDBOOT_PARTS=y 204 203 CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y 205 204 CONFIG_MTD_CMDLINE_PARTS=y ··· 220 221 CONFIG_BLK_DEV_UB=m 221 222 CONFIG_BLK_DEV_RAM=y 222 223 CONFIG_ATA_OVER_ETH=m 223 - CONFIG_EEPROM_AT25=m 224 - CONFIG_EEPROM_LEGACY=m 225 - CONFIG_EEPROM_93CX6=m 226 224 CONFIG_IDE=y 227 225 CONFIG_BLK_DEV_IDECD=y 228 226 CONFIG_BLK_DEV_IDETAPE=m ··· 236 240 CONFIG_SCSI_CONSTANTS=y 237 241 CONFIG_SCSI_SCAN_ASYNC=y 238 242 CONFIG_NETDEVICES=y 239 - CONFIG_NET_ETHERNET=y 240 243 CONFIG_DM9000=y 241 244 CONFIG_INPUT_EVDEV=y 242 245 CONFIG_MOUSE_APPLETOUCH=m ··· 269 274 CONFIG_INPUT_TOUCHSCREEN=y 270 275 CONFIG_TOUCHSCREEN_USB_COMPOSITE=m 271 276 CONFIG_INPUT_MISC=y 272 - CONFIG_INPUT_ATI_REMOTE=m 273 277 CONFIG_INPUT_ATI_REMOTE2=m 274 278 CONFIG_INPUT_KEYSPAN_REMOTE=m 275 279 CONFIG_INPUT_POWERMATE=m ··· 294 300 CONFIG_SPI=y 295 301 CONFIG_SPI_GPIO=m 296 302 CONFIG_SPI_S3C24XX=m 297 - CONFIG_SPI_S3C24XX_GPIO=m 298 303 CONFIG_SPI_SPIDEV=m 299 304 CONFIG_SPI_TLE62X0=m 300 305 CONFIG_SENSORS_LM75=m ··· 308 315 CONFIG_FB_S3C2410=y 309 316 CONFIG_FB_SM501=y 310 317 CONFIG_BACKLIGHT_PWM=m 311 - # CONFIG_VGA_CONSOLE is not set 312 318 CONFIG_FRAMEBUFFER_CONSOLE=y 313 319 CONFIG_SOUND=y 314 320 CONFIG_SND=y ··· 322 330 CONFIG_SND_USB_AUDIO=m 323 331 CONFIG_SND_USB_CAIAQ=m 324 332 CONFIG_SND_SOC=y 325 - CONFIG_SND_S3C24XX_SOC=y 326 - CONFIG_SND_S3C24XX_SOC_JIVE_WM8750=m 327 - CONFIG_SND_S3C24XX_SOC_SMDK2443_WM9710=m 328 - CONFIG_SND_S3C24XX_SOC_LN2440SBC_ALC650=m 329 333 # CONFIG_USB_HID is not set 330 334 CONFIG_USB=y 331 335 CONFIG_USB_DEVICEFS=y ··· 375 387 CONFIG_MMC_SDHCI=m 376 388 CONFIG_MMC_SPI=m 377 389 CONFIG_MMC_S3C=y 378 - CONFIG_LEDS_CLASS=m 379 390 CONFIG_LEDS_S3C24XX=m 380 - CONFIG_LEDS_H1940=m 381 391 CONFIG_LEDS_PCA9532=m 382 392 CONFIG_LEDS_GPIO=m 383 393 CONFIG_LEDS_PCA955X=m ··· 396 410 CONFIG_EXT3_FS_POSIX_ACL=y 397 411 CONFIG_EXT4_FS=m 398 412 CONFIG_EXT4_FS_POSIX_ACL=y 399 - CONFIG_INOTIFY=y 400 - CONFIG_AUTOFS_FS=m 401 413 CONFIG_AUTOFS4_FS=m 402 414 CONFIG_FUSE_FS=m 403 415 CONFIG_ISO9660_FS=y ··· 420 436 CONFIG_NFSD_V3_ACL=y 421 437 CONFIG_NFSD_V4=y 422 438 CONFIG_CIFS=m 423 - CONFIG_PARTITION_ADVANCED=y 424 - CONFIG_BSD_DISKLABEL=y 425 - CONFIG_SOLARIS_X86_PARTITION=y 426 439 CONFIG_NLS_CODEPAGE_437=y 427 440 CONFIG_NLS_CODEPAGE_737=m 428 441 CONFIG_NLS_CODEPAGE_775=m ··· 462 481 CONFIG_DEBUG_KERNEL=y 463 482 CONFIG_DEBUG_MUTEXES=y 464 483 CONFIG_DEBUG_INFO=y 465 - # CONFIG_RCU_CPU_STALL_DETECTOR is not set 466 484 CONFIG_SYSCTL_SYSCALL_CHECK=y 467 485 CONFIG_DEBUG_USER=y 468 - CONFIG_DEBUG_ERRORS=y 469 486 CONFIG_DEBUG_LL=y 470 487 # CONFIG_CRYPTO_ANSI_CPRNG is not set