diff options
author | Ben Dooks <ben-linux@org.rmk.(none)> | 2006-11-03 12:38:02 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-11-03 14:52:55 -0500 |
commit | da86341856befac4e2f4b16965d6f78379dc960a (patch) | |
tree | 179624ac59cbb59754b94eca8036fc77b2b90b83 /arch | |
parent | 73d15da44f34626b4ad18eb4d56e1c2c4aaed578 (diff) |
[ARM] 3922/1: S3C24XX: update s3c2410_defconfig to 2.6.19-rc4
Update the s3c2410_defconfig to 2.6.19-rc4
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/configs/s3c2410_defconfig | 49 |
1 files changed, 34 insertions, 15 deletions
diff --git a/arch/arm/configs/s3c2410_defconfig b/arch/arm/configs/s3c2410_defconfig index a83222641045..c773380fed38 100644 --- a/arch/arm/configs/s3c2410_defconfig +++ b/arch/arm/configs/s3c2410_defconfig | |||
@@ -1,9 +1,10 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.18 | 3 | # Linux kernel version: 2.6.19-rc4 |
4 | # Wed Sep 20 20:27:31 2006 | 4 | # Fri Nov 3 17:34:07 2006 |
5 | # | 5 | # |
6 | CONFIG_ARM=y | 6 | CONFIG_ARM=y |
7 | # CONFIG_GENERIC_TIME is not set | ||
7 | CONFIG_MMU=y | 8 | CONFIG_MMU=y |
8 | CONFIG_GENERIC_HARDIRQS=y | 9 | CONFIG_GENERIC_HARDIRQS=y |
9 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 10 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
@@ -29,17 +30,20 @@ CONFIG_LOCALVERSION="" | |||
29 | CONFIG_LOCALVERSION_AUTO=y | 30 | CONFIG_LOCALVERSION_AUTO=y |
30 | CONFIG_SWAP=y | 31 | CONFIG_SWAP=y |
31 | CONFIG_SYSVIPC=y | 32 | CONFIG_SYSVIPC=y |
33 | # CONFIG_IPC_NS is not set | ||
32 | # CONFIG_POSIX_MQUEUE is not set | 34 | # CONFIG_POSIX_MQUEUE is not set |
33 | # CONFIG_BSD_PROCESS_ACCT is not set | 35 | # CONFIG_BSD_PROCESS_ACCT is not set |
34 | # CONFIG_TASKSTATS is not set | 36 | # CONFIG_TASKSTATS is not set |
37 | # CONFIG_UTS_NS is not set | ||
35 | # CONFIG_AUDIT is not set | 38 | # CONFIG_AUDIT is not set |
36 | # CONFIG_IKCONFIG is not set | 39 | # CONFIG_IKCONFIG is not set |
37 | # CONFIG_RELAY is not set | 40 | # CONFIG_RELAY is not set |
38 | CONFIG_INITRAMFS_SOURCE="" | 41 | CONFIG_INITRAMFS_SOURCE="" |
39 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 42 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
43 | CONFIG_SYSCTL=y | ||
40 | # CONFIG_EMBEDDED is not set | 44 | # CONFIG_EMBEDDED is not set |
41 | CONFIG_UID16=y | 45 | CONFIG_UID16=y |
42 | CONFIG_SYSCTL=y | 46 | # CONFIG_SYSCTL_SYSCALL is not set |
43 | CONFIG_KALLSYMS=y | 47 | CONFIG_KALLSYMS=y |
44 | # CONFIG_KALLSYMS_ALL is not set | 48 | # CONFIG_KALLSYMS_ALL is not set |
45 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 49 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
@@ -70,6 +74,7 @@ CONFIG_KMOD=y | |||
70 | # | 74 | # |
71 | # Block layer | 75 | # Block layer |
72 | # | 76 | # |
77 | CONFIG_BLOCK=y | ||
73 | # CONFIG_BLK_DEV_IO_TRACE is not set | 78 | # CONFIG_BLK_DEV_IO_TRACE is not set |
74 | 79 | ||
75 | # | 80 | # |
@@ -120,6 +125,7 @@ CONFIG_ARCH_S3C2410=y | |||
120 | # | 125 | # |
121 | # S3C24XX Implementations | 126 | # S3C24XX Implementations |
122 | # | 127 | # |
128 | # CONFIG_MACH_AML_M5900 is not set | ||
123 | CONFIG_MACH_ANUBIS=y | 129 | CONFIG_MACH_ANUBIS=y |
124 | CONFIG_MACH_OSIRIS=y | 130 | CONFIG_MACH_OSIRIS=y |
125 | CONFIG_ARCH_BAST=y | 131 | CONFIG_ARCH_BAST=y |
@@ -178,6 +184,8 @@ CONFIG_CPU_CACHE_V4WT=y | |||
178 | CONFIG_CPU_CACHE_VIVT=y | 184 | CONFIG_CPU_CACHE_VIVT=y |
179 | CONFIG_CPU_COPY_V4WB=y | 185 | CONFIG_CPU_COPY_V4WB=y |
180 | CONFIG_CPU_TLB_V4WBI=y | 186 | CONFIG_CPU_TLB_V4WBI=y |
187 | CONFIG_CPU_CP15=y | ||
188 | CONFIG_CPU_CP15_MMU=y | ||
181 | 189 | ||
182 | # | 190 | # |
183 | # Processor Features | 191 | # Processor Features |
@@ -251,6 +259,7 @@ CONFIG_BINFMT_AOUT=y | |||
251 | CONFIG_PM=y | 259 | CONFIG_PM=y |
252 | CONFIG_PM_LEGACY=y | 260 | CONFIG_PM_LEGACY=y |
253 | # CONFIG_PM_DEBUG is not set | 261 | # CONFIG_PM_DEBUG is not set |
262 | # CONFIG_PM_SYSFS_DEPRECATED is not set | ||
254 | CONFIG_APM=y | 263 | CONFIG_APM=y |
255 | 264 | ||
256 | # | 265 | # |
@@ -266,6 +275,7 @@ CONFIG_NET=y | |||
266 | CONFIG_UNIX=y | 275 | CONFIG_UNIX=y |
267 | CONFIG_XFRM=y | 276 | CONFIG_XFRM=y |
268 | # CONFIG_XFRM_USER is not set | 277 | # CONFIG_XFRM_USER is not set |
278 | # CONFIG_XFRM_SUB_POLICY is not set | ||
269 | # CONFIG_NET_KEY is not set | 279 | # CONFIG_NET_KEY is not set |
270 | CONFIG_INET=y | 280 | CONFIG_INET=y |
271 | # CONFIG_IP_MULTICAST is not set | 281 | # CONFIG_IP_MULTICAST is not set |
@@ -286,10 +296,12 @@ CONFIG_IP_PNP_BOOTP=y | |||
286 | # CONFIG_INET_TUNNEL is not set | 296 | # CONFIG_INET_TUNNEL is not set |
287 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | 297 | CONFIG_INET_XFRM_MODE_TRANSPORT=y |
288 | CONFIG_INET_XFRM_MODE_TUNNEL=y | 298 | CONFIG_INET_XFRM_MODE_TUNNEL=y |
299 | CONFIG_INET_XFRM_MODE_BEET=y | ||
289 | CONFIG_INET_DIAG=y | 300 | CONFIG_INET_DIAG=y |
290 | CONFIG_INET_TCP_DIAG=y | 301 | CONFIG_INET_TCP_DIAG=y |
291 | # CONFIG_TCP_CONG_ADVANCED is not set | 302 | # CONFIG_TCP_CONG_ADVANCED is not set |
292 | CONFIG_TCP_CONG_BIC=y | 303 | CONFIG_TCP_CONG_CUBIC=y |
304 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
293 | # CONFIG_IPV6 is not set | 305 | # CONFIG_IPV6 is not set |
294 | # CONFIG_INET6_XFRM_TUNNEL is not set | 306 | # CONFIG_INET6_XFRM_TUNNEL is not set |
295 | # CONFIG_INET6_TUNNEL is not set | 307 | # CONFIG_INET6_TUNNEL is not set |
@@ -377,6 +389,7 @@ CONFIG_MTD_BLOCK=y | |||
377 | # CONFIG_NFTL is not set | 389 | # CONFIG_NFTL is not set |
378 | # CONFIG_INFTL is not set | 390 | # CONFIG_INFTL is not set |
379 | # CONFIG_RFD_FTL is not set | 391 | # CONFIG_RFD_FTL is not set |
392 | # CONFIG_SSFDC is not set | ||
380 | 393 | ||
381 | # | 394 | # |
382 | # RAM/ROM/Flash chip drivers | 395 | # RAM/ROM/Flash chip drivers |
@@ -512,6 +525,7 @@ CONFIG_BLK_DEV_IDE_BAST=y | |||
512 | # | 525 | # |
513 | # CONFIG_RAID_ATTRS is not set | 526 | # CONFIG_RAID_ATTRS is not set |
514 | # CONFIG_SCSI is not set | 527 | # CONFIG_SCSI is not set |
528 | # CONFIG_SCSI_NETLINK is not set | ||
515 | 529 | ||
516 | # | 530 | # |
517 | # Multi-device support (RAID and LVM) | 531 | # Multi-device support (RAID and LVM) |
@@ -606,6 +620,7 @@ CONFIG_DM9000=y | |||
606 | # Input device support | 620 | # Input device support |
607 | # | 621 | # |
608 | CONFIG_INPUT=y | 622 | CONFIG_INPUT=y |
623 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
609 | 624 | ||
610 | # | 625 | # |
611 | # Userland interfaces | 626 | # Userland interfaces |
@@ -628,6 +643,7 @@ CONFIG_KEYBOARD_ATKBD=y | |||
628 | # CONFIG_KEYBOARD_LKKBD is not set | 643 | # CONFIG_KEYBOARD_LKKBD is not set |
629 | # CONFIG_KEYBOARD_XTKBD is not set | 644 | # CONFIG_KEYBOARD_XTKBD is not set |
630 | # CONFIG_KEYBOARD_NEWTON is not set | 645 | # CONFIG_KEYBOARD_NEWTON is not set |
646 | # CONFIG_KEYBOARD_STOWAWAY is not set | ||
631 | CONFIG_INPUT_MOUSE=y | 647 | CONFIG_INPUT_MOUSE=y |
632 | CONFIG_MOUSE_PS2=y | 648 | CONFIG_MOUSE_PS2=y |
633 | # CONFIG_MOUSE_SERIAL is not set | 649 | # CONFIG_MOUSE_SERIAL is not set |
@@ -734,7 +750,6 @@ CONFIG_S3C2410_WATCHDOG=y | |||
734 | # CONFIG_USBPCWATCHDOG is not set | 750 | # CONFIG_USBPCWATCHDOG is not set |
735 | CONFIG_HW_RANDOM=y | 751 | CONFIG_HW_RANDOM=y |
736 | # CONFIG_NVRAM is not set | 752 | # CONFIG_NVRAM is not set |
737 | CONFIG_S3C2410_RTC=y | ||
738 | # CONFIG_DTLK is not set | 753 | # CONFIG_DTLK is not set |
739 | # CONFIG_R3964 is not set | 754 | # CONFIG_R3964 is not set |
740 | 755 | ||
@@ -747,7 +762,6 @@ CONFIG_S3C2410_RTC=y | |||
747 | # TPM devices | 762 | # TPM devices |
748 | # | 763 | # |
749 | # CONFIG_TCG_TPM is not set | 764 | # CONFIG_TCG_TPM is not set |
750 | # CONFIG_TELCLOCK is not set | ||
751 | 765 | ||
752 | # | 766 | # |
753 | # I2C support | 767 | # I2C support |
@@ -798,6 +812,7 @@ CONFIG_SENSORS_EEPROM=m | |||
798 | # | 812 | # |
799 | # Dallas's 1-wire bus | 813 | # Dallas's 1-wire bus |
800 | # | 814 | # |
815 | # CONFIG_W1 is not set | ||
801 | 816 | ||
802 | # | 817 | # |
803 | # Hardware Monitoring support | 818 | # Hardware Monitoring support |
@@ -834,6 +849,7 @@ CONFIG_SENSORS_LM85=m | |||
834 | # CONFIG_SENSORS_SMSC47M1 is not set | 849 | # CONFIG_SENSORS_SMSC47M1 is not set |
835 | # CONFIG_SENSORS_SMSC47M192 is not set | 850 | # CONFIG_SENSORS_SMSC47M192 is not set |
836 | # CONFIG_SENSORS_SMSC47B397 is not set | 851 | # CONFIG_SENSORS_SMSC47B397 is not set |
852 | # CONFIG_SENSORS_VT1211 is not set | ||
837 | # CONFIG_SENSORS_W83781D is not set | 853 | # CONFIG_SENSORS_W83781D is not set |
838 | # CONFIG_SENSORS_W83791D is not set | 854 | # CONFIG_SENSORS_W83791D is not set |
839 | # CONFIG_SENSORS_W83792D is not set | 855 | # CONFIG_SENSORS_W83792D is not set |
@@ -845,6 +861,7 @@ CONFIG_SENSORS_LM85=m | |||
845 | # | 861 | # |
846 | # Misc devices | 862 | # Misc devices |
847 | # | 863 | # |
864 | # CONFIG_TIFM_CORE is not set | ||
848 | 865 | ||
849 | # | 866 | # |
850 | # LED devices | 867 | # LED devices |
@@ -863,7 +880,6 @@ CONFIG_SENSORS_LM85=m | |||
863 | # Multimedia devices | 880 | # Multimedia devices |
864 | # | 881 | # |
865 | # CONFIG_VIDEO_DEV is not set | 882 | # CONFIG_VIDEO_DEV is not set |
866 | CONFIG_VIDEO_V4L2=y | ||
867 | 883 | ||
868 | # | 884 | # |
869 | # Digital Video Broadcasting Devices | 885 | # Digital Video Broadcasting Devices |
@@ -876,6 +892,7 @@ CONFIG_VIDEO_V4L2=y | |||
876 | # | 892 | # |
877 | CONFIG_FIRMWARE_EDID=y | 893 | CONFIG_FIRMWARE_EDID=y |
878 | CONFIG_FB=y | 894 | CONFIG_FB=y |
895 | # CONFIG_FB_DDC is not set | ||
879 | CONFIG_FB_CFB_FILLRECT=y | 896 | CONFIG_FB_CFB_FILLRECT=y |
880 | CONFIG_FB_CFB_COPYAREA=y | 897 | CONFIG_FB_CFB_COPYAREA=y |
881 | CONFIG_FB_CFB_IMAGEBLIT=y | 898 | CONFIG_FB_CFB_IMAGEBLIT=y |
@@ -951,7 +968,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
951 | # | 968 | # |
952 | # may also be needed; see USB_STORAGE Help for more information | 969 | # may also be needed; see USB_STORAGE Help for more information |
953 | # | 970 | # |
954 | # CONFIG_USB_STORAGE is not set | ||
955 | # CONFIG_USB_LIBUSUAL is not set | 971 | # CONFIG_USB_LIBUSUAL is not set |
956 | 972 | ||
957 | # | 973 | # |
@@ -1007,6 +1023,7 @@ CONFIG_USB_MON=y | |||
1007 | # | 1023 | # |
1008 | # CONFIG_USB_EMI62 is not set | 1024 | # CONFIG_USB_EMI62 is not set |
1009 | # CONFIG_USB_EMI26 is not set | 1025 | # CONFIG_USB_EMI26 is not set |
1026 | # CONFIG_USB_ADUTUX is not set | ||
1010 | # CONFIG_USB_AUERSWALD is not set | 1027 | # CONFIG_USB_AUERSWALD is not set |
1011 | # CONFIG_USB_RIO500 is not set | 1028 | # CONFIG_USB_RIO500 is not set |
1012 | # CONFIG_USB_LEGOTOWER is not set | 1029 | # CONFIG_USB_LEGOTOWER is not set |
@@ -1014,11 +1031,12 @@ CONFIG_USB_MON=y | |||
1014 | # CONFIG_USB_LED is not set | 1031 | # CONFIG_USB_LED is not set |
1015 | # CONFIG_USB_CYPRESS_CY7C63 is not set | 1032 | # CONFIG_USB_CYPRESS_CY7C63 is not set |
1016 | # CONFIG_USB_CYTHERM is not set | 1033 | # CONFIG_USB_CYTHERM is not set |
1017 | # CONFIG_USB_PHIDGETKIT is not set | 1034 | # CONFIG_USB_PHIDGET is not set |
1018 | # CONFIG_USB_PHIDGETSERVO is not set | ||
1019 | # CONFIG_USB_IDMOUSE is not set | 1035 | # CONFIG_USB_IDMOUSE is not set |
1036 | # CONFIG_USB_FTDI_ELAN is not set | ||
1020 | # CONFIG_USB_APPLEDISPLAY is not set | 1037 | # CONFIG_USB_APPLEDISPLAY is not set |
1021 | # CONFIG_USB_LD is not set | 1038 | # CONFIG_USB_LD is not set |
1039 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
1022 | # CONFIG_USB_TEST is not set | 1040 | # CONFIG_USB_TEST is not set |
1023 | 1041 | ||
1024 | # | 1042 | # |
@@ -1051,6 +1069,7 @@ CONFIG_EXT3_FS=y | |||
1051 | CONFIG_EXT3_FS_XATTR=y | 1069 | CONFIG_EXT3_FS_XATTR=y |
1052 | # CONFIG_EXT3_FS_POSIX_ACL is not set | 1070 | # CONFIG_EXT3_FS_POSIX_ACL is not set |
1053 | # CONFIG_EXT3_FS_SECURITY is not set | 1071 | # CONFIG_EXT3_FS_SECURITY is not set |
1072 | # CONFIG_EXT4DEV_FS is not set | ||
1054 | CONFIG_JBD=y | 1073 | CONFIG_JBD=y |
1055 | # CONFIG_JBD_DEBUG is not set | 1074 | # CONFIG_JBD_DEBUG is not set |
1056 | CONFIG_FS_MBCACHE=y | 1075 | CONFIG_FS_MBCACHE=y |
@@ -1058,6 +1077,7 @@ CONFIG_FS_MBCACHE=y | |||
1058 | # CONFIG_JFS_FS is not set | 1077 | # CONFIG_JFS_FS is not set |
1059 | # CONFIG_FS_POSIX_ACL is not set | 1078 | # CONFIG_FS_POSIX_ACL is not set |
1060 | # CONFIG_XFS_FS is not set | 1079 | # CONFIG_XFS_FS is not set |
1080 | # CONFIG_GFS2_FS is not set | ||
1061 | # CONFIG_OCFS2_FS is not set | 1081 | # CONFIG_OCFS2_FS is not set |
1062 | # CONFIG_MINIX_FS is not set | 1082 | # CONFIG_MINIX_FS is not set |
1063 | CONFIG_ROMFS_FS=y | 1083 | CONFIG_ROMFS_FS=y |
@@ -1089,6 +1109,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
1089 | # Pseudo filesystems | 1109 | # Pseudo filesystems |
1090 | # | 1110 | # |
1091 | CONFIG_PROC_FS=y | 1111 | CONFIG_PROC_FS=y |
1112 | CONFIG_PROC_SYSCTL=y | ||
1092 | CONFIG_SYSFS=y | 1113 | CONFIG_SYSFS=y |
1093 | # CONFIG_TMPFS is not set | 1114 | # CONFIG_TMPFS is not set |
1094 | # CONFIG_HUGETLB_PAGE is not set | 1115 | # CONFIG_HUGETLB_PAGE is not set |
@@ -1219,6 +1240,7 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
1219 | # Kernel hacking | 1240 | # Kernel hacking |
1220 | # | 1241 | # |
1221 | # CONFIG_PRINTK_TIME is not set | 1242 | # CONFIG_PRINTK_TIME is not set |
1243 | CONFIG_ENABLE_MUST_CHECK=y | ||
1222 | CONFIG_MAGIC_SYSRQ=y | 1244 | CONFIG_MAGIC_SYSRQ=y |
1223 | # CONFIG_UNUSED_SYMBOLS is not set | 1245 | # CONFIG_UNUSED_SYMBOLS is not set |
1224 | CONFIG_DEBUG_KERNEL=y | 1246 | CONFIG_DEBUG_KERNEL=y |
@@ -1238,9 +1260,10 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
1238 | CONFIG_DEBUG_INFO=y | 1260 | CONFIG_DEBUG_INFO=y |
1239 | # CONFIG_DEBUG_FS is not set | 1261 | # CONFIG_DEBUG_FS is not set |
1240 | # CONFIG_DEBUG_VM is not set | 1262 | # CONFIG_DEBUG_VM is not set |
1263 | # CONFIG_DEBUG_LIST is not set | ||
1241 | CONFIG_FRAME_POINTER=y | 1264 | CONFIG_FRAME_POINTER=y |
1242 | # CONFIG_UNWIND_INFO is not set | ||
1243 | CONFIG_FORCED_INLINING=y | 1265 | CONFIG_FORCED_INLINING=y |
1266 | # CONFIG_HEADERS_CHECK is not set | ||
1244 | # CONFIG_RCU_TORTURE_TEST is not set | 1267 | # CONFIG_RCU_TORTURE_TEST is not set |
1245 | CONFIG_DEBUG_USER=y | 1268 | CONFIG_DEBUG_USER=y |
1246 | # CONFIG_DEBUG_WAITQ is not set | 1269 | # CONFIG_DEBUG_WAITQ is not set |
@@ -1262,10 +1285,6 @@ CONFIG_DEBUG_S3C2410_UART=0 | |||
1262 | # CONFIG_CRYPTO is not set | 1285 | # CONFIG_CRYPTO is not set |
1263 | 1286 | ||
1264 | # | 1287 | # |
1265 | # Hardware crypto devices | ||
1266 | # | ||
1267 | |||
1268 | # | ||
1269 | # Library routines | 1288 | # Library routines |
1270 | # | 1289 | # |
1271 | # CONFIG_CRC_CCITT is not set | 1290 | # CONFIG_CRC_CCITT is not set |