diff options
author | Ben Dooks <ben-linux@fluff.org> | 2010-05-21 22:18:22 -0400 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-23 11:27:10 -0400 |
commit | 2621a181fd822c0c9cf3eb8b757aeed58e0d30ee (patch) | |
tree | d485563a1314e0326b0ad4f4c8f0310545b851df | |
parent | 63e3de2f9be62a4436d3837c7add7b63b96d9aa0 (diff) |
ARM: s5pv210_defconfig: Update s5pv210_defconfig to v2.6.34
Update the s5pv210_defconfig to the latest kernel version v2.6.34
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
-rw-r--r-- | arch/arm/configs/s5pv210_defconfig | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/arch/arm/configs/s5pv210_defconfig b/arch/arm/configs/s5pv210_defconfig index 3f7d47491b54..6831dab97d96 100644 --- a/arch/arm/configs/s5pv210_defconfig +++ b/arch/arm/configs/s5pv210_defconfig | |||
@@ -1,11 +1,12 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.33-rc4 | 3 | # Linux kernel version: 2.6.34 |
4 | # Wed Feb 24 15:36:16 2010 | 4 | # Sat May 22 03:18:22 2010 |
5 | # | 5 | # |
6 | CONFIG_ARM=y | 6 | CONFIG_ARM=y |
7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y |
8 | CONFIG_GENERIC_GPIO=y | 8 | CONFIG_GENERIC_GPIO=y |
9 | CONFIG_HAVE_PROC_CPU=y | ||
9 | CONFIG_NO_IOPORT=y | 10 | CONFIG_NO_IOPORT=y |
10 | CONFIG_GENERIC_HARDIRQS=y | 11 | CONFIG_GENERIC_HARDIRQS=y |
11 | CONFIG_STACKTRACE_SUPPORT=y | 12 | CONFIG_STACKTRACE_SUPPORT=y |
@@ -17,6 +18,7 @@ CONFIG_GENERIC_IRQ_PROBE=y | |||
17 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 18 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
18 | CONFIG_GENERIC_HWEIGHT=y | 19 | CONFIG_GENERIC_HWEIGHT=y |
19 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 20 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
21 | CONFIG_NEED_DMA_MAP_STATE=y | ||
20 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | 22 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y |
21 | CONFIG_ARM_L1_CACHE_SHIFT_6=y | 23 | CONFIG_ARM_L1_CACHE_SHIFT_6=y |
22 | CONFIG_VECTORS_BASE=0xffff0000 | 24 | CONFIG_VECTORS_BASE=0xffff0000 |
@@ -54,7 +56,6 @@ CONFIG_RCU_FANOUT=32 | |||
54 | # CONFIG_TREE_RCU_TRACE is not set | 56 | # CONFIG_TREE_RCU_TRACE is not set |
55 | # CONFIG_IKCONFIG is not set | 57 | # CONFIG_IKCONFIG is not set |
56 | CONFIG_LOG_BUF_SHIFT=17 | 58 | CONFIG_LOG_BUF_SHIFT=17 |
57 | # CONFIG_GROUP_SCHED is not set | ||
58 | # CONFIG_CGROUPS is not set | 59 | # CONFIG_CGROUPS is not set |
59 | CONFIG_SYSFS_DEPRECATED=y | 60 | CONFIG_SYSFS_DEPRECATED=y |
60 | CONFIG_SYSFS_DEPRECATED_V2=y | 61 | CONFIG_SYSFS_DEPRECATED_V2=y |
@@ -90,10 +91,14 @@ CONFIG_TIMERFD=y | |||
90 | CONFIG_EVENTFD=y | 91 | CONFIG_EVENTFD=y |
91 | CONFIG_SHMEM=y | 92 | CONFIG_SHMEM=y |
92 | CONFIG_AIO=y | 93 | CONFIG_AIO=y |
94 | CONFIG_HAVE_PERF_EVENTS=y | ||
95 | CONFIG_PERF_USE_VMALLOC=y | ||
93 | 96 | ||
94 | # | 97 | # |
95 | # Kernel Performance Events And Counters | 98 | # Kernel Performance Events And Counters |
96 | # | 99 | # |
100 | # CONFIG_PERF_EVENTS is not set | ||
101 | # CONFIG_PERF_COUNTERS is not set | ||
97 | CONFIG_VM_EVENT_COUNTERS=y | 102 | CONFIG_VM_EVENT_COUNTERS=y |
98 | CONFIG_SLUB_DEBUG=y | 103 | CONFIG_SLUB_DEBUG=y |
99 | CONFIG_COMPAT_BRK=y | 104 | CONFIG_COMPAT_BRK=y |
@@ -176,6 +181,7 @@ CONFIG_MMU=y | |||
176 | # CONFIG_ARCH_REALVIEW is not set | 181 | # CONFIG_ARCH_REALVIEW is not set |
177 | # CONFIG_ARCH_VERSATILE is not set | 182 | # CONFIG_ARCH_VERSATILE is not set |
178 | # CONFIG_ARCH_AT91 is not set | 183 | # CONFIG_ARCH_AT91 is not set |
184 | # CONFIG_ARCH_BCMRING is not set | ||
179 | # CONFIG_ARCH_CLPS711X is not set | 185 | # CONFIG_ARCH_CLPS711X is not set |
180 | # CONFIG_ARCH_GEMINI is not set | 186 | # CONFIG_ARCH_GEMINI is not set |
181 | # CONFIG_ARCH_EBSA110 is not set | 187 | # CONFIG_ARCH_EBSA110 is not set |
@@ -185,7 +191,6 @@ CONFIG_MMU=y | |||
185 | # CONFIG_ARCH_STMP3XXX is not set | 191 | # CONFIG_ARCH_STMP3XXX is not set |
186 | # CONFIG_ARCH_NETX is not set | 192 | # CONFIG_ARCH_NETX is not set |
187 | # CONFIG_ARCH_H720X is not set | 193 | # CONFIG_ARCH_H720X is not set |
188 | # CONFIG_ARCH_NOMADIK is not set | ||
189 | # CONFIG_ARCH_IOP13XX is not set | 194 | # CONFIG_ARCH_IOP13XX is not set |
190 | # CONFIG_ARCH_IOP32X is not set | 195 | # CONFIG_ARCH_IOP32X is not set |
191 | # CONFIG_ARCH_IOP33X is not set | 196 | # CONFIG_ARCH_IOP33X is not set |
@@ -202,9 +207,11 @@ CONFIG_MMU=y | |||
202 | # CONFIG_ARCH_KS8695 is not set | 207 | # CONFIG_ARCH_KS8695 is not set |
203 | # CONFIG_ARCH_NS9XXX is not set | 208 | # CONFIG_ARCH_NS9XXX is not set |
204 | # CONFIG_ARCH_W90X900 is not set | 209 | # CONFIG_ARCH_W90X900 is not set |
210 | # CONFIG_ARCH_NUC93X is not set | ||
205 | # CONFIG_ARCH_PNX4008 is not set | 211 | # CONFIG_ARCH_PNX4008 is not set |
206 | # CONFIG_ARCH_PXA is not set | 212 | # CONFIG_ARCH_PXA is not set |
207 | # CONFIG_ARCH_MSM is not set | 213 | # CONFIG_ARCH_MSM is not set |
214 | # CONFIG_ARCH_SHMOBILE is not set | ||
208 | # CONFIG_ARCH_RPC is not set | 215 | # CONFIG_ARCH_RPC is not set |
209 | # CONFIG_ARCH_SA1100 is not set | 216 | # CONFIG_ARCH_SA1100 is not set |
210 | # CONFIG_ARCH_S3C2410 is not set | 217 | # CONFIG_ARCH_S3C2410 is not set |
@@ -216,10 +223,10 @@ CONFIG_ARCH_S5PV210=y | |||
216 | # CONFIG_ARCH_SHARK is not set | 223 | # CONFIG_ARCH_SHARK is not set |
217 | # CONFIG_ARCH_LH7A40X is not set | 224 | # CONFIG_ARCH_LH7A40X is not set |
218 | # CONFIG_ARCH_U300 is not set | 225 | # CONFIG_ARCH_U300 is not set |
226 | # CONFIG_ARCH_U8500 is not set | ||
227 | # CONFIG_ARCH_NOMADIK is not set | ||
219 | # CONFIG_ARCH_DAVINCI is not set | 228 | # CONFIG_ARCH_DAVINCI is not set |
220 | # CONFIG_ARCH_OMAP is not set | 229 | # CONFIG_ARCH_OMAP is not set |
221 | # CONFIG_ARCH_BCMRING is not set | ||
222 | # CONFIG_ARCH_U8500 is not set | ||
223 | CONFIG_PLAT_SAMSUNG=y | 230 | CONFIG_PLAT_SAMSUNG=y |
224 | 231 | ||
225 | # | 232 | # |
@@ -274,6 +281,7 @@ CONFIG_ARM_THUMB=y | |||
274 | # CONFIG_CPU_BPREDICT_DISABLE is not set | 281 | # CONFIG_CPU_BPREDICT_DISABLE is not set |
275 | CONFIG_HAS_TLS_REG=y | 282 | CONFIG_HAS_TLS_REG=y |
276 | CONFIG_ARM_L1_CACHE_SHIFT=6 | 283 | CONFIG_ARM_L1_CACHE_SHIFT=6 |
284 | CONFIG_CPU_HAS_PMU=y | ||
277 | # CONFIG_ARM_ERRATA_430973 is not set | 285 | # CONFIG_ARM_ERRATA_430973 is not set |
278 | # CONFIG_ARM_ERRATA_458693 is not set | 286 | # CONFIG_ARM_ERRATA_458693 is not set |
279 | # CONFIG_ARM_ERRATA_460075 is not set | 287 | # CONFIG_ARM_ERRATA_460075 is not set |
@@ -404,6 +412,7 @@ CONFIG_HAVE_IDE=y | |||
404 | # | 412 | # |
405 | # SCSI device support | 413 | # SCSI device support |
406 | # | 414 | # |
415 | CONFIG_SCSI_MOD=y | ||
407 | # CONFIG_RAID_ATTRS is not set | 416 | # CONFIG_RAID_ATTRS is not set |
408 | CONFIG_SCSI=y | 417 | CONFIG_SCSI=y |
409 | CONFIG_SCSI_DMA=y | 418 | CONFIG_SCSI_DMA=y |
@@ -526,6 +535,7 @@ CONFIG_SERIAL_SAMSUNG_CONSOLE=y | |||
526 | CONFIG_SERIAL_S5PV210=y | 535 | CONFIG_SERIAL_S5PV210=y |
527 | CONFIG_SERIAL_CORE=y | 536 | CONFIG_SERIAL_CORE=y |
528 | CONFIG_SERIAL_CORE_CONSOLE=y | 537 | CONFIG_SERIAL_CORE_CONSOLE=y |
538 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
529 | CONFIG_UNIX98_PTYS=y | 539 | CONFIG_UNIX98_PTYS=y |
530 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 540 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
531 | CONFIG_LEGACY_PTYS=y | 541 | CONFIG_LEGACY_PTYS=y |
@@ -551,6 +561,7 @@ CONFIG_GPIOLIB=y | |||
551 | # | 561 | # |
552 | # Memory mapped GPIO expanders: | 562 | # Memory mapped GPIO expanders: |
553 | # | 563 | # |
564 | # CONFIG_GPIO_IT8761E is not set | ||
554 | 565 | ||
555 | # | 566 | # |
556 | # I2C GPIO expanders: | 567 | # I2C GPIO expanders: |
@@ -696,6 +707,7 @@ CONFIG_MISC_FILESYSTEMS=y | |||
696 | # CONFIG_BEFS_FS is not set | 707 | # CONFIG_BEFS_FS is not set |
697 | # CONFIG_BFS_FS is not set | 708 | # CONFIG_BFS_FS is not set |
698 | # CONFIG_EFS_FS is not set | 709 | # CONFIG_EFS_FS is not set |
710 | # CONFIG_LOGFS is not set | ||
699 | CONFIG_CRAMFS=y | 711 | CONFIG_CRAMFS=y |
700 | # CONFIG_SQUASHFS is not set | 712 | # CONFIG_SQUASHFS is not set |
701 | # CONFIG_VXFS_FS is not set | 713 | # CONFIG_VXFS_FS is not set |