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

ARM: 6023/1: update bcmring_defconfig to latest version and fix build error

update bcmring_defconfig to the latest kernel version, this will fix the
KAutobuild error.

Signed-off-by: Leo Hao Chen <leochen@broadcom.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

authored by

Leo Chen and committed by
Russell King
313af42b 4260415f

+101 -25
+101 -25
arch/arm/configs/bcmring_defconfig
··· 1 1 # 2 2 # Automatically generated make config: don't edit 3 - # Linux kernel version: 2.6.31-rc3 4 - # Fri Jul 17 12:07:28 2009 3 + # Linux kernel version: 2.6.34-rc2 4 + # Mon Mar 29 12:01:41 2010 5 5 # 6 6 CONFIG_ARM=y 7 7 CONFIG_SYS_SUPPORTS_APM_EMULATION=y 8 8 CONFIG_GENERIC_TIME=y 9 9 CONFIG_GENERIC_CLOCKEVENTS=y 10 - CONFIG_MMU=y 10 + CONFIG_HAVE_PROC_CPU=y 11 11 CONFIG_GENERIC_HARDIRQS=y 12 12 CONFIG_STACKTRACE_SUPPORT=y 13 13 CONFIG_HAVE_LATENCYTOP_SUPPORT=y ··· 18 18 CONFIG_RWSEM_GENERIC_SPINLOCK=y 19 19 CONFIG_GENERIC_HWEIGHT=y 20 20 CONFIG_GENERIC_CALIBRATE_DELAY=y 21 + CONFIG_NEED_DMA_MAP_STATE=y 21 22 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 22 23 CONFIG_VECTORS_BASE=0xffff0000 23 24 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" ··· 33 32 CONFIG_INIT_ENV_ARG_LIMIT=32 34 33 CONFIG_LOCALVERSION="" 35 34 # CONFIG_LOCALVERSION_AUTO is not set 35 + CONFIG_HAVE_KERNEL_GZIP=y 36 + CONFIG_HAVE_KERNEL_LZO=y 37 + CONFIG_KERNEL_GZIP=y 38 + # CONFIG_KERNEL_BZIP2 is not set 39 + # CONFIG_KERNEL_LZMA is not set 40 + # CONFIG_KERNEL_LZO is not set 36 41 # CONFIG_SWAP is not set 37 42 CONFIG_SYSVIPC=y 38 43 CONFIG_SYSVIPC_SYSCTL=y ··· 50 43 # 51 44 # RCU Subsystem 52 45 # 53 - CONFIG_CLASSIC_RCU=y 54 - # CONFIG_TREE_RCU is not set 55 - # CONFIG_PREEMPT_RCU is not set 46 + CONFIG_TREE_RCU=y 47 + # CONFIG_TREE_PREEMPT_RCU is not set 48 + # CONFIG_TINY_RCU is not set 49 + # CONFIG_RCU_TRACE is not set 50 + CONFIG_RCU_FANOUT=32 51 + # CONFIG_RCU_FANOUT_EXACT is not set 56 52 # CONFIG_TREE_RCU_TRACE is not set 57 - # CONFIG_PREEMPT_RCU_TRACE is not set 58 53 # CONFIG_IKCONFIG is not set 59 54 CONFIG_LOG_BUF_SHIFT=17 60 - # CONFIG_GROUP_SCHED is not set 61 - # CONFIG_CGROUPS is not set 62 55 # CONFIG_SYSFS_DEPRECATED_V2 is not set 63 56 # CONFIG_RELAY is not set 64 57 # CONFIG_NAMESPACES is not set 65 58 # CONFIG_BLK_DEV_INITRD is not set 66 59 CONFIG_CC_OPTIMIZE_FOR_SIZE=y 67 60 CONFIG_SYSCTL=y 61 + CONFIG_ANON_INODES=y 68 62 CONFIG_EMBEDDED=y 69 63 CONFIG_UID16=y 70 64 CONFIG_SYSCTL_SYSCALL=y ··· 83 75 # CONFIG_EVENTFD is not set 84 76 CONFIG_SHMEM=y 85 77 # CONFIG_AIO is not set 78 + CONFIG_HAVE_PERF_EVENTS=y 79 + CONFIG_PERF_USE_VMALLOC=y 86 80 87 81 # 88 - # Performance Counters 82 + # Kernel Performance Events And Counters 89 83 # 84 + CONFIG_PERF_EVENTS=y 85 + CONFIG_PERF_COUNTERS=y 90 86 # CONFIG_VM_EVENT_COUNTERS is not set 91 87 # CONFIG_SLUB_DEBUG is not set 92 - # CONFIG_STRIP_ASM_SYMS is not set 93 88 # CONFIG_COMPAT_BRK is not set 94 89 # CONFIG_SLAB is not set 95 90 CONFIG_SLUB=y 96 91 # CONFIG_SLOB is not set 97 92 # CONFIG_PROFILING is not set 98 - # CONFIG_MARKERS is not set 99 93 CONFIG_HAVE_OPROFILE=y 100 94 # CONFIG_KPROBES is not set 101 95 CONFIG_HAVE_KPROBES=y ··· 125 115 # IO Schedulers 126 116 # 127 117 CONFIG_IOSCHED_NOOP=y 128 - # CONFIG_IOSCHED_AS is not set 129 118 # CONFIG_IOSCHED_DEADLINE is not set 130 119 # CONFIG_IOSCHED_CFQ is not set 131 - # CONFIG_DEFAULT_AS is not set 132 120 # CONFIG_DEFAULT_DEADLINE is not set 133 121 # CONFIG_DEFAULT_CFQ is not set 134 122 CONFIG_DEFAULT_NOOP=y 135 123 CONFIG_DEFAULT_IOSCHED="noop" 124 + # CONFIG_INLINE_SPIN_TRYLOCK is not set 125 + # CONFIG_INLINE_SPIN_TRYLOCK_BH is not set 126 + # CONFIG_INLINE_SPIN_LOCK is not set 127 + # CONFIG_INLINE_SPIN_LOCK_BH is not set 128 + # CONFIG_INLINE_SPIN_LOCK_IRQ is not set 129 + # CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set 130 + # CONFIG_INLINE_SPIN_UNLOCK is not set 131 + # CONFIG_INLINE_SPIN_UNLOCK_BH is not set 132 + # CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set 133 + # CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set 134 + # CONFIG_INLINE_READ_TRYLOCK is not set 135 + # CONFIG_INLINE_READ_LOCK is not set 136 + # CONFIG_INLINE_READ_LOCK_BH is not set 137 + # CONFIG_INLINE_READ_LOCK_IRQ is not set 138 + # CONFIG_INLINE_READ_LOCK_IRQSAVE is not set 139 + # CONFIG_INLINE_READ_UNLOCK is not set 140 + # CONFIG_INLINE_READ_UNLOCK_BH is not set 141 + # CONFIG_INLINE_READ_UNLOCK_IRQ is not set 142 + # CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set 143 + # CONFIG_INLINE_WRITE_TRYLOCK is not set 144 + # CONFIG_INLINE_WRITE_LOCK is not set 145 + # CONFIG_INLINE_WRITE_LOCK_BH is not set 146 + # CONFIG_INLINE_WRITE_LOCK_IRQ is not set 147 + # CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set 148 + # CONFIG_INLINE_WRITE_UNLOCK is not set 149 + # CONFIG_INLINE_WRITE_UNLOCK_BH is not set 150 + # CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set 151 + # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set 152 + # CONFIG_MUTEX_SPIN_ON_OWNER is not set 136 153 # CONFIG_FREEZER is not set 137 154 138 155 # 139 156 # System Type 140 157 # 158 + CONFIG_MMU=y 141 159 # CONFIG_ARCH_AAEC2000 is not set 142 160 # CONFIG_ARCH_INTEGRATOR is not set 143 161 # CONFIG_ARCH_REALVIEW is not set 144 162 # CONFIG_ARCH_VERSATILE is not set 145 163 # CONFIG_ARCH_AT91 is not set 164 + CONFIG_ARCH_BCMRING=y 146 165 # CONFIG_ARCH_CLPS711X is not set 147 166 # CONFIG_ARCH_GEMINI is not set 148 167 # CONFIG_ARCH_EBSA110 is not set ··· 188 149 # CONFIG_ARCH_IXP2000 is not set 189 150 # CONFIG_ARCH_IXP4XX is not set 190 151 # CONFIG_ARCH_L7200 is not set 152 + # CONFIG_ARCH_DOVE is not set 191 153 # CONFIG_ARCH_KIRKWOOD is not set 192 154 # CONFIG_ARCH_LOKI is not set 193 155 # CONFIG_ARCH_MV78XX0 is not set ··· 197 157 # CONFIG_ARCH_KS8695 is not set 198 158 # CONFIG_ARCH_NS9XXX is not set 199 159 # CONFIG_ARCH_W90X900 is not set 160 + # CONFIG_ARCH_NUC93X is not set 200 161 # CONFIG_ARCH_PNX4008 is not set 201 162 # CONFIG_ARCH_PXA is not set 202 163 # CONFIG_ARCH_MSM is not set 164 + # CONFIG_ARCH_SHMOBILE is not set 203 165 # CONFIG_ARCH_RPC is not set 204 166 # CONFIG_ARCH_SA1100 is not set 205 167 # CONFIG_ARCH_S3C2410 is not set 206 168 # CONFIG_ARCH_S3C64XX is not set 169 + # CONFIG_ARCH_S5P6440 is not set 170 + # CONFIG_ARCH_S5P6442 is not set 171 + # CONFIG_ARCH_S5PC1XX is not set 172 + # CONFIG_ARCH_S5PV210 is not set 207 173 # CONFIG_ARCH_SHARK is not set 208 174 # CONFIG_ARCH_LH7A40X is not set 209 175 # CONFIG_ARCH_U300 is not set 176 + # CONFIG_ARCH_U8500 is not set 177 + # CONFIG_ARCH_NOMADIK is not set 210 178 # CONFIG_ARCH_DAVINCI is not set 211 179 # CONFIG_ARCH_OMAP is not set 212 - CONFIG_ARCH_BCMRING=y 213 180 # CONFIG_ARCH_FPGA11107 is not set 214 181 CONFIG_ARCH_BCM11107=y 215 182 ··· 232 185 CONFIG_CPU_32v6K=y 233 186 CONFIG_CPU_32v6=y 234 187 CONFIG_CPU_ABRT_EV6=y 235 - CONFIG_CPU_PABRT_NOIFAR=y 188 + CONFIG_CPU_PABRT_V6=y 236 189 CONFIG_CPU_CACHE_V6=y 237 190 CONFIG_CPU_CACHE_VIPT=y 238 191 CONFIG_CPU_COPY_V6=y ··· 248 201 # CONFIG_CPU_ICACHE_DISABLE is not set 249 202 # CONFIG_CPU_DCACHE_DISABLE is not set 250 203 # CONFIG_CPU_BPREDICT_DISABLE is not set 204 + CONFIG_ARM_L1_CACHE_SHIFT=5 205 + CONFIG_CPU_HAS_PMU=y 251 206 # CONFIG_ARM_ERRATA_411920 is not set 252 207 CONFIG_COMMON_CLKDEV=y 253 208 ··· 271 222 # CONFIG_VMSPLIT_2G is not set 272 223 # CONFIG_VMSPLIT_1G is not set 273 224 CONFIG_PAGE_OFFSET=0xC0000000 225 + # CONFIG_PREEMPT_NONE is not set 226 + # CONFIG_PREEMPT_VOLUNTARY is not set 274 227 CONFIG_PREEMPT=y 275 228 CONFIG_HZ=100 276 229 CONFIG_AEABI=y ··· 280 229 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set 281 230 # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set 282 231 # CONFIG_HIGHMEM is not set 232 + CONFIG_HW_PERF_EVENTS=y 283 233 CONFIG_SELECT_MEMORY_MODEL=y 284 234 CONFIG_FLATMEM_MANUAL=y 285 235 # CONFIG_DISCONTIGMEM_MANUAL is not set ··· 292 240 # CONFIG_PHYS_ADDR_T_64BIT is not set 293 241 CONFIG_ZONE_DMA_FLAG=0 294 242 CONFIG_VIRT_TO_BUS=y 295 - CONFIG_HAVE_MLOCK=y 296 - CONFIG_HAVE_MLOCKED_PAGE_BIT=y 243 + # CONFIG_KSM is not set 297 244 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 298 245 CONFIG_ALIGNMENT_TRAP=y 299 246 CONFIG_UACCESS_WITH_MEMCPY=y ··· 386 335 # CONFIG_CONNECTOR is not set 387 336 CONFIG_MTD=y 388 337 # CONFIG_MTD_DEBUG is not set 338 + # CONFIG_MTD_TESTS is not set 389 339 CONFIG_MTD_CONCAT=y 390 340 CONFIG_MTD_PARTITIONS=y 391 - # CONFIG_MTD_TESTS is not set 392 341 # CONFIG_MTD_REDBOOT_PARTS is not set 393 342 CONFIG_MTD_CMDLINE_PARTS=y 394 343 # CONFIG_MTD_AFS_PARTS is not set ··· 484 433 CONFIG_BLK_DEV=y 485 434 # CONFIG_BLK_DEV_COW_COMMON is not set 486 435 # CONFIG_BLK_DEV_LOOP is not set 436 + 437 + # 438 + # DRBD disabled because PROC_FS, INET or CONNECTOR not selected 439 + # 487 440 # CONFIG_BLK_DEV_NBD is not set 488 441 # CONFIG_BLK_DEV_RAM is not set 489 442 # CONFIG_CDROM_PKTCDVD is not set ··· 499 444 # 500 445 # SCSI device support 501 446 # 447 + CONFIG_SCSI_MOD=y 502 448 # CONFIG_RAID_ATTRS is not set 503 449 # CONFIG_SCSI is not set 504 450 # CONFIG_SCSI_DMA is not set ··· 508 452 # CONFIG_MD is not set 509 453 # CONFIG_NETDEVICES is not set 510 454 # CONFIG_ISDN is not set 455 + # CONFIG_PHONE is not set 511 456 512 457 # 513 458 # Input device support ··· 516 459 CONFIG_INPUT=y 517 460 # CONFIG_INPUT_FF_MEMLESS is not set 518 461 # CONFIG_INPUT_POLLDEV is not set 462 + # CONFIG_INPUT_SPARSEKMAP is not set 519 463 520 464 # 521 465 # Userland interfaces ··· 566 508 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y 567 509 CONFIG_SERIAL_CORE=y 568 510 CONFIG_SERIAL_CORE_CONSOLE=y 511 + # CONFIG_SERIAL_TIMBERDALE is not set 569 512 CONFIG_UNIX98_PTYS=y 570 513 # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 571 514 CONFIG_LEGACY_PTYS=y ··· 578 519 # CONFIG_TCG_TPM is not set 579 520 # CONFIG_I2C is not set 580 521 # CONFIG_SPI is not set 522 + 523 + # 524 + # PPS support 525 + # 526 + # CONFIG_PPS is not set 581 527 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y 582 528 # CONFIG_GPIOLIB is not set 583 529 # CONFIG_W1 is not set 584 530 # CONFIG_POWER_SUPPLY is not set 585 531 # CONFIG_HWMON is not set 586 532 # CONFIG_THERMAL is not set 587 - # CONFIG_THERMAL_HWMON is not set 588 533 # CONFIG_WATCHDOG is not set 589 534 CONFIG_SSB_POSSIBLE=y 590 535 ··· 604 541 # CONFIG_MFD_SM501 is not set 605 542 # CONFIG_HTC_PASIC3 is not set 606 543 # CONFIG_MFD_TMIO is not set 544 + # CONFIG_REGULATOR is not set 607 545 # CONFIG_MEDIA_SUPPORT is not set 608 546 609 547 # ··· 630 566 # CONFIG_USB_SUPPORT is not set 631 567 # CONFIG_MMC is not set 632 568 # CONFIG_MEMSTICK is not set 633 - # CONFIG_ACCESSIBILITY is not set 634 569 # CONFIG_NEW_LEDS is not set 570 + # CONFIG_ACCESSIBILITY is not set 635 571 CONFIG_RTC_LIB=y 636 572 # CONFIG_RTC_CLASS is not set 637 573 # CONFIG_DMADEVICES is not set 638 574 # CONFIG_AUXDISPLAY is not set 639 - # CONFIG_REGULATOR is not set 640 575 # CONFIG_UIO is not set 576 + 577 + # 578 + # TI VLYNQ 579 + # 641 580 # CONFIG_STAGING is not set 642 581 643 582 # ··· 656 589 # CONFIG_GFS2_FS is not set 657 590 # CONFIG_OCFS2_FS is not set 658 591 # CONFIG_BTRFS_FS is not set 592 + # CONFIG_NILFS2_FS is not set 659 593 # CONFIG_FILE_LOCKING is not set 660 594 # CONFIG_FSNOTIFY is not set 595 + # CONFIG_DNOTIFY is not set 661 596 # CONFIG_INOTIFY is not set 597 + # CONFIG_INOTIFY_USER is not set 662 598 # CONFIG_QUOTA is not set 663 599 # CONFIG_AUTOFS_FS is not set 664 600 # CONFIG_AUTOFS4_FS is not set ··· 717 647 # CONFIG_JFFS2_LZO is not set 718 648 CONFIG_JFFS2_RTIME=y 719 649 # CONFIG_JFFS2_RUBIN is not set 650 + # CONFIG_LOGFS is not set 720 651 # CONFIG_CRAMFS is not set 721 652 # CONFIG_SQUASHFS is not set 722 653 # CONFIG_VXFS_FS is not set ··· 728 657 # CONFIG_ROMFS_FS is not set 729 658 # CONFIG_SYSV_FS is not set 730 659 # CONFIG_UFS_FS is not set 731 - # CONFIG_NILFS2_FS is not set 732 660 # CONFIG_NETWORK_FILESYSTEMS is not set 733 661 734 662 # ··· 745 675 CONFIG_ENABLE_MUST_CHECK=y 746 676 CONFIG_FRAME_WARN=1024 747 677 CONFIG_MAGIC_SYSRQ=y 678 + # CONFIG_STRIP_ASM_SYMS is not set 748 679 # CONFIG_UNUSED_SYMBOLS is not set 749 680 # CONFIG_DEBUG_FS is not set 750 681 CONFIG_HEADERS_CHECK=y 751 682 # CONFIG_DEBUG_KERNEL is not set 752 - # CONFIG_DEBUG_BUGVERBOSE is not set 683 + CONFIG_DEBUG_BUGVERBOSE=y 753 684 # CONFIG_DEBUG_MEMORY_INIT is not set 754 685 CONFIG_FRAME_POINTER=y 755 686 # CONFIG_RCU_CPU_STALL_DETECTOR is not set ··· 764 693 CONFIG_HAVE_ARCH_KGDB=y 765 694 # CONFIG_ARM_UNWIND is not set 766 695 # CONFIG_DEBUG_USER is not set 696 + # CONFIG_OC_ETM is not set 767 697 768 698 # 769 699 # Security options ··· 772 700 # CONFIG_KEYS is not set 773 701 # CONFIG_SECURITY is not set 774 702 # CONFIG_SECURITYFS is not set 775 - # CONFIG_SECURITY_FILE_CAPABILITIES is not set 703 + # CONFIG_DEFAULT_SECURITY_SELINUX is not set 704 + # CONFIG_DEFAULT_SECURITY_SMACK is not set 705 + # CONFIG_DEFAULT_SECURITY_TOMOYO is not set 706 + CONFIG_DEFAULT_SECURITY_DAC=y 707 + CONFIG_DEFAULT_SECURITY="" 776 708 # CONFIG_CRYPTO is not set 777 709 # CONFIG_BINARY_PRINTF is not set 778 710