Merge master.kernel.org:/home/rmk/linux-2.6-arm

* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] for_each_possible_cpu
[ARM] add_memory() build fix
[ARM] 3483/1: ixp23xx: update defconfig to 2.6.17-rc2
[ARM] 3482/1: ixp2000: update defconfig to 2.6.17-rc2
[ARM] 3481/1: ep93xx: update defconfig to 2.6.17-rc2
[ARM] 3480/1: ixp4xx: fix irq2gpio array type

+130 -76
+54 -25
arch/arm/configs/ep93xx_defconfig
··· 1 1 # 2 2 # Automatically generated make config: don't edit 3 - # Linux kernel version: 2.6.16 4 - # Mon Mar 20 14:54:51 2006 3 + # Linux kernel version: 2.6.17-rc2 4 + # Wed Apr 19 21:21:01 2006 5 5 # 6 6 CONFIG_ARM=y 7 7 CONFIG_MMU=y 8 8 CONFIG_RWSEM_GENERIC_SPINLOCK=y 9 + CONFIG_GENERIC_HWEIGHT=y 9 10 CONFIG_GENERIC_CALIBRATE_DELAY=y 11 + CONFIG_VECTORS_BASE=0xffff0000 10 12 11 13 # 12 14 # Code maturity level options ··· 30 28 # CONFIG_AUDIT is not set 31 29 CONFIG_IKCONFIG=y 32 30 CONFIG_IKCONFIG_PROC=y 31 + # CONFIG_RELAY is not set 33 32 CONFIG_INITRAMFS_SOURCE="" 34 33 CONFIG_UID16=y 35 34 CONFIG_CC_OPTIMIZE_FOR_SIZE=y ··· 46 43 CONFIG_FUTEX=y 47 44 CONFIG_EPOLL=y 48 45 CONFIG_SHMEM=y 49 - CONFIG_CC_ALIGN_FUNCTIONS=0 50 - CONFIG_CC_ALIGN_LABELS=0 51 - CONFIG_CC_ALIGN_LOOPS=0 52 - CONFIG_CC_ALIGN_JUMPS=0 53 46 CONFIG_SLAB=y 54 47 # CONFIG_TINY_SHMEM is not set 55 48 CONFIG_BASE_SMALL=0 ··· 58 59 CONFIG_MODULES=y 59 60 CONFIG_MODULE_UNLOAD=y 60 61 CONFIG_MODULE_FORCE_UNLOAD=y 61 - CONFIG_OBSOLETE_MODPARM=y 62 62 # CONFIG_MODVERSIONS is not set 63 63 # CONFIG_MODULE_SRCVERSION_ALL is not set 64 64 CONFIG_KMOD=y ··· 65 67 # 66 68 # Block layer 67 69 # 70 + # CONFIG_BLK_DEV_IO_TRACE is not set 68 71 69 72 # 70 73 # IO Schedulers ··· 93 94 # CONFIG_ARCH_IOP3XX is not set 94 95 # CONFIG_ARCH_IXP4XX is not set 95 96 # CONFIG_ARCH_IXP2000 is not set 97 + # CONFIG_ARCH_IXP23XX is not set 96 98 # CONFIG_ARCH_L7200 is not set 97 99 # CONFIG_ARCH_PXA is not set 98 100 # CONFIG_ARCH_RPC is not set ··· 112 112 # 113 113 # Cirrus EP93xx Implementation Options 114 114 # 115 - CONFIG_CRUNCH=y 116 115 117 116 # 118 117 # EP93xx Platforms ··· 231 232 # CONFIG_INET_AH is not set 232 233 # CONFIG_INET_ESP is not set 233 234 # CONFIG_INET_IPCOMP is not set 235 + # CONFIG_INET_XFRM_TUNNEL is not set 234 236 # CONFIG_INET_TUNNEL is not set 235 237 CONFIG_INET_DIAG=y 236 238 CONFIG_INET_TCP_DIAG=y 237 239 # CONFIG_TCP_CONG_ADVANCED is not set 238 240 CONFIG_TCP_CONG_BIC=y 239 241 # CONFIG_IPV6 is not set 242 + # CONFIG_INET6_XFRM_TUNNEL is not set 243 + # CONFIG_INET6_TUNNEL is not set 240 244 # CONFIG_NETFILTER is not set 241 245 242 246 # ··· 348 346 # CONFIG_MTD_OTP is not set 349 347 CONFIG_MTD_CFI_INTELEXT=y 350 348 CONFIG_MTD_CFI_AMDSTD=y 351 - CONFIG_MTD_CFI_AMDSTD_RETRY=0 352 349 CONFIG_MTD_CFI_STAA=y 353 350 CONFIG_MTD_CFI_UTIL=y 354 351 # CONFIG_MTD_RAM is not set ··· 372 371 # CONFIG_MTD_SLRAM is not set 373 372 # CONFIG_MTD_PHRAM is not set 374 373 # CONFIG_MTD_MTDRAM is not set 375 - # CONFIG_MTD_BLKMTD is not set 376 374 # CONFIG_MTD_BLOCK2MTD is not set 377 375 378 376 # ··· 412 412 # CONFIG_BLK_DEV_NBD is not set 413 413 # CONFIG_BLK_DEV_UB is not set 414 414 # CONFIG_BLK_DEV_RAM is not set 415 - CONFIG_BLK_DEV_RAM_COUNT=16 415 + # CONFIG_BLK_DEV_INITRD is not set 416 416 # CONFIG_CDROM_PKTCDVD is not set 417 417 # CONFIG_ATA_OVER_ETH is not set 418 418 ··· 576 576 # Watchdog Device Drivers 577 577 # 578 578 # CONFIG_SOFT_WATCHDOG is not set 579 + CONFIG_EP93XX_WATCHDOG=y 579 580 580 581 # 581 582 # USB-based Watchdog Cards 582 583 # 583 584 # CONFIG_USBPCWATCHDOG is not set 584 585 # CONFIG_NVRAM is not set 585 - # CONFIG_RTC is not set 586 586 # CONFIG_DTLK is not set 587 587 # CONFIG_R3964 is not set 588 588 ··· 626 626 # CONFIG_SENSORS_PCF8574 is not set 627 627 # CONFIG_SENSORS_PCA9539 is not set 628 628 # CONFIG_SENSORS_PCF8591 is not set 629 - # CONFIG_SENSORS_RTC8564 is not set 630 629 # CONFIG_SENSORS_MAX6875 is not set 631 - # CONFIG_RTC_X1205_I2C is not set 632 630 CONFIG_I2C_DEBUG_CORE=y 633 631 CONFIG_I2C_DEBUG_ALGO=y 634 632 CONFIG_I2C_DEBUG_BUS=y ··· 688 690 # 689 691 690 692 # 691 - # Multimedia Capabilities Port drivers 693 + # LED devices 694 + # 695 + # CONFIG_NEW_LEDS is not set 696 + 697 + # 698 + # LED drivers 699 + # 700 + 701 + # 702 + # LED Triggers 692 703 # 693 704 694 705 # ··· 709 702 # Digital Video Broadcasting Devices 710 703 # 711 704 # CONFIG_DVB is not set 705 + # CONFIG_USB_DABUSB is not set 712 706 713 707 # 714 708 # Graphics support ··· 726 718 # 727 719 CONFIG_USB_ARCH_HAS_HCD=y 728 720 # CONFIG_USB_ARCH_HAS_OHCI is not set 721 + # CONFIG_USB_ARCH_HAS_EHCI is not set 729 722 CONFIG_USB=y 730 723 CONFIG_USB_DEBUG=y 731 724 ··· 785 776 # CONFIG_USB_MICROTEK is not set 786 777 787 778 # 788 - # USB Multimedia devices 789 - # 790 - # CONFIG_USB_DABUSB is not set 791 - 792 - # 793 - # Video4Linux support is needed for USB Multimedia device support 794 - # 795 - 796 - # 797 779 # USB Network Adapters 798 780 # 799 781 # CONFIG_USB_CATC is not set ··· 813 813 # CONFIG_USB_SERIAL_CYPRESS_M8 is not set 814 814 # CONFIG_USB_SERIAL_EMPEG is not set 815 815 # CONFIG_USB_SERIAL_FTDI_SIO is not set 816 + # CONFIG_USB_SERIAL_FUNSOFT is not set 816 817 # CONFIG_USB_SERIAL_VISOR is not set 817 818 # CONFIG_USB_SERIAL_IPAQ is not set 818 819 # CONFIG_USB_SERIAL_IR is not set ··· 826 825 # CONFIG_USB_SERIAL_KLSI is not set 827 826 # CONFIG_USB_SERIAL_KOBIL_SCT is not set 828 827 # CONFIG_USB_SERIAL_MCT_U232 is not set 828 + # CONFIG_USB_SERIAL_NAVMAN is not set 829 829 CONFIG_USB_SERIAL_PL2303=y 830 830 # CONFIG_USB_SERIAL_HP4X is not set 831 831 # CONFIG_USB_SERIAL_SAFE is not set ··· 865 863 # MMC/SD Card support 866 864 # 867 865 # CONFIG_MMC is not set 866 + 867 + # 868 + # Real Time Clock 869 + # 870 + CONFIG_RTC_LIB=y 871 + CONFIG_RTC_CLASS=y 872 + CONFIG_RTC_HCTOSYS=y 873 + CONFIG_RTC_HCTOSYS_DEVICE="rtc0" 874 + 875 + # 876 + # RTC interfaces 877 + # 878 + CONFIG_RTC_INTF_SYSFS=y 879 + CONFIG_RTC_INTF_PROC=y 880 + CONFIG_RTC_INTF_DEV=y 881 + 882 + # 883 + # RTC drivers 884 + # 885 + # CONFIG_RTC_DRV_X1205 is not set 886 + # CONFIG_RTC_DRV_DS1672 is not set 887 + # CONFIG_RTC_DRV_PCF8563 is not set 888 + # CONFIG_RTC_DRV_RS5C372 is not set 889 + CONFIG_RTC_DRV_M48T86=y 890 + CONFIG_RTC_DRV_EP93XX=y 891 + # CONFIG_RTC_DRV_TEST is not set 868 892 869 893 # 870 894 # File systems ··· 940 912 CONFIG_TMPFS=y 941 913 # CONFIG_HUGETLB_PAGE is not set 942 914 CONFIG_RAMFS=y 943 - # CONFIG_RELAYFS_FS is not set 944 915 # CONFIG_CONFIGFS_FS is not set 945 916 946 917 # ··· 1071 1044 CONFIG_DETECT_SOFTLOCKUP=y 1072 1045 # CONFIG_SCHEDSTATS is not set 1073 1046 CONFIG_DEBUG_SLAB=y 1047 + # CONFIG_DEBUG_SLAB_LEAK is not set 1074 1048 CONFIG_DEBUG_MUTEXES=y 1075 1049 CONFIG_DEBUG_SPINLOCK=y 1076 1050 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set ··· 1081 1053 # CONFIG_DEBUG_FS is not set 1082 1054 # CONFIG_DEBUG_VM is not set 1083 1055 CONFIG_FRAME_POINTER=y 1056 + # CONFIG_UNWIND_INFO is not set 1084 1057 CONFIG_FORCED_INLINING=y 1085 1058 # CONFIG_RCU_TORTURE_TEST is not set 1086 1059 CONFIG_DEBUG_USER=y
+41 -18
arch/arm/configs/ixp2000_defconfig
··· 1 1 # 2 2 # Automatically generated make config: don't edit 3 - # Linux kernel version: 2.6.16-rc2 4 - # Wed Feb 8 04:49:11 2006 3 + # Linux kernel version: 2.6.17-rc2 4 + # Wed Apr 19 21:12:49 2006 5 5 # 6 6 CONFIG_ARM=y 7 7 CONFIG_MMU=y 8 8 CONFIG_RWSEM_GENERIC_SPINLOCK=y 9 + CONFIG_GENERIC_HWEIGHT=y 9 10 CONFIG_GENERIC_CALIBRATE_DELAY=y 11 + CONFIG_VECTORS_BASE=0xffff0000 10 12 11 13 # 12 14 # Code maturity level options 13 15 # 14 16 CONFIG_EXPERIMENTAL=y 15 - CONFIG_CLEAN_COMPILE=y 16 17 CONFIG_BROKEN_ON_SMP=y 17 18 CONFIG_INIT_ENV_ARG_LIMIT=32 18 19 ··· 30 29 CONFIG_SYSCTL=y 31 30 # CONFIG_AUDIT is not set 32 31 # CONFIG_IKCONFIG is not set 32 + # CONFIG_RELAY is not set 33 33 CONFIG_INITRAMFS_SOURCE="" 34 34 CONFIG_UID16=y 35 35 CONFIG_CC_OPTIMIZE_FOR_SIZE=y ··· 46 44 CONFIG_FUTEX=y 47 45 CONFIG_EPOLL=y 48 46 CONFIG_SHMEM=y 49 - CONFIG_CC_ALIGN_FUNCTIONS=0 50 - CONFIG_CC_ALIGN_LABELS=0 51 - CONFIG_CC_ALIGN_LOOPS=0 52 - CONFIG_CC_ALIGN_JUMPS=0 53 47 CONFIG_SLAB=y 54 48 # CONFIG_TINY_SHMEM is not set 55 49 CONFIG_BASE_SMALL=0 ··· 58 60 CONFIG_MODULES=y 59 61 CONFIG_MODULE_UNLOAD=y 60 62 # CONFIG_MODULE_FORCE_UNLOAD is not set 61 - CONFIG_OBSOLETE_MODPARM=y 62 63 # CONFIG_MODVERSIONS is not set 63 64 # CONFIG_MODULE_SRCVERSION_ALL is not set 64 65 CONFIG_KMOD=y ··· 65 68 # 66 69 # Block layer 67 70 # 71 + # CONFIG_BLK_DEV_IO_TRACE is not set 68 72 69 73 # 70 74 # IO Schedulers ··· 87 89 # CONFIG_ARCH_CLPS711X is not set 88 90 # CONFIG_ARCH_CO285 is not set 89 91 # CONFIG_ARCH_EBSA110 is not set 92 + # CONFIG_ARCH_EP93XX is not set 90 93 # CONFIG_ARCH_FOOTBRIDGE is not set 91 94 # CONFIG_ARCH_INTEGRATOR is not set 92 95 # CONFIG_ARCH_IOP3XX is not set 93 96 # CONFIG_ARCH_IXP4XX is not set 94 97 CONFIG_ARCH_IXP2000=y 98 + # CONFIG_ARCH_IXP23XX is not set 95 99 # CONFIG_ARCH_L7200 is not set 96 100 # CONFIG_ARCH_PXA is not set 97 101 # CONFIG_ARCH_RPC is not set ··· 123 123 CONFIG_ARCH_IXDP2X00=y 124 124 CONFIG_ARCH_IXDP2401=y 125 125 CONFIG_ARCH_IXDP2801=y 126 + CONFIG_MACH_IXDP28X5=y 126 127 CONFIG_ARCH_IXDP2X01=y 127 128 # CONFIG_IXP2000_SUPPORT_BROKEN_PCI_IO is not set 128 129 ··· 148 147 # Bus support 149 148 # 150 149 CONFIG_PCI=y 151 - CONFIG_PCI_LEGACY_PROC=y 152 150 # CONFIG_PCI_DEBUG is not set 153 151 154 152 # ··· 160 160 # 161 161 # CONFIG_PREEMPT is not set 162 162 # CONFIG_NO_IDLE_HZ is not set 163 + CONFIG_HZ=100 163 164 # CONFIG_AEABI is not set 164 165 # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set 165 166 CONFIG_SELECT_MEMORY_MODEL=y ··· 214 213 # 215 214 # Networking options 216 215 # 216 + # CONFIG_NETDEBUG is not set 217 217 CONFIG_PACKET=y 218 218 CONFIG_PACKET_MMAP=y 219 219 CONFIG_UNIX=y ··· 234 232 # CONFIG_INET_AH is not set 235 233 # CONFIG_INET_ESP is not set 236 234 # CONFIG_INET_IPCOMP is not set 235 + # CONFIG_INET_XFRM_TUNNEL is not set 237 236 # CONFIG_INET_TUNNEL is not set 238 237 CONFIG_INET_DIAG=y 239 238 CONFIG_INET_TCP_DIAG=y 240 239 # CONFIG_TCP_CONG_ADVANCED is not set 241 240 CONFIG_TCP_CONG_BIC=y 242 241 # CONFIG_IPV6 is not set 242 + # CONFIG_INET6_XFRM_TUNNEL is not set 243 + # CONFIG_INET6_TUNNEL is not set 243 244 # CONFIG_NETFILTER is not set 244 245 245 246 # ··· 352 347 # CONFIG_MTD_ROM is not set 353 348 # CONFIG_MTD_ABSENT is not set 354 349 # CONFIG_MTD_OBSOLETE_CHIPS is not set 355 - # CONFIG_MTD_XIP is not set 356 350 357 351 # 358 352 # Mapping drivers for chip access ··· 370 366 # CONFIG_MTD_SLRAM is not set 371 367 # CONFIG_MTD_PHRAM is not set 372 368 # CONFIG_MTD_MTDRAM is not set 373 - # CONFIG_MTD_BLKMTD is not set 374 369 # CONFIG_MTD_BLOCK2MTD is not set 375 370 376 371 # ··· 617 614 # 618 615 CONFIG_SERIAL_8250=y 619 616 CONFIG_SERIAL_8250_CONSOLE=y 617 + CONFIG_SERIAL_8250_PCI=y 620 618 CONFIG_SERIAL_8250_NR_UARTS=3 621 - CONFIG_SERIAL_8250_RUNTIME_UARTS=4 619 + CONFIG_SERIAL_8250_RUNTIME_UARTS=3 622 620 # CONFIG_SERIAL_8250_EXTENDED is not set 623 621 624 622 # ··· 627 623 # 628 624 CONFIG_SERIAL_CORE=y 629 625 CONFIG_SERIAL_CORE_CONSOLE=y 626 + # CONFIG_SERIAL_JSM is not set 630 627 CONFIG_UNIX98_PTYS=y 631 628 CONFIG_LEGACY_PTYS=y 632 629 CONFIG_LEGACY_PTY_COUNT=256 ··· 655 650 # CONFIG_PCIPCWATCHDOG is not set 656 651 # CONFIG_WDTPCI is not set 657 652 # CONFIG_NVRAM is not set 658 - # CONFIG_RTC is not set 659 653 # CONFIG_DTLK is not set 660 654 # CONFIG_R3964 is not set 661 655 # CONFIG_APPLICOM is not set ··· 700 696 # CONFIG_I2C_PARPORT_LIGHT is not set 701 697 # CONFIG_I2C_PROSAVAGE is not set 702 698 # CONFIG_I2C_SAVAGE4 is not set 703 - # CONFIG_SCx200_ACB is not set 704 699 # CONFIG_I2C_SIS5595 is not set 705 700 # CONFIG_I2C_SIS630 is not set 706 701 # CONFIG_I2C_SIS96X is not set ··· 718 715 # CONFIG_SENSORS_PCF8574 is not set 719 716 # CONFIG_SENSORS_PCA9539 is not set 720 717 # CONFIG_SENSORS_PCF8591 is not set 721 - # CONFIG_SENSORS_RTC8564 is not set 722 718 # CONFIG_SENSORS_MAX6875 is not set 723 - # CONFIG_RTC_X1205_I2C is not set 724 719 # CONFIG_I2C_DEBUG_CORE is not set 725 720 # CONFIG_I2C_DEBUG_ALGO is not set 726 721 # CONFIG_I2C_DEBUG_BUS is not set ··· 729 728 # 730 729 # CONFIG_SPI is not set 731 730 # CONFIG_SPI_MASTER is not set 731 + 732 + # 733 + # Dallas's 1-wire bus 734 + # 735 + # CONFIG_W1 is not set 732 736 733 737 # 734 738 # Hardware Monitoring support ··· 748 742 # CONFIG_SENSORS_ASB100 is not set 749 743 # CONFIG_SENSORS_ATXP1 is not set 750 744 # CONFIG_SENSORS_DS1621 is not set 745 + # CONFIG_SENSORS_F71805F is not set 751 746 # CONFIG_SENSORS_FSCHER is not set 752 747 # CONFIG_SENSORS_FSCPOS is not set 753 748 # CONFIG_SENSORS_GL518SM is not set ··· 783 776 # 784 777 785 778 # 786 - # Multimedia Capabilities Port drivers 779 + # LED devices 780 + # 781 + # CONFIG_NEW_LEDS is not set 782 + 783 + # 784 + # LED drivers 785 + # 786 + 787 + # 788 + # LED Triggers 787 789 # 788 790 789 791 # ··· 820 804 # 821 805 CONFIG_USB_ARCH_HAS_HCD=y 822 806 CONFIG_USB_ARCH_HAS_OHCI=y 807 + CONFIG_USB_ARCH_HAS_EHCI=y 823 808 # CONFIG_USB is not set 824 809 825 810 # ··· 836 819 # MMC/SD Card support 837 820 # 838 821 # CONFIG_MMC is not set 822 + 823 + # 824 + # Real Time Clock 825 + # 826 + CONFIG_RTC_LIB=y 827 + # CONFIG_RTC_CLASS is not set 839 828 840 829 # 841 830 # File systems ··· 893 870 CONFIG_TMPFS=y 894 871 # CONFIG_HUGETLB_PAGE is not set 895 872 CONFIG_RAMFS=y 896 - # CONFIG_RELAYFS_FS is not set 897 873 # CONFIG_CONFIGFS_FS is not set 898 874 899 875 # ··· 994 972 # CONFIG_DEBUG_FS is not set 995 973 # CONFIG_DEBUG_VM is not set 996 974 CONFIG_FRAME_POINTER=y 975 + # CONFIG_UNWIND_INFO is not set 997 976 CONFIG_FORCED_INLINING=y 998 977 # CONFIG_RCU_TORTURE_TEST is not set 999 978 CONFIG_DEBUG_USER=y
+30 -28
arch/arm/configs/ixp23xx_defconfig
··· 1 1 # 2 2 # Automatically generated make config: don't edit 3 - # Linux kernel version: 2.6.16 4 - # Tue Mar 21 03:27:20 2006 3 + # Linux kernel version: 2.6.17-rc2 4 + # Wed Apr 19 21:13:50 2006 5 5 # 6 6 CONFIG_ARM=y 7 7 CONFIG_MMU=y 8 8 CONFIG_RWSEM_GENERIC_SPINLOCK=y 9 + CONFIG_GENERIC_HWEIGHT=y 9 10 CONFIG_GENERIC_CALIBRATE_DELAY=y 11 + CONFIG_VECTORS_BASE=0xffff0000 10 12 11 13 # 12 14 # Code maturity level options ··· 30 28 CONFIG_SYSCTL=y 31 29 # CONFIG_AUDIT is not set 32 30 # CONFIG_IKCONFIG is not set 31 + # CONFIG_RELAY is not set 33 32 CONFIG_INITRAMFS_SOURCE="" 34 33 CONFIG_UID16=y 35 34 CONFIG_CC_OPTIMIZE_FOR_SIZE=y ··· 46 43 CONFIG_FUTEX=y 47 44 CONFIG_EPOLL=y 48 45 CONFIG_SHMEM=y 49 - CONFIG_CC_ALIGN_FUNCTIONS=0 50 - CONFIG_CC_ALIGN_LABELS=0 51 - CONFIG_CC_ALIGN_LOOPS=0 52 - CONFIG_CC_ALIGN_JUMPS=0 53 46 CONFIG_SLAB=y 54 47 # CONFIG_TINY_SHMEM is not set 55 48 CONFIG_BASE_SMALL=0 ··· 58 59 CONFIG_MODULES=y 59 60 CONFIG_MODULE_UNLOAD=y 60 61 # CONFIG_MODULE_FORCE_UNLOAD is not set 61 - CONFIG_OBSOLETE_MODPARM=y 62 62 # CONFIG_MODVERSIONS is not set 63 63 # CONFIG_MODULE_SRCVERSION_ALL is not set 64 64 CONFIG_KMOD=y ··· 65 67 # 66 68 # Block layer 67 69 # 70 + # CONFIG_BLK_DEV_IO_TRACE is not set 68 71 69 72 # 70 73 # IO Schedulers ··· 142 143 # Bus support 143 144 # 144 145 CONFIG_PCI=y 145 - CONFIG_PCI_LEGACY_PROC=y 146 146 # CONFIG_PCI_DEBUG is not set 147 147 148 148 # ··· 228 230 # CONFIG_INET_AH is not set 229 231 # CONFIG_INET_ESP is not set 230 232 # CONFIG_INET_IPCOMP is not set 233 + # CONFIG_INET_XFRM_TUNNEL is not set 231 234 # CONFIG_INET_TUNNEL is not set 232 235 CONFIG_INET_DIAG=y 233 236 CONFIG_INET_TCP_DIAG=y 234 237 # CONFIG_TCP_CONG_ADVANCED is not set 235 238 CONFIG_TCP_CONG_BIC=y 236 239 # CONFIG_IPV6 is not set 240 + # CONFIG_INET6_XFRM_TUNNEL is not set 241 + # CONFIG_INET6_TUNNEL is not set 237 242 # CONFIG_NETFILTER is not set 238 243 239 244 # ··· 366 365 # CONFIG_MTD_SLRAM is not set 367 366 # CONFIG_MTD_PHRAM is not set 368 367 # CONFIG_MTD_MTDRAM is not set 369 - # CONFIG_MTD_BLKMTD is not set 370 368 # CONFIG_MTD_BLOCK2MTD is not set 371 369 372 370 # ··· 527 527 # CONFIG_SCSI_INIA100 is not set 528 528 # CONFIG_SCSI_SYM53C8XX_2 is not set 529 529 # CONFIG_SCSI_IPR is not set 530 - # CONFIG_SCSI_QLOGIC_FC is not set 531 530 # CONFIG_SCSI_QLOGIC_1280 is not set 532 531 # CONFIG_SCSI_QLA_FC is not set 533 532 # CONFIG_SCSI_LPFC is not set ··· 734 735 # 735 736 CONFIG_SERIAL_8250=y 736 737 CONFIG_SERIAL_8250_CONSOLE=y 738 + CONFIG_SERIAL_8250_PCI=y 737 739 CONFIG_SERIAL_8250_NR_UARTS=4 738 740 CONFIG_SERIAL_8250_RUNTIME_UARTS=4 739 741 # CONFIG_SERIAL_8250_EXTENDED is not set ··· 776 776 # 777 777 # CONFIG_USBPCWATCHDOG is not set 778 778 # CONFIG_NVRAM is not set 779 - # CONFIG_RTC is not set 780 779 # CONFIG_DTLK is not set 781 780 # CONFIG_R3964 is not set 782 781 # CONFIG_APPLICOM is not set ··· 820 821 # CONFIG_I2C_PARPORT_LIGHT is not set 821 822 # CONFIG_I2C_PROSAVAGE is not set 822 823 # CONFIG_I2C_SAVAGE4 is not set 823 - # CONFIG_SCx200_ACB is not set 824 824 # CONFIG_I2C_SIS5595 is not set 825 825 # CONFIG_I2C_SIS630 is not set 826 826 # CONFIG_I2C_SIS96X is not set ··· 838 840 # CONFIG_SENSORS_PCF8574 is not set 839 841 # CONFIG_SENSORS_PCA9539 is not set 840 842 # CONFIG_SENSORS_PCF8591 is not set 841 - # CONFIG_SENSORS_RTC8564 is not set 842 843 # CONFIG_SENSORS_MAX6875 is not set 843 - # CONFIG_RTC_X1205_I2C is not set 844 844 # CONFIG_I2C_DEBUG_CORE is not set 845 845 # CONFIG_I2C_DEBUG_ALGO is not set 846 846 # CONFIG_I2C_DEBUG_BUS is not set ··· 903 907 # 904 908 905 909 # 906 - # Multimedia Capabilities Port drivers 910 + # LED devices 911 + # 912 + # CONFIG_NEW_LEDS is not set 913 + 914 + # 915 + # LED drivers 916 + # 917 + 918 + # 919 + # LED Triggers 907 920 # 908 921 909 922 # ··· 924 919 # Digital Video Broadcasting Devices 925 920 # 926 921 # CONFIG_DVB is not set 922 + # CONFIG_USB_DABUSB is not set 927 923 928 924 # 929 925 # Graphics support ··· 941 935 # 942 936 CONFIG_USB_ARCH_HAS_HCD=y 943 937 CONFIG_USB_ARCH_HAS_OHCI=y 938 + CONFIG_USB_ARCH_HAS_EHCI=y 944 939 CONFIG_USB=y 945 940 # CONFIG_USB_DEBUG is not set 946 941 ··· 1007 1000 # CONFIG_USB_ACECAD is not set 1008 1001 # CONFIG_USB_KBTAB is not set 1009 1002 # CONFIG_USB_POWERMATE is not set 1010 - # CONFIG_USB_MTOUCH is not set 1011 - # CONFIG_USB_ITMTOUCH is not set 1012 - # CONFIG_USB_EGALAX is not set 1003 + # CONFIG_USB_TOUCHSCREEN is not set 1013 1004 # CONFIG_USB_YEALINK is not set 1014 1005 # CONFIG_USB_XPAD is not set 1015 1006 # CONFIG_USB_ATI_REMOTE is not set ··· 1020 1015 # 1021 1016 # CONFIG_USB_MDC800 is not set 1022 1017 # CONFIG_USB_MICROTEK is not set 1023 - 1024 - # 1025 - # USB Multimedia devices 1026 - # 1027 - # CONFIG_USB_DABUSB is not set 1028 - 1029 - # 1030 - # Video4Linux support is needed for USB Multimedia device support 1031 - # 1032 1018 1033 1019 # 1034 1020 # USB Network Adapters ··· 1070 1074 # MMC/SD Card support 1071 1075 # 1072 1076 # CONFIG_MMC is not set 1077 + 1078 + # 1079 + # Real Time Clock 1080 + # 1081 + CONFIG_RTC_LIB=y 1082 + # CONFIG_RTC_CLASS is not set 1073 1083 1074 1084 # 1075 1085 # File systems ··· 1129 1127 CONFIG_TMPFS=y 1130 1128 # CONFIG_HUGETLB_PAGE is not set 1131 1129 CONFIG_RAMFS=y 1132 - # CONFIG_RELAYFS_FS is not set 1133 1130 # CONFIG_CONFIGFS_FS is not set 1134 1131 1135 1132 # ··· 1269 1268 # CONFIG_DEBUG_FS is not set 1270 1269 # CONFIG_DEBUG_VM is not set 1271 1270 CONFIG_FRAME_POINTER=y 1271 + # CONFIG_UNWIND_INFO is not set 1272 1272 CONFIG_FORCED_INLINING=y 1273 1273 # CONFIG_RCU_TORTURE_TEST is not set 1274 1274 CONFIG_DEBUG_USER=y
+4 -4
arch/arm/kernel/setup.c
··· 407 407 } 408 408 __early_param("initrd=", early_initrd); 409 409 410 - static void __init add_memory(unsigned long start, unsigned long size) 410 + static void __init arm_add_memory(unsigned long start, unsigned long size) 411 411 { 412 412 /* 413 413 * Ensure that start/size are aligned to a page boundary. ··· 445 445 if (**p == '@') 446 446 start = memparse(*p + 1, p); 447 447 448 - add_memory(start, size); 448 + arm_add_memory(start, size); 449 449 } 450 450 __early_param("mem=", early_mem); 451 451 ··· 587 587 tag->u.mem.start, tag->u.mem.size / 1024); 588 588 return -EINVAL; 589 589 } 590 - add_memory(tag->u.mem.start, tag->u.mem.size); 590 + arm_add_memory(tag->u.mem.start, tag->u.mem.size); 591 591 return 0; 592 592 } 593 593 ··· 807 807 { 808 808 int cpu; 809 809 810 - for_each_cpu(cpu) 810 + for_each_possible_cpu(cpu) 811 811 register_cpu(&per_cpu(cpu_data, cpu).cpu, cpu, NULL); 812 812 813 813 return 0;
+1 -1
arch/arm/mach-ixp4xx/common.c
··· 91 91 /* 92 92 * IRQ -> GPIO mapping table 93 93 */ 94 - static char irq2gpio[32] = { 94 + static signed char irq2gpio[32] = { 95 95 -1, -1, -1, -1, -1, -1, 0, 1, 96 96 -1, -1, -1, -1, -1, -1, -1, -1, 97 97 -1, -1, -1, 2, 3, 4, 5, 6,