diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-03 15:41:58 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-03 15:41:58 -0400 |
commit | 21806261b6cc1068197ea6c8891b857f16260fee (patch) | |
tree | 79f9e6c27691a0c0b75f3639f85e4ba2babf6726 /arch | |
parent | 5c27d0f11e679e6e5b6b2047b8658409699d4a67 (diff) | |
parent | dd3aa7cdac35dcdcb93ff5684622664395b0155e (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6:
sh64: Update defconfigs.
sh64: fix dma_cache_sync() compilation
sh64: Move DMA macros from pci.h to scatterlist.h.
Diffstat (limited to 'arch')
-rw-r--r-- | arch/sh64/configs/cayman_defconfig | 140 | ||||
-rw-r--r-- | arch/sh64/configs/harp_defconfig | 105 | ||||
-rw-r--r-- | arch/sh64/configs/sim_defconfig | 68 |
3 files changed, 142 insertions, 171 deletions
diff --git a/arch/sh64/configs/cayman_defconfig b/arch/sh64/configs/cayman_defconfig index 91b59118c1b1..75552bb01405 100644 --- a/arch/sh64/configs/cayman_defconfig +++ b/arch/sh64/configs/cayman_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.23-rc8 | 3 | # Linux kernel version: 2.6.24-rc1 |
4 | # Tue Oct 9 15:37:16 2007 | 4 | # Fri Nov 2 14:35:27 2007 |
5 | # | 5 | # |
6 | CONFIG_SUPERH=y | 6 | CONFIG_SUPERH=y |
7 | CONFIG_SUPERH64=y | 7 | CONFIG_SUPERH64=y |
@@ -36,6 +36,10 @@ CONFIG_POSIX_MQUEUE=y | |||
36 | # CONFIG_AUDIT is not set | 36 | # CONFIG_AUDIT is not set |
37 | # CONFIG_IKCONFIG is not set | 37 | # CONFIG_IKCONFIG is not set |
38 | CONFIG_LOG_BUF_SHIFT=14 | 38 | CONFIG_LOG_BUF_SHIFT=14 |
39 | # CONFIG_CGROUPS is not set | ||
40 | CONFIG_FAIR_GROUP_SCHED=y | ||
41 | CONFIG_FAIR_USER_SCHED=y | ||
42 | # CONFIG_FAIR_CGROUP_SCHED is not set | ||
39 | CONFIG_SYSFS_DEPRECATED=y | 43 | CONFIG_SYSFS_DEPRECATED=y |
40 | # CONFIG_RELAY is not set | 44 | # CONFIG_RELAY is not set |
41 | # CONFIG_BLK_DEV_INITRD is not set | 45 | # CONFIG_BLK_DEV_INITRD is not set |
@@ -148,6 +152,7 @@ CONFIG_FLATMEM_MANUAL=y | |||
148 | CONFIG_FLATMEM=y | 152 | CONFIG_FLATMEM=y |
149 | CONFIG_FLAT_NODE_MEM_MAP=y | 153 | CONFIG_FLAT_NODE_MEM_MAP=y |
150 | # CONFIG_SPARSEMEM_STATIC is not set | 154 | # CONFIG_SPARSEMEM_STATIC is not set |
155 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
151 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 156 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
152 | # CONFIG_RESOURCES_64BIT is not set | 157 | # CONFIG_RESOURCES_64BIT is not set |
153 | CONFIG_ZONE_DMA_FLAG=0 | 158 | CONFIG_ZONE_DMA_FLAG=0 |
@@ -160,10 +165,6 @@ CONFIG_PCI=y | |||
160 | CONFIG_SH_PCIDMA_NONCOHERENT=y | 165 | CONFIG_SH_PCIDMA_NONCOHERENT=y |
161 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 166 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
162 | # CONFIG_PCI_DEBUG is not set | 167 | # CONFIG_PCI_DEBUG is not set |
163 | |||
164 | # | ||
165 | # PCCARD (PCMCIA/CardBus) support | ||
166 | # | ||
167 | # CONFIG_PCCARD is not set | 168 | # CONFIG_PCCARD is not set |
168 | # CONFIG_HOTPLUG_PCI is not set | 169 | # CONFIG_HOTPLUG_PCI is not set |
169 | 170 | ||
@@ -209,6 +210,7 @@ CONFIG_IP_PNP=y | |||
209 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | 210 | CONFIG_INET_XFRM_MODE_TRANSPORT=y |
210 | CONFIG_INET_XFRM_MODE_TUNNEL=y | 211 | CONFIG_INET_XFRM_MODE_TUNNEL=y |
211 | CONFIG_INET_XFRM_MODE_BEET=y | 212 | CONFIG_INET_XFRM_MODE_BEET=y |
213 | # CONFIG_INET_LRO is not set | ||
212 | CONFIG_INET_DIAG=y | 214 | CONFIG_INET_DIAG=y |
213 | CONFIG_INET_TCP_DIAG=y | 215 | CONFIG_INET_TCP_DIAG=y |
214 | # CONFIG_TCP_CONG_ADVANCED is not set | 216 | # CONFIG_TCP_CONG_ADVANCED is not set |
@@ -234,10 +236,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
234 | # CONFIG_LAPB is not set | 236 | # CONFIG_LAPB is not set |
235 | # CONFIG_ECONET is not set | 237 | # CONFIG_ECONET is not set |
236 | # CONFIG_WAN_ROUTER is not set | 238 | # CONFIG_WAN_ROUTER is not set |
237 | |||
238 | # | ||
239 | # QoS and/or fair queueing | ||
240 | # | ||
241 | # CONFIG_NET_SCHED is not set | 239 | # CONFIG_NET_SCHED is not set |
242 | 240 | ||
243 | # | 241 | # |
@@ -266,6 +264,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
266 | # | 264 | # |
267 | # Generic Driver Options | 265 | # Generic Driver Options |
268 | # | 266 | # |
267 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
269 | CONFIG_STANDALONE=y | 268 | CONFIG_STANDALONE=y |
270 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 269 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
271 | # CONFIG_FW_LOADER is not set | 270 | # CONFIG_FW_LOADER is not set |
@@ -333,6 +332,7 @@ CONFIG_SCSI_SPI_ATTRS=y | |||
333 | # CONFIG_SCSI_FC_ATTRS is not set | 332 | # CONFIG_SCSI_FC_ATTRS is not set |
334 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 333 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
335 | # CONFIG_SCSI_SAS_LIBSAS is not set | 334 | # CONFIG_SCSI_SAS_LIBSAS is not set |
335 | # CONFIG_SCSI_SRP_ATTRS is not set | ||
336 | CONFIG_SCSI_LOWLEVEL=y | 336 | CONFIG_SCSI_LOWLEVEL=y |
337 | # CONFIG_ISCSI_TCP is not set | 337 | # CONFIG_ISCSI_TCP is not set |
338 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 338 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
@@ -370,14 +370,7 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y | |||
370 | # CONFIG_SCSI_SRP is not set | 370 | # CONFIG_SCSI_SRP is not set |
371 | # CONFIG_ATA is not set | 371 | # CONFIG_ATA is not set |
372 | # CONFIG_MD is not set | 372 | # CONFIG_MD is not set |
373 | |||
374 | # | ||
375 | # Fusion MPT device support | ||
376 | # | ||
377 | # CONFIG_FUSION is not set | 373 | # CONFIG_FUSION is not set |
378 | # CONFIG_FUSION_SPI is not set | ||
379 | # CONFIG_FUSION_FC is not set | ||
380 | # CONFIG_FUSION_SAS is not set | ||
381 | 374 | ||
382 | # | 375 | # |
383 | # IEEE 1394 (FireWire) support | 376 | # IEEE 1394 (FireWire) support |
@@ -392,6 +385,8 @@ CONFIG_NETDEVICES=y | |||
392 | # CONFIG_MACVLAN is not set | 385 | # CONFIG_MACVLAN is not set |
393 | # CONFIG_EQUALIZER is not set | 386 | # CONFIG_EQUALIZER is not set |
394 | # CONFIG_TUN is not set | 387 | # CONFIG_TUN is not set |
388 | # CONFIG_VETH is not set | ||
389 | # CONFIG_IP1000 is not set | ||
395 | # CONFIG_ARCNET is not set | 390 | # CONFIG_ARCNET is not set |
396 | # CONFIG_PHYLIB is not set | 391 | # CONFIG_PHYLIB is not set |
397 | CONFIG_NET_ETHERNET=y | 392 | CONFIG_NET_ETHERNET=y |
@@ -402,6 +397,7 @@ CONFIG_NET_ETHERNET=y | |||
402 | # CONFIG_CASSINI is not set | 397 | # CONFIG_CASSINI is not set |
403 | # CONFIG_NET_VENDOR_3COM is not set | 398 | # CONFIG_NET_VENDOR_3COM is not set |
404 | # CONFIG_SMC91X is not set | 399 | # CONFIG_SMC91X is not set |
400 | # CONFIG_SMC911X is not set | ||
405 | CONFIG_NET_TULIP=y | 401 | CONFIG_NET_TULIP=y |
406 | # CONFIG_DE2104X is not set | 402 | # CONFIG_DE2104X is not set |
407 | CONFIG_TULIP=y | 403 | CONFIG_TULIP=y |
@@ -413,13 +409,16 @@ CONFIG_TULIP=y | |||
413 | # CONFIG_DM9102 is not set | 409 | # CONFIG_DM9102 is not set |
414 | # CONFIG_ULI526X is not set | 410 | # CONFIG_ULI526X is not set |
415 | # CONFIG_HP100 is not set | 411 | # CONFIG_HP100 is not set |
412 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
413 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
414 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
415 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
416 | CONFIG_NET_PCI=y | 416 | CONFIG_NET_PCI=y |
417 | # CONFIG_PCNET32 is not set | 417 | # CONFIG_PCNET32 is not set |
418 | # CONFIG_AMD8111_ETH is not set | 418 | # CONFIG_AMD8111_ETH is not set |
419 | # CONFIG_ADAPTEC_STARFIRE is not set | 419 | # CONFIG_ADAPTEC_STARFIRE is not set |
420 | # CONFIG_B44 is not set | 420 | # CONFIG_B44 is not set |
421 | # CONFIG_FORCEDETH is not set | 421 | # CONFIG_FORCEDETH is not set |
422 | # CONFIG_DGRS is not set | ||
423 | # CONFIG_EEPRO100 is not set | 422 | # CONFIG_EEPRO100 is not set |
424 | # CONFIG_E100 is not set | 423 | # CONFIG_E100 is not set |
425 | # CONFIG_FEALNX is not set | 424 | # CONFIG_FEALNX is not set |
@@ -437,6 +436,7 @@ CONFIG_NETDEV_1000=y | |||
437 | # CONFIG_ACENIC is not set | 436 | # CONFIG_ACENIC is not set |
438 | # CONFIG_DL2K is not set | 437 | # CONFIG_DL2K is not set |
439 | # CONFIG_E1000 is not set | 438 | # CONFIG_E1000 is not set |
439 | # CONFIG_E1000E is not set | ||
440 | # CONFIG_NS83820 is not set | 440 | # CONFIG_NS83820 is not set |
441 | # CONFIG_HAMACHI is not set | 441 | # CONFIG_HAMACHI is not set |
442 | # CONFIG_YELLOWFIN is not set | 442 | # CONFIG_YELLOWFIN is not set |
@@ -453,11 +453,14 @@ CONFIG_NETDEV_1000=y | |||
453 | CONFIG_NETDEV_10000=y | 453 | CONFIG_NETDEV_10000=y |
454 | # CONFIG_CHELSIO_T1 is not set | 454 | # CONFIG_CHELSIO_T1 is not set |
455 | # CONFIG_CHELSIO_T3 is not set | 455 | # CONFIG_CHELSIO_T3 is not set |
456 | # CONFIG_IXGBE is not set | ||
456 | # CONFIG_IXGB is not set | 457 | # CONFIG_IXGB is not set |
457 | # CONFIG_S2IO is not set | 458 | # CONFIG_S2IO is not set |
458 | # CONFIG_MYRI10GE is not set | 459 | # CONFIG_MYRI10GE is not set |
459 | # CONFIG_NETXEN_NIC is not set | 460 | # CONFIG_NETXEN_NIC is not set |
461 | # CONFIG_NIU is not set | ||
460 | # CONFIG_MLX4_CORE is not set | 462 | # CONFIG_MLX4_CORE is not set |
463 | # CONFIG_TEHUTI is not set | ||
461 | # CONFIG_TR is not set | 464 | # CONFIG_TR is not set |
462 | 465 | ||
463 | # | 466 | # |
@@ -493,7 +496,6 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y | |||
493 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | 496 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 |
494 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | 497 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 |
495 | # CONFIG_INPUT_JOYDEV is not set | 498 | # CONFIG_INPUT_JOYDEV is not set |
496 | # CONFIG_INPUT_TSDEV is not set | ||
497 | # CONFIG_INPUT_EVDEV is not set | 499 | # CONFIG_INPUT_EVDEV is not set |
498 | # CONFIG_INPUT_EVBUG is not set | 500 | # CONFIG_INPUT_EVBUG is not set |
499 | 501 | ||
@@ -561,23 +563,9 @@ CONFIG_UNIX98_PTYS=y | |||
561 | CONFIG_LEGACY_PTYS=y | 563 | CONFIG_LEGACY_PTYS=y |
562 | CONFIG_LEGACY_PTY_COUNT=256 | 564 | CONFIG_LEGACY_PTY_COUNT=256 |
563 | # CONFIG_IPMI_HANDLER is not set | 565 | # CONFIG_IPMI_HANDLER is not set |
564 | CONFIG_WATCHDOG=y | ||
565 | # CONFIG_WATCHDOG_NOWAYOUT is not set | ||
566 | |||
567 | # | ||
568 | # Watchdog Device Drivers | ||
569 | # | ||
570 | # CONFIG_SOFT_WATCHDOG is not set | ||
571 | |||
572 | # | ||
573 | # PCI-based Watchdog Cards | ||
574 | # | ||
575 | # CONFIG_PCIPCWATCHDOG is not set | ||
576 | # CONFIG_WDTPCI is not set | ||
577 | CONFIG_HW_RANDOM=y | 566 | CONFIG_HW_RANDOM=y |
578 | # CONFIG_R3964 is not set | 567 | # CONFIG_R3964 is not set |
579 | # CONFIG_APPLICOM is not set | 568 | # CONFIG_APPLICOM is not set |
580 | # CONFIG_DRM is not set | ||
581 | # CONFIG_RAW_DRIVER is not set | 569 | # CONFIG_RAW_DRIVER is not set |
582 | # CONFIG_TCG_TPM is not set | 570 | # CONFIG_TCG_TPM is not set |
583 | CONFIG_DEVPORT=y | 571 | CONFIG_DEVPORT=y |
@@ -644,8 +632,6 @@ CONFIG_I2C_BOARDINFO=y | |||
644 | # CONFIG_POWER_SUPPLY is not set | 632 | # CONFIG_POWER_SUPPLY is not set |
645 | CONFIG_HWMON=y | 633 | CONFIG_HWMON=y |
646 | # CONFIG_HWMON_VID is not set | 634 | # CONFIG_HWMON_VID is not set |
647 | # CONFIG_SENSORS_ABITUGURU is not set | ||
648 | # CONFIG_SENSORS_ABITUGURU3 is not set | ||
649 | # CONFIG_SENSORS_AD7418 is not set | 635 | # CONFIG_SENSORS_AD7418 is not set |
650 | # CONFIG_SENSORS_ADM1021 is not set | 636 | # CONFIG_SENSORS_ADM1021 is not set |
651 | # CONFIG_SENSORS_ADM1025 is not set | 637 | # CONFIG_SENSORS_ADM1025 is not set |
@@ -653,12 +639,12 @@ CONFIG_HWMON=y | |||
653 | # CONFIG_SENSORS_ADM1029 is not set | 639 | # CONFIG_SENSORS_ADM1029 is not set |
654 | # CONFIG_SENSORS_ADM1031 is not set | 640 | # CONFIG_SENSORS_ADM1031 is not set |
655 | # CONFIG_SENSORS_ADM9240 is not set | 641 | # CONFIG_SENSORS_ADM9240 is not set |
656 | # CONFIG_SENSORS_ASB100 is not set | 642 | # CONFIG_SENSORS_ADT7470 is not set |
657 | # CONFIG_SENSORS_ATXP1 is not set | 643 | # CONFIG_SENSORS_ATXP1 is not set |
658 | # CONFIG_SENSORS_DS1621 is not set | 644 | # CONFIG_SENSORS_DS1621 is not set |
659 | # CONFIG_SENSORS_F71805F is not set | 645 | # CONFIG_SENSORS_F71805F is not set |
660 | # CONFIG_SENSORS_FSCHER is not set | 646 | # CONFIG_SENSORS_F71882FG is not set |
661 | # CONFIG_SENSORS_FSCPOS is not set | 647 | # CONFIG_SENSORS_F75375S is not set |
662 | # CONFIG_SENSORS_GL518SM is not set | 648 | # CONFIG_SENSORS_GL518SM is not set |
663 | # CONFIG_SENSORS_GL520SM is not set | 649 | # CONFIG_SENSORS_GL520SM is not set |
664 | # CONFIG_SENSORS_IT87 is not set | 650 | # CONFIG_SENSORS_IT87 is not set |
@@ -694,6 +680,25 @@ CONFIG_HWMON=y | |||
694 | # CONFIG_SENSORS_W83627HF is not set | 680 | # CONFIG_SENSORS_W83627HF is not set |
695 | # CONFIG_SENSORS_W83627EHF is not set | 681 | # CONFIG_SENSORS_W83627EHF is not set |
696 | # CONFIG_HWMON_DEBUG_CHIP is not set | 682 | # CONFIG_HWMON_DEBUG_CHIP is not set |
683 | CONFIG_WATCHDOG=y | ||
684 | # CONFIG_WATCHDOG_NOWAYOUT is not set | ||
685 | |||
686 | # | ||
687 | # Watchdog Device Drivers | ||
688 | # | ||
689 | # CONFIG_SOFT_WATCHDOG is not set | ||
690 | |||
691 | # | ||
692 | # PCI-based Watchdog Cards | ||
693 | # | ||
694 | # CONFIG_PCIPCWATCHDOG is not set | ||
695 | # CONFIG_WDTPCI is not set | ||
696 | |||
697 | # | ||
698 | # Sonics Silicon Backplane | ||
699 | # | ||
700 | CONFIG_SSB_POSSIBLE=y | ||
701 | # CONFIG_SSB is not set | ||
697 | 702 | ||
698 | # | 703 | # |
699 | # Multifunction device drivers | 704 | # Multifunction device drivers |
@@ -713,11 +718,11 @@ CONFIG_VIDEO_HELPER_CHIPS_AUTO=y | |||
713 | # CONFIG_VIDEO_VIVI is not set | 718 | # CONFIG_VIDEO_VIVI is not set |
714 | # CONFIG_VIDEO_SAA5246A is not set | 719 | # CONFIG_VIDEO_SAA5246A is not set |
715 | # CONFIG_VIDEO_SAA5249 is not set | 720 | # CONFIG_VIDEO_SAA5249 is not set |
716 | # CONFIG_TUNER_TEA5761 is not set | ||
717 | # CONFIG_VIDEO_SAA7134 is not set | 721 | # CONFIG_VIDEO_SAA7134 is not set |
718 | # CONFIG_VIDEO_HEXIUM_ORION is not set | 722 | # CONFIG_VIDEO_HEXIUM_ORION is not set |
719 | # CONFIG_VIDEO_HEXIUM_GEMINI is not set | 723 | # CONFIG_VIDEO_HEXIUM_GEMINI is not set |
720 | # CONFIG_VIDEO_CX88 is not set | 724 | # CONFIG_VIDEO_CX88 is not set |
725 | # CONFIG_VIDEO_CX23885 is not set | ||
721 | # CONFIG_VIDEO_CAFE_CCIC is not set | 726 | # CONFIG_VIDEO_CAFE_CCIC is not set |
722 | # CONFIG_RADIO_ADAPTERS is not set | 727 | # CONFIG_RADIO_ADAPTERS is not set |
723 | CONFIG_DVB_CORE=y | 728 | CONFIG_DVB_CORE=y |
@@ -796,6 +801,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
796 | # CONFIG_DVB_OR51132 is not set | 801 | # CONFIG_DVB_OR51132 is not set |
797 | # CONFIG_DVB_BCM3510 is not set | 802 | # CONFIG_DVB_BCM3510 is not set |
798 | # CONFIG_DVB_LGDT330X is not set | 803 | # CONFIG_DVB_LGDT330X is not set |
804 | # CONFIG_DVB_S5H1409 is not set | ||
799 | 805 | ||
800 | # | 806 | # |
801 | # Tuners/PLL support | 807 | # Tuners/PLL support |
@@ -805,6 +811,9 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
805 | # CONFIG_DVB_TDA827X is not set | 811 | # CONFIG_DVB_TDA827X is not set |
806 | # CONFIG_DVB_TUNER_QT1010 is not set | 812 | # CONFIG_DVB_TUNER_QT1010 is not set |
807 | # CONFIG_DVB_TUNER_MT2060 is not set | 813 | # CONFIG_DVB_TUNER_MT2060 is not set |
814 | # CONFIG_DVB_TUNER_MT2266 is not set | ||
815 | # CONFIG_DVB_TUNER_MT2131 is not set | ||
816 | # CONFIG_DVB_TUNER_DIB0070 is not set | ||
808 | 817 | ||
809 | # | 818 | # |
810 | # Miscellaneous devices | 819 | # Miscellaneous devices |
@@ -817,12 +826,7 @@ CONFIG_DAB=y | |||
817 | # | 826 | # |
818 | # Graphics support | 827 | # Graphics support |
819 | # | 828 | # |
820 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 829 | # CONFIG_DRM is not set |
821 | |||
822 | # | ||
823 | # Display device support | ||
824 | # | ||
825 | # CONFIG_DISPLAY_SUPPORT is not set | ||
826 | # CONFIG_VGASTATE is not set | 830 | # CONFIG_VGASTATE is not set |
827 | CONFIG_VIDEO_OUTPUT_CONTROL=y | 831 | CONFIG_VIDEO_OUTPUT_CONTROL=y |
828 | CONFIG_FB=y | 832 | CONFIG_FB=y |
@@ -831,6 +835,7 @@ CONFIG_FIRMWARE_EDID=y | |||
831 | CONFIG_FB_CFB_FILLRECT=y | 835 | CONFIG_FB_CFB_FILLRECT=y |
832 | CONFIG_FB_CFB_COPYAREA=y | 836 | CONFIG_FB_CFB_COPYAREA=y |
833 | CONFIG_FB_CFB_IMAGEBLIT=y | 837 | CONFIG_FB_CFB_IMAGEBLIT=y |
838 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set | ||
834 | # CONFIG_FB_SYS_FILLRECT is not set | 839 | # CONFIG_FB_SYS_FILLRECT is not set |
835 | # CONFIG_FB_SYS_COPYAREA is not set | 840 | # CONFIG_FB_SYS_COPYAREA is not set |
836 | # CONFIG_FB_SYS_IMAGEBLIT is not set | 841 | # CONFIG_FB_SYS_IMAGEBLIT is not set |
@@ -869,6 +874,12 @@ CONFIG_FB_KYRO=y | |||
869 | # CONFIG_FB_ARK is not set | 874 | # CONFIG_FB_ARK is not set |
870 | # CONFIG_FB_PM3 is not set | 875 | # CONFIG_FB_PM3 is not set |
871 | # CONFIG_FB_VIRTUAL is not set | 876 | # CONFIG_FB_VIRTUAL is not set |
877 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
878 | |||
879 | # | ||
880 | # Display device support | ||
881 | # | ||
882 | # CONFIG_DISPLAY_SUPPORT is not set | ||
872 | 883 | ||
873 | # | 884 | # |
874 | # Console display driver support | 885 | # Console display driver support |
@@ -903,6 +914,7 @@ CONFIG_LOGO_SUPERH_CLUT224=y | |||
903 | CONFIG_HID_SUPPORT=y | 914 | CONFIG_HID_SUPPORT=y |
904 | CONFIG_HID=y | 915 | CONFIG_HID=y |
905 | # CONFIG_HID_DEBUG is not set | 916 | # CONFIG_HID_DEBUG is not set |
917 | # CONFIG_HIDRAW is not set | ||
906 | CONFIG_USB_SUPPORT=y | 918 | CONFIG_USB_SUPPORT=y |
907 | CONFIG_USB_ARCH_HAS_HCD=y | 919 | CONFIG_USB_ARCH_HAS_HCD=y |
908 | CONFIG_USB_ARCH_HAS_OHCI=y | 920 | CONFIG_USB_ARCH_HAS_OHCI=y |
@@ -923,19 +935,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
923 | # CONFIG_RTC_CLASS is not set | 935 | # CONFIG_RTC_CLASS is not set |
924 | 936 | ||
925 | # | 937 | # |
926 | # DMA Engine support | ||
927 | # | ||
928 | # CONFIG_DMA_ENGINE is not set | ||
929 | |||
930 | # | ||
931 | # DMA Clients | ||
932 | # | ||
933 | |||
934 | # | ||
935 | # DMA Devices | ||
936 | # | ||
937 | |||
938 | # | ||
939 | # Userspace I/O | 938 | # Userspace I/O |
940 | # | 939 | # |
941 | # CONFIG_UIO is not set | 940 | # CONFIG_UIO is not set |
@@ -994,7 +993,6 @@ CONFIG_TMPFS=y | |||
994 | # CONFIG_TMPFS_POSIX_ACL is not set | 993 | # CONFIG_TMPFS_POSIX_ACL is not set |
995 | CONFIG_HUGETLBFS=y | 994 | CONFIG_HUGETLBFS=y |
996 | CONFIG_HUGETLB_PAGE=y | 995 | CONFIG_HUGETLB_PAGE=y |
997 | CONFIG_RAMFS=y | ||
998 | # CONFIG_CONFIGFS_FS is not set | 996 | # CONFIG_CONFIGFS_FS is not set |
999 | 997 | ||
1000 | # | 998 | # |
@@ -1013,10 +1011,7 @@ CONFIG_RAMFS=y | |||
1013 | # CONFIG_QNX4FS_FS is not set | 1011 | # CONFIG_QNX4FS_FS is not set |
1014 | # CONFIG_SYSV_FS is not set | 1012 | # CONFIG_SYSV_FS is not set |
1015 | # CONFIG_UFS_FS is not set | 1013 | # CONFIG_UFS_FS is not set |
1016 | 1014 | CONFIG_NETWORK_FILESYSTEMS=y | |
1017 | # | ||
1018 | # Network File Systems | ||
1019 | # | ||
1020 | CONFIG_NFS_FS=y | 1015 | CONFIG_NFS_FS=y |
1021 | CONFIG_NFS_V3=y | 1016 | CONFIG_NFS_V3=y |
1022 | # CONFIG_NFS_V3_ACL is not set | 1017 | # CONFIG_NFS_V3_ACL is not set |
@@ -1058,26 +1053,17 @@ CONFIG_MSDOS_PARTITION=y | |||
1058 | # CONFIG_KARMA_PARTITION is not set | 1053 | # CONFIG_KARMA_PARTITION is not set |
1059 | # CONFIG_EFI_PARTITION is not set | 1054 | # CONFIG_EFI_PARTITION is not set |
1060 | # CONFIG_SYSV68_PARTITION is not set | 1055 | # CONFIG_SYSV68_PARTITION is not set |
1061 | |||
1062 | # | ||
1063 | # Native Language Support | ||
1064 | # | ||
1065 | # CONFIG_NLS is not set | 1056 | # CONFIG_NLS is not set |
1066 | |||
1067 | # | ||
1068 | # Distributed Lock Manager | ||
1069 | # | ||
1070 | # CONFIG_DLM is not set | 1057 | # CONFIG_DLM is not set |
1071 | 1058 | CONFIG_INSTRUMENTATION=y | |
1072 | # | ||
1073 | # Profiling support | ||
1074 | # | ||
1075 | # CONFIG_PROFILING is not set | 1059 | # CONFIG_PROFILING is not set |
1060 | # CONFIG_MARKERS is not set | ||
1076 | 1061 | ||
1077 | # | 1062 | # |
1078 | # Kernel hacking | 1063 | # Kernel hacking |
1079 | # | 1064 | # |
1080 | # CONFIG_PRINTK_TIME is not set | 1065 | # CONFIG_PRINTK_TIME is not set |
1066 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
1081 | CONFIG_ENABLE_MUST_CHECK=y | 1067 | CONFIG_ENABLE_MUST_CHECK=y |
1082 | CONFIG_MAGIC_SYSRQ=y | 1068 | CONFIG_MAGIC_SYSRQ=y |
1083 | # CONFIG_UNUSED_SYMBOLS is not set | 1069 | # CONFIG_UNUSED_SYMBOLS is not set |
@@ -1101,10 +1087,13 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
1101 | # CONFIG_DEBUG_INFO is not set | 1087 | # CONFIG_DEBUG_INFO is not set |
1102 | # CONFIG_DEBUG_VM is not set | 1088 | # CONFIG_DEBUG_VM is not set |
1103 | # CONFIG_DEBUG_LIST is not set | 1089 | # CONFIG_DEBUG_LIST is not set |
1090 | # CONFIG_DEBUG_SG is not set | ||
1104 | CONFIG_FRAME_POINTER=y | 1091 | CONFIG_FRAME_POINTER=y |
1105 | CONFIG_FORCED_INLINING=y | 1092 | CONFIG_FORCED_INLINING=y |
1093 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
1106 | # CONFIG_RCU_TORTURE_TEST is not set | 1094 | # CONFIG_RCU_TORTURE_TEST is not set |
1107 | # CONFIG_FAULT_INJECTION is not set | 1095 | # CONFIG_FAULT_INJECTION is not set |
1096 | # CONFIG_SAMPLES is not set | ||
1108 | # CONFIG_EARLY_PRINTK is not set | 1097 | # CONFIG_EARLY_PRINTK is not set |
1109 | CONFIG_SH64_PROC_TLB=y | 1098 | CONFIG_SH64_PROC_TLB=y |
1110 | CONFIG_SH64_PROC_ASIDS=y | 1099 | CONFIG_SH64_PROC_ASIDS=y |
@@ -1118,6 +1107,7 @@ CONFIG_SH64_SR_WATCH=y | |||
1118 | # | 1107 | # |
1119 | # CONFIG_KEYS is not set | 1108 | # CONFIG_KEYS is not set |
1120 | # CONFIG_SECURITY is not set | 1109 | # CONFIG_SECURITY is not set |
1110 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
1121 | # CONFIG_CRYPTO is not set | 1111 | # CONFIG_CRYPTO is not set |
1122 | 1112 | ||
1123 | # | 1113 | # |
diff --git a/arch/sh64/configs/harp_defconfig b/arch/sh64/configs/harp_defconfig index e4b84b51baf8..ba302cd0c285 100644 --- a/arch/sh64/configs/harp_defconfig +++ b/arch/sh64/configs/harp_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.23-rc8 | 3 | # Linux kernel version: 2.6.24-rc1 |
4 | # Mon Oct 1 18:01:38 2007 | 4 | # Fri Nov 2 14:35:57 2007 |
5 | # | 5 | # |
6 | CONFIG_SUPERH=y | 6 | CONFIG_SUPERH=y |
7 | CONFIG_SUPERH64=y | 7 | CONFIG_SUPERH64=y |
@@ -36,6 +36,10 @@ CONFIG_POSIX_MQUEUE=y | |||
36 | # CONFIG_AUDIT is not set | 36 | # CONFIG_AUDIT is not set |
37 | # CONFIG_IKCONFIG is not set | 37 | # CONFIG_IKCONFIG is not set |
38 | CONFIG_LOG_BUF_SHIFT=14 | 38 | CONFIG_LOG_BUF_SHIFT=14 |
39 | # CONFIG_CGROUPS is not set | ||
40 | CONFIG_FAIR_GROUP_SCHED=y | ||
41 | CONFIG_FAIR_USER_SCHED=y | ||
42 | # CONFIG_FAIR_CGROUP_SCHED is not set | ||
39 | CONFIG_SYSFS_DEPRECATED=y | 43 | CONFIG_SYSFS_DEPRECATED=y |
40 | # CONFIG_RELAY is not set | 44 | # CONFIG_RELAY is not set |
41 | # CONFIG_BLK_DEV_INITRD is not set | 45 | # CONFIG_BLK_DEV_INITRD is not set |
@@ -141,6 +145,7 @@ CONFIG_FLATMEM_MANUAL=y | |||
141 | CONFIG_FLATMEM=y | 145 | CONFIG_FLATMEM=y |
142 | CONFIG_FLAT_NODE_MEM_MAP=y | 146 | CONFIG_FLAT_NODE_MEM_MAP=y |
143 | # CONFIG_SPARSEMEM_STATIC is not set | 147 | # CONFIG_SPARSEMEM_STATIC is not set |
148 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
144 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 149 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
145 | # CONFIG_RESOURCES_64BIT is not set | 150 | # CONFIG_RESOURCES_64BIT is not set |
146 | CONFIG_ZONE_DMA_FLAG=0 | 151 | CONFIG_ZONE_DMA_FLAG=0 |
@@ -150,10 +155,6 @@ CONFIG_NR_QUICK=1 | |||
150 | # Bus options (PCI, PCMCIA, EISA, MCA, ISA) | 155 | # Bus options (PCI, PCMCIA, EISA, MCA, ISA) |
151 | # | 156 | # |
152 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 157 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
153 | |||
154 | # | ||
155 | # PCCARD (PCMCIA/CardBus) support | ||
156 | # | ||
157 | # CONFIG_PCCARD is not set | 158 | # CONFIG_PCCARD is not set |
158 | 159 | ||
159 | # | 160 | # |
@@ -198,6 +199,7 @@ CONFIG_IP_PNP=y | |||
198 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | 199 | CONFIG_INET_XFRM_MODE_TRANSPORT=y |
199 | CONFIG_INET_XFRM_MODE_TUNNEL=y | 200 | CONFIG_INET_XFRM_MODE_TUNNEL=y |
200 | CONFIG_INET_XFRM_MODE_BEET=y | 201 | CONFIG_INET_XFRM_MODE_BEET=y |
202 | # CONFIG_INET_LRO is not set | ||
201 | CONFIG_INET_DIAG=y | 203 | CONFIG_INET_DIAG=y |
202 | CONFIG_INET_TCP_DIAG=y | 204 | CONFIG_INET_TCP_DIAG=y |
203 | # CONFIG_TCP_CONG_ADVANCED is not set | 205 | # CONFIG_TCP_CONG_ADVANCED is not set |
@@ -223,10 +225,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
223 | # CONFIG_LAPB is not set | 225 | # CONFIG_LAPB is not set |
224 | # CONFIG_ECONET is not set | 226 | # CONFIG_ECONET is not set |
225 | # CONFIG_WAN_ROUTER is not set | 227 | # CONFIG_WAN_ROUTER is not set |
226 | |||
227 | # | ||
228 | # QoS and/or fair queueing | ||
229 | # | ||
230 | # CONFIG_NET_SCHED is not set | 228 | # CONFIG_NET_SCHED is not set |
231 | 229 | ||
232 | # | 230 | # |
@@ -255,6 +253,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
255 | # | 253 | # |
256 | # Generic Driver Options | 254 | # Generic Driver Options |
257 | # | 255 | # |
256 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
258 | CONFIG_STANDALONE=y | 257 | CONFIG_STANDALONE=y |
259 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 258 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
260 | # CONFIG_FW_LOADER is not set | 259 | # CONFIG_FW_LOADER is not set |
@@ -314,6 +313,7 @@ CONFIG_SCSI_SPI_ATTRS=y | |||
314 | # CONFIG_SCSI_FC_ATTRS is not set | 313 | # CONFIG_SCSI_FC_ATTRS is not set |
315 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 314 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
316 | # CONFIG_SCSI_SAS_LIBSAS is not set | 315 | # CONFIG_SCSI_SAS_LIBSAS is not set |
316 | # CONFIG_SCSI_SRP_ATTRS is not set | ||
317 | CONFIG_SCSI_LOWLEVEL=y | 317 | CONFIG_SCSI_LOWLEVEL=y |
318 | # CONFIG_ISCSI_TCP is not set | 318 | # CONFIG_ISCSI_TCP is not set |
319 | # CONFIG_SCSI_DEBUG is not set | 319 | # CONFIG_SCSI_DEBUG is not set |
@@ -326,11 +326,18 @@ CONFIG_NETDEVICES=y | |||
326 | # CONFIG_MACVLAN is not set | 326 | # CONFIG_MACVLAN is not set |
327 | # CONFIG_EQUALIZER is not set | 327 | # CONFIG_EQUALIZER is not set |
328 | # CONFIG_TUN is not set | 328 | # CONFIG_TUN is not set |
329 | # CONFIG_VETH is not set | ||
329 | # CONFIG_PHYLIB is not set | 330 | # CONFIG_PHYLIB is not set |
330 | CONFIG_NET_ETHERNET=y | 331 | CONFIG_NET_ETHERNET=y |
331 | # CONFIG_MII is not set | 332 | # CONFIG_MII is not set |
332 | # CONFIG_STNIC is not set | 333 | # CONFIG_STNIC is not set |
333 | # CONFIG_SMC91X is not set | 334 | # CONFIG_SMC91X is not set |
335 | # CONFIG_SMC911X is not set | ||
336 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
337 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
338 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
339 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
340 | # CONFIG_B44 is not set | ||
334 | CONFIG_NETDEV_1000=y | 341 | CONFIG_NETDEV_1000=y |
335 | CONFIG_NETDEV_10000=y | 342 | CONFIG_NETDEV_10000=y |
336 | 343 | ||
@@ -364,7 +371,6 @@ CONFIG_INPUT_MOUSEDEV=y | |||
364 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | 371 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 |
365 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | 372 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 |
366 | # CONFIG_INPUT_JOYDEV is not set | 373 | # CONFIG_INPUT_JOYDEV is not set |
367 | # CONFIG_INPUT_TSDEV is not set | ||
368 | # CONFIG_INPUT_EVDEV is not set | 374 | # CONFIG_INPUT_EVDEV is not set |
369 | # CONFIG_INPUT_EVBUG is not set | 375 | # CONFIG_INPUT_EVBUG is not set |
370 | 376 | ||
@@ -410,13 +416,6 @@ CONFIG_UNIX98_PTYS=y | |||
410 | CONFIG_LEGACY_PTYS=y | 416 | CONFIG_LEGACY_PTYS=y |
411 | CONFIG_LEGACY_PTY_COUNT=256 | 417 | CONFIG_LEGACY_PTY_COUNT=256 |
412 | # CONFIG_IPMI_HANDLER is not set | 418 | # CONFIG_IPMI_HANDLER is not set |
413 | CONFIG_WATCHDOG=y | ||
414 | # CONFIG_WATCHDOG_NOWAYOUT is not set | ||
415 | |||
416 | # | ||
417 | # Watchdog Device Drivers | ||
418 | # | ||
419 | # CONFIG_SOFT_WATCHDOG is not set | ||
420 | CONFIG_HW_RANDOM=y | 419 | CONFIG_HW_RANDOM=y |
421 | # CONFIG_R3964 is not set | 420 | # CONFIG_R3964 is not set |
422 | # CONFIG_RAW_DRIVER is not set | 421 | # CONFIG_RAW_DRIVER is not set |
@@ -432,9 +431,8 @@ CONFIG_HW_RANDOM=y | |||
432 | # CONFIG_POWER_SUPPLY is not set | 431 | # CONFIG_POWER_SUPPLY is not set |
433 | CONFIG_HWMON=y | 432 | CONFIG_HWMON=y |
434 | # CONFIG_HWMON_VID is not set | 433 | # CONFIG_HWMON_VID is not set |
435 | # CONFIG_SENSORS_ABITUGURU is not set | ||
436 | # CONFIG_SENSORS_ABITUGURU3 is not set | ||
437 | # CONFIG_SENSORS_F71805F is not set | 434 | # CONFIG_SENSORS_F71805F is not set |
435 | # CONFIG_SENSORS_F71882FG is not set | ||
438 | # CONFIG_SENSORS_IT87 is not set | 436 | # CONFIG_SENSORS_IT87 is not set |
439 | # CONFIG_SENSORS_PC87360 is not set | 437 | # CONFIG_SENSORS_PC87360 is not set |
440 | # CONFIG_SENSORS_PC87427 is not set | 438 | # CONFIG_SENSORS_PC87427 is not set |
@@ -444,6 +442,19 @@ CONFIG_HWMON=y | |||
444 | # CONFIG_SENSORS_W83627HF is not set | 442 | # CONFIG_SENSORS_W83627HF is not set |
445 | # CONFIG_SENSORS_W83627EHF is not set | 443 | # CONFIG_SENSORS_W83627EHF is not set |
446 | # CONFIG_HWMON_DEBUG_CHIP is not set | 444 | # CONFIG_HWMON_DEBUG_CHIP is not set |
445 | CONFIG_WATCHDOG=y | ||
446 | # CONFIG_WATCHDOG_NOWAYOUT is not set | ||
447 | |||
448 | # | ||
449 | # Watchdog Device Drivers | ||
450 | # | ||
451 | # CONFIG_SOFT_WATCHDOG is not set | ||
452 | |||
453 | # | ||
454 | # Sonics Silicon Backplane | ||
455 | # | ||
456 | CONFIG_SSB_POSSIBLE=y | ||
457 | # CONFIG_SSB is not set | ||
447 | 458 | ||
448 | # | 459 | # |
449 | # Multifunction device drivers | 460 | # Multifunction device drivers |
@@ -460,12 +471,6 @@ CONFIG_DAB=y | |||
460 | # | 471 | # |
461 | # Graphics support | 472 | # Graphics support |
462 | # | 473 | # |
463 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
464 | |||
465 | # | ||
466 | # Display device support | ||
467 | # | ||
468 | # CONFIG_DISPLAY_SUPPORT is not set | ||
469 | # CONFIG_VGASTATE is not set | 474 | # CONFIG_VGASTATE is not set |
470 | CONFIG_VIDEO_OUTPUT_CONTROL=y | 475 | CONFIG_VIDEO_OUTPUT_CONTROL=y |
471 | CONFIG_FB=y | 476 | CONFIG_FB=y |
@@ -474,6 +479,7 @@ CONFIG_FIRMWARE_EDID=y | |||
474 | # CONFIG_FB_CFB_FILLRECT is not set | 479 | # CONFIG_FB_CFB_FILLRECT is not set |
475 | # CONFIG_FB_CFB_COPYAREA is not set | 480 | # CONFIG_FB_CFB_COPYAREA is not set |
476 | # CONFIG_FB_CFB_IMAGEBLIT is not set | 481 | # CONFIG_FB_CFB_IMAGEBLIT is not set |
482 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set | ||
477 | # CONFIG_FB_SYS_FILLRECT is not set | 483 | # CONFIG_FB_SYS_FILLRECT is not set |
478 | # CONFIG_FB_SYS_COPYAREA is not set | 484 | # CONFIG_FB_SYS_COPYAREA is not set |
479 | # CONFIG_FB_SYS_IMAGEBLIT is not set | 485 | # CONFIG_FB_SYS_IMAGEBLIT is not set |
@@ -490,6 +496,12 @@ CONFIG_FB_MODE_HELPERS=y | |||
490 | # | 496 | # |
491 | # CONFIG_FB_S1D13XXX is not set | 497 | # CONFIG_FB_S1D13XXX is not set |
492 | # CONFIG_FB_VIRTUAL is not set | 498 | # CONFIG_FB_VIRTUAL is not set |
499 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
500 | |||
501 | # | ||
502 | # Display device support | ||
503 | # | ||
504 | # CONFIG_DISPLAY_SUPPORT is not set | ||
493 | 505 | ||
494 | # | 506 | # |
495 | # Console display driver support | 507 | # Console display driver support |
@@ -524,6 +536,7 @@ CONFIG_LOGO_SUPERH_CLUT224=y | |||
524 | CONFIG_HID_SUPPORT=y | 536 | CONFIG_HID_SUPPORT=y |
525 | CONFIG_HID=y | 537 | CONFIG_HID=y |
526 | # CONFIG_HID_DEBUG is not set | 538 | # CONFIG_HID_DEBUG is not set |
539 | # CONFIG_HIDRAW is not set | ||
527 | CONFIG_USB_SUPPORT=y | 540 | CONFIG_USB_SUPPORT=y |
528 | CONFIG_USB_ARCH_HAS_HCD=y | 541 | CONFIG_USB_ARCH_HAS_HCD=y |
529 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 542 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
@@ -543,19 +556,6 @@ CONFIG_USB_ARCH_HAS_HCD=y | |||
543 | # CONFIG_RTC_CLASS is not set | 556 | # CONFIG_RTC_CLASS is not set |
544 | 557 | ||
545 | # | 558 | # |
546 | # DMA Engine support | ||
547 | # | ||
548 | # CONFIG_DMA_ENGINE is not set | ||
549 | |||
550 | # | ||
551 | # DMA Clients | ||
552 | # | ||
553 | |||
554 | # | ||
555 | # DMA Devices | ||
556 | # | ||
557 | |||
558 | # | ||
559 | # Userspace I/O | 559 | # Userspace I/O |
560 | # | 560 | # |
561 | # CONFIG_UIO is not set | 561 | # CONFIG_UIO is not set |
@@ -614,7 +614,6 @@ CONFIG_TMPFS=y | |||
614 | # CONFIG_TMPFS_POSIX_ACL is not set | 614 | # CONFIG_TMPFS_POSIX_ACL is not set |
615 | CONFIG_HUGETLBFS=y | 615 | CONFIG_HUGETLBFS=y |
616 | CONFIG_HUGETLB_PAGE=y | 616 | CONFIG_HUGETLB_PAGE=y |
617 | CONFIG_RAMFS=y | ||
618 | # CONFIG_CONFIGFS_FS is not set | 617 | # CONFIG_CONFIGFS_FS is not set |
619 | 618 | ||
620 | # | 619 | # |
@@ -633,10 +632,7 @@ CONFIG_RAMFS=y | |||
633 | # CONFIG_QNX4FS_FS is not set | 632 | # CONFIG_QNX4FS_FS is not set |
634 | # CONFIG_SYSV_FS is not set | 633 | # CONFIG_SYSV_FS is not set |
635 | # CONFIG_UFS_FS is not set | 634 | # CONFIG_UFS_FS is not set |
636 | 635 | CONFIG_NETWORK_FILESYSTEMS=y | |
637 | # | ||
638 | # Network File Systems | ||
639 | # | ||
640 | CONFIG_NFS_FS=y | 636 | CONFIG_NFS_FS=y |
641 | CONFIG_NFS_V3=y | 637 | CONFIG_NFS_V3=y |
642 | # CONFIG_NFS_V3_ACL is not set | 638 | # CONFIG_NFS_V3_ACL is not set |
@@ -678,26 +674,17 @@ CONFIG_MSDOS_PARTITION=y | |||
678 | # CONFIG_KARMA_PARTITION is not set | 674 | # CONFIG_KARMA_PARTITION is not set |
679 | # CONFIG_EFI_PARTITION is not set | 675 | # CONFIG_EFI_PARTITION is not set |
680 | # CONFIG_SYSV68_PARTITION is not set | 676 | # CONFIG_SYSV68_PARTITION is not set |
681 | |||
682 | # | ||
683 | # Native Language Support | ||
684 | # | ||
685 | # CONFIG_NLS is not set | 677 | # CONFIG_NLS is not set |
686 | |||
687 | # | ||
688 | # Distributed Lock Manager | ||
689 | # | ||
690 | # CONFIG_DLM is not set | 678 | # CONFIG_DLM is not set |
691 | 679 | CONFIG_INSTRUMENTATION=y | |
692 | # | ||
693 | # Profiling support | ||
694 | # | ||
695 | # CONFIG_PROFILING is not set | 680 | # CONFIG_PROFILING is not set |
681 | # CONFIG_MARKERS is not set | ||
696 | 682 | ||
697 | # | 683 | # |
698 | # Kernel hacking | 684 | # Kernel hacking |
699 | # | 685 | # |
700 | # CONFIG_PRINTK_TIME is not set | 686 | # CONFIG_PRINTK_TIME is not set |
687 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
701 | CONFIG_ENABLE_MUST_CHECK=y | 688 | CONFIG_ENABLE_MUST_CHECK=y |
702 | CONFIG_MAGIC_SYSRQ=y | 689 | CONFIG_MAGIC_SYSRQ=y |
703 | # CONFIG_UNUSED_SYMBOLS is not set | 690 | # CONFIG_UNUSED_SYMBOLS is not set |
@@ -721,16 +708,17 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
721 | # CONFIG_DEBUG_INFO is not set | 708 | # CONFIG_DEBUG_INFO is not set |
722 | # CONFIG_DEBUG_VM is not set | 709 | # CONFIG_DEBUG_VM is not set |
723 | # CONFIG_DEBUG_LIST is not set | 710 | # CONFIG_DEBUG_LIST is not set |
711 | # CONFIG_DEBUG_SG is not set | ||
724 | CONFIG_FRAME_POINTER=y | 712 | CONFIG_FRAME_POINTER=y |
725 | CONFIG_FORCED_INLINING=y | 713 | CONFIG_FORCED_INLINING=y |
714 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
726 | # CONFIG_FAULT_INJECTION is not set | 715 | # CONFIG_FAULT_INJECTION is not set |
716 | # CONFIG_SAMPLES is not set | ||
727 | # CONFIG_EARLY_PRINTK is not set | 717 | # CONFIG_EARLY_PRINTK is not set |
728 | # CONFIG_DEBUG_KERNEL_WITH_GDB_STUB is not set | ||
729 | CONFIG_SH64_PROC_TLB=y | 718 | CONFIG_SH64_PROC_TLB=y |
730 | CONFIG_SH64_PROC_ASIDS=y | 719 | CONFIG_SH64_PROC_ASIDS=y |
731 | CONFIG_SH64_SR_WATCH=y | 720 | CONFIG_SH64_SR_WATCH=y |
732 | # CONFIG_POOR_MANS_STRACE is not set | 721 | # CONFIG_POOR_MANS_STRACE is not set |
733 | # CONFIG_SH_ALPHANUMERIC is not set | ||
734 | # CONFIG_SH_NO_BSS_INIT is not set | 722 | # CONFIG_SH_NO_BSS_INIT is not set |
735 | 723 | ||
736 | # | 724 | # |
@@ -738,6 +726,7 @@ CONFIG_SH64_SR_WATCH=y | |||
738 | # | 726 | # |
739 | # CONFIG_KEYS is not set | 727 | # CONFIG_KEYS is not set |
740 | # CONFIG_SECURITY is not set | 728 | # CONFIG_SECURITY is not set |
729 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
741 | # CONFIG_CRYPTO is not set | 730 | # CONFIG_CRYPTO is not set |
742 | 731 | ||
743 | # | 732 | # |
diff --git a/arch/sh64/configs/sim_defconfig b/arch/sh64/configs/sim_defconfig index f83bae659dc3..18476cc522c3 100644 --- a/arch/sh64/configs/sim_defconfig +++ b/arch/sh64/configs/sim_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.23-rc8 | 3 | # Linux kernel version: 2.6.24-rc1 |
4 | # Mon Oct 1 17:50:35 2007 | 4 | # Fri Nov 2 14:36:08 2007 |
5 | # | 5 | # |
6 | CONFIG_SUPERH=y | 6 | CONFIG_SUPERH=y |
7 | CONFIG_SUPERH64=y | 7 | CONFIG_SUPERH64=y |
@@ -33,6 +33,10 @@ CONFIG_SWAP=y | |||
33 | # CONFIG_USER_NS is not set | 33 | # CONFIG_USER_NS is not set |
34 | # CONFIG_IKCONFIG is not set | 34 | # CONFIG_IKCONFIG is not set |
35 | CONFIG_LOG_BUF_SHIFT=14 | 35 | CONFIG_LOG_BUF_SHIFT=14 |
36 | # CONFIG_CGROUPS is not set | ||
37 | CONFIG_FAIR_GROUP_SCHED=y | ||
38 | CONFIG_FAIR_USER_SCHED=y | ||
39 | # CONFIG_FAIR_CGROUP_SCHED is not set | ||
36 | CONFIG_SYSFS_DEPRECATED=y | 40 | CONFIG_SYSFS_DEPRECATED=y |
37 | # CONFIG_RELAY is not set | 41 | # CONFIG_RELAY is not set |
38 | # CONFIG_BLK_DEV_INITRD is not set | 42 | # CONFIG_BLK_DEV_INITRD is not set |
@@ -138,6 +142,7 @@ CONFIG_FLATMEM_MANUAL=y | |||
138 | CONFIG_FLATMEM=y | 142 | CONFIG_FLATMEM=y |
139 | CONFIG_FLAT_NODE_MEM_MAP=y | 143 | CONFIG_FLAT_NODE_MEM_MAP=y |
140 | # CONFIG_SPARSEMEM_STATIC is not set | 144 | # CONFIG_SPARSEMEM_STATIC is not set |
145 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
141 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 146 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
142 | # CONFIG_RESOURCES_64BIT is not set | 147 | # CONFIG_RESOURCES_64BIT is not set |
143 | CONFIG_ZONE_DMA_FLAG=0 | 148 | CONFIG_ZONE_DMA_FLAG=0 |
@@ -147,10 +152,6 @@ CONFIG_NR_QUICK=1 | |||
147 | # Bus options (PCI, PCMCIA, EISA, MCA, ISA) | 152 | # Bus options (PCI, PCMCIA, EISA, MCA, ISA) |
148 | # | 153 | # |
149 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 154 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
150 | |||
151 | # | ||
152 | # PCCARD (PCMCIA/CardBus) support | ||
153 | # | ||
154 | # CONFIG_PCCARD is not set | 155 | # CONFIG_PCCARD is not set |
155 | 156 | ||
156 | # | 157 | # |
@@ -171,6 +172,7 @@ CONFIG_BINFMT_ELF=y | |||
171 | # | 172 | # |
172 | # Generic Driver Options | 173 | # Generic Driver Options |
173 | # | 174 | # |
175 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
174 | CONFIG_STANDALONE=y | 176 | CONFIG_STANDALONE=y |
175 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 177 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
176 | # CONFIG_FW_LOADER is not set | 178 | # CONFIG_FW_LOADER is not set |
@@ -217,6 +219,7 @@ CONFIG_SCSI_MULTI_LUN=y | |||
217 | CONFIG_SCSI_SPI_ATTRS=y | 219 | CONFIG_SCSI_SPI_ATTRS=y |
218 | # CONFIG_SCSI_FC_ATTRS is not set | 220 | # CONFIG_SCSI_FC_ATTRS is not set |
219 | # CONFIG_SCSI_SAS_LIBSAS is not set | 221 | # CONFIG_SCSI_SAS_LIBSAS is not set |
222 | # CONFIG_SCSI_SRP_ATTRS is not set | ||
220 | CONFIG_SCSI_LOWLEVEL=y | 223 | CONFIG_SCSI_LOWLEVEL=y |
221 | # CONFIG_SCSI_DEBUG is not set | 224 | # CONFIG_SCSI_DEBUG is not set |
222 | # CONFIG_ATA is not set | 225 | # CONFIG_ATA is not set |
@@ -238,7 +241,6 @@ CONFIG_INPUT_MOUSEDEV=y | |||
238 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | 241 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 |
239 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | 242 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 |
240 | # CONFIG_INPUT_JOYDEV is not set | 243 | # CONFIG_INPUT_JOYDEV is not set |
241 | # CONFIG_INPUT_TSDEV is not set | ||
242 | # CONFIG_INPUT_EVDEV is not set | 244 | # CONFIG_INPUT_EVDEV is not set |
243 | # CONFIG_INPUT_EVBUG is not set | 245 | # CONFIG_INPUT_EVBUG is not set |
244 | 246 | ||
@@ -283,7 +285,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
283 | CONFIG_UNIX98_PTYS=y | 285 | CONFIG_UNIX98_PTYS=y |
284 | # CONFIG_LEGACY_PTYS is not set | 286 | # CONFIG_LEGACY_PTYS is not set |
285 | # CONFIG_IPMI_HANDLER is not set | 287 | # CONFIG_IPMI_HANDLER is not set |
286 | # CONFIG_WATCHDOG is not set | ||
287 | # CONFIG_HW_RANDOM is not set | 288 | # CONFIG_HW_RANDOM is not set |
288 | # CONFIG_R3964 is not set | 289 | # CONFIG_R3964 is not set |
289 | # CONFIG_RAW_DRIVER is not set | 290 | # CONFIG_RAW_DRIVER is not set |
@@ -298,6 +299,13 @@ CONFIG_UNIX98_PTYS=y | |||
298 | # CONFIG_W1 is not set | 299 | # CONFIG_W1 is not set |
299 | # CONFIG_POWER_SUPPLY is not set | 300 | # CONFIG_POWER_SUPPLY is not set |
300 | # CONFIG_HWMON is not set | 301 | # CONFIG_HWMON is not set |
302 | # CONFIG_WATCHDOG is not set | ||
303 | |||
304 | # | ||
305 | # Sonics Silicon Backplane | ||
306 | # | ||
307 | CONFIG_SSB_POSSIBLE=y | ||
308 | # CONFIG_SSB is not set | ||
301 | 309 | ||
302 | # | 310 | # |
303 | # Multifunction device drivers | 311 | # Multifunction device drivers |
@@ -313,12 +321,6 @@ CONFIG_DAB=y | |||
313 | # | 321 | # |
314 | # Graphics support | 322 | # Graphics support |
315 | # | 323 | # |
316 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
317 | |||
318 | # | ||
319 | # Display device support | ||
320 | # | ||
321 | # CONFIG_DISPLAY_SUPPORT is not set | ||
322 | # CONFIG_VGASTATE is not set | 324 | # CONFIG_VGASTATE is not set |
323 | CONFIG_VIDEO_OUTPUT_CONTROL=y | 325 | CONFIG_VIDEO_OUTPUT_CONTROL=y |
324 | CONFIG_FB=y | 326 | CONFIG_FB=y |
@@ -327,6 +329,7 @@ CONFIG_FIRMWARE_EDID=y | |||
327 | # CONFIG_FB_CFB_FILLRECT is not set | 329 | # CONFIG_FB_CFB_FILLRECT is not set |
328 | # CONFIG_FB_CFB_COPYAREA is not set | 330 | # CONFIG_FB_CFB_COPYAREA is not set |
329 | # CONFIG_FB_CFB_IMAGEBLIT is not set | 331 | # CONFIG_FB_CFB_IMAGEBLIT is not set |
332 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set | ||
330 | # CONFIG_FB_SYS_FILLRECT is not set | 333 | # CONFIG_FB_SYS_FILLRECT is not set |
331 | # CONFIG_FB_SYS_COPYAREA is not set | 334 | # CONFIG_FB_SYS_COPYAREA is not set |
332 | # CONFIG_FB_SYS_IMAGEBLIT is not set | 335 | # CONFIG_FB_SYS_IMAGEBLIT is not set |
@@ -343,6 +346,12 @@ CONFIG_FB_MODE_HELPERS=y | |||
343 | # | 346 | # |
344 | # CONFIG_FB_S1D13XXX is not set | 347 | # CONFIG_FB_S1D13XXX is not set |
345 | # CONFIG_FB_VIRTUAL is not set | 348 | # CONFIG_FB_VIRTUAL is not set |
349 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
350 | |||
351 | # | ||
352 | # Display device support | ||
353 | # | ||
354 | # CONFIG_DISPLAY_SUPPORT is not set | ||
346 | 355 | ||
347 | # | 356 | # |
348 | # Console display driver support | 357 | # Console display driver support |
@@ -381,19 +390,6 @@ CONFIG_LOGO_SUPERH_CLUT224=y | |||
381 | # CONFIG_RTC_CLASS is not set | 390 | # CONFIG_RTC_CLASS is not set |
382 | 391 | ||
383 | # | 392 | # |
384 | # DMA Engine support | ||
385 | # | ||
386 | # CONFIG_DMA_ENGINE is not set | ||
387 | |||
388 | # | ||
389 | # DMA Clients | ||
390 | # | ||
391 | |||
392 | # | ||
393 | # DMA Devices | ||
394 | # | ||
395 | |||
396 | # | ||
397 | # Userspace I/O | 393 | # Userspace I/O |
398 | # | 394 | # |
399 | # CONFIG_UIO is not set | 395 | # CONFIG_UIO is not set |
@@ -451,7 +447,6 @@ CONFIG_TMPFS=y | |||
451 | # CONFIG_TMPFS_POSIX_ACL is not set | 447 | # CONFIG_TMPFS_POSIX_ACL is not set |
452 | CONFIG_HUGETLBFS=y | 448 | CONFIG_HUGETLBFS=y |
453 | CONFIG_HUGETLB_PAGE=y | 449 | CONFIG_HUGETLB_PAGE=y |
454 | CONFIG_RAMFS=y | ||
455 | # CONFIG_CONFIGFS_FS is not set | 450 | # CONFIG_CONFIGFS_FS is not set |
456 | 451 | ||
457 | # | 452 | # |
@@ -492,22 +487,17 @@ CONFIG_MSDOS_PARTITION=y | |||
492 | # CONFIG_KARMA_PARTITION is not set | 487 | # CONFIG_KARMA_PARTITION is not set |
493 | # CONFIG_EFI_PARTITION is not set | 488 | # CONFIG_EFI_PARTITION is not set |
494 | # CONFIG_SYSV68_PARTITION is not set | 489 | # CONFIG_SYSV68_PARTITION is not set |
495 | |||
496 | # | ||
497 | # Native Language Support | ||
498 | # | ||
499 | # CONFIG_NLS is not set | 490 | # CONFIG_NLS is not set |
500 | 491 | CONFIG_INSTRUMENTATION=y | |
501 | # | ||
502 | # Profiling support | ||
503 | # | ||
504 | CONFIG_PROFILING=y | 492 | CONFIG_PROFILING=y |
505 | # CONFIG_OPROFILE is not set | 493 | # CONFIG_OPROFILE is not set |
494 | # CONFIG_MARKERS is not set | ||
506 | 495 | ||
507 | # | 496 | # |
508 | # Kernel hacking | 497 | # Kernel hacking |
509 | # | 498 | # |
510 | # CONFIG_PRINTK_TIME is not set | 499 | # CONFIG_PRINTK_TIME is not set |
500 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
511 | CONFIG_ENABLE_MUST_CHECK=y | 501 | CONFIG_ENABLE_MUST_CHECK=y |
512 | CONFIG_MAGIC_SYSRQ=y | 502 | CONFIG_MAGIC_SYSRQ=y |
513 | # CONFIG_UNUSED_SYMBOLS is not set | 503 | # CONFIG_UNUSED_SYMBOLS is not set |
@@ -531,16 +521,17 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
531 | # CONFIG_DEBUG_INFO is not set | 521 | # CONFIG_DEBUG_INFO is not set |
532 | # CONFIG_DEBUG_VM is not set | 522 | # CONFIG_DEBUG_VM is not set |
533 | # CONFIG_DEBUG_LIST is not set | 523 | # CONFIG_DEBUG_LIST is not set |
524 | # CONFIG_DEBUG_SG is not set | ||
534 | CONFIG_FRAME_POINTER=y | 525 | CONFIG_FRAME_POINTER=y |
535 | CONFIG_FORCED_INLINING=y | 526 | CONFIG_FORCED_INLINING=y |
527 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
536 | # CONFIG_FAULT_INJECTION is not set | 528 | # CONFIG_FAULT_INJECTION is not set |
529 | # CONFIG_SAMPLES is not set | ||
537 | # CONFIG_EARLY_PRINTK is not set | 530 | # CONFIG_EARLY_PRINTK is not set |
538 | # CONFIG_DEBUG_KERNEL_WITH_GDB_STUB is not set | ||
539 | CONFIG_SH64_PROC_TLB=y | 531 | CONFIG_SH64_PROC_TLB=y |
540 | CONFIG_SH64_PROC_ASIDS=y | 532 | CONFIG_SH64_PROC_ASIDS=y |
541 | CONFIG_SH64_SR_WATCH=y | 533 | CONFIG_SH64_SR_WATCH=y |
542 | # CONFIG_POOR_MANS_STRACE is not set | 534 | # CONFIG_POOR_MANS_STRACE is not set |
543 | # CONFIG_SH_ALPHANUMERIC is not set | ||
544 | CONFIG_SH_NO_BSS_INIT=y | 535 | CONFIG_SH_NO_BSS_INIT=y |
545 | 536 | ||
546 | # | 537 | # |
@@ -548,6 +539,7 @@ CONFIG_SH_NO_BSS_INIT=y | |||
548 | # | 539 | # |
549 | # CONFIG_KEYS is not set | 540 | # CONFIG_KEYS is not set |
550 | # CONFIG_SECURITY is not set | 541 | # CONFIG_SECURITY is not set |
542 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
551 | # CONFIG_CRYPTO is not set | 543 | # CONFIG_CRYPTO is not set |
552 | 544 | ||
553 | # | 545 | # |