diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-03-05 06:47:28 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-05 06:47:28 -0500 |
commit | 7df4edb07cf54a4868b9a750424c0d2aa68f8d66 (patch) | |
tree | 0ad0ad3f3dcb6f9edf26dde42ba625053dddf54f /arch/sh/Kconfig | |
parent | 0d688da5505d77bcef2441e0a22d8cc26459702d (diff) | |
parent | 559595a985e106d2fa9f0c79b7f5805453fed593 (diff) |
Merge branch 'linus' into core/iommu
Diffstat (limited to 'arch/sh/Kconfig')
-rw-r--r-- | arch/sh/Kconfig | 63 |
1 files changed, 11 insertions, 52 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index f32a5197128d..ebabe518e729 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig | |||
@@ -644,66 +644,25 @@ endmenu | |||
644 | 644 | ||
645 | menu "Bus options" | 645 | menu "Bus options" |
646 | 646 | ||
647 | # Even on SuperH devices which don't have an ISA bus, | ||
648 | # this variable helps the PCMCIA modules handle | ||
649 | # IRQ requesting properly -- Greg Banks. | ||
650 | # | ||
651 | # Though we're generally not interested in it when | ||
652 | # we're not using PCMCIA, so we make it dependent on | ||
653 | # PCMCIA outright. -- PFM. | ||
654 | config ISA | ||
655 | def_bool y | ||
656 | depends on PCMCIA && HD6446X_SERIES | ||
657 | help | ||
658 | Find out whether you have ISA slots on your motherboard. ISA is the | ||
659 | name of a bus system, i.e. the way the CPU talks to the other stuff | ||
660 | inside your box. Other bus systems are PCI, EISA, MicroChannel | ||
661 | (MCA) or VESA. ISA is an older system, now being displaced by PCI; | ||
662 | newer boards don't support it. If you have ISA, say Y, otherwise N. | ||
663 | |||
664 | config EISA | ||
665 | bool | ||
666 | ---help--- | ||
667 | The Extended Industry Standard Architecture (EISA) bus was | ||
668 | developed as an open alternative to the IBM MicroChannel bus. | ||
669 | |||
670 | The EISA bus provided some of the features of the IBM MicroChannel | ||
671 | bus while maintaining backward compatibility with cards made for | ||
672 | the older ISA bus. The EISA bus saw limited use between 1988 and | ||
673 | 1995 when it was made obsolete by the PCI bus. | ||
674 | |||
675 | Say Y here if you are building a kernel for an EISA-based machine. | ||
676 | |||
677 | Otherwise, say N. | ||
678 | |||
679 | config MCA | ||
680 | bool | ||
681 | help | ||
682 | MicroChannel Architecture is found in some IBM PS/2 machines and | ||
683 | laptops. It is a bus system similar to PCI or ISA. See | ||
684 | <file:Documentation/mca.txt> (and especially the web page given | ||
685 | there) before attempting to build an MCA bus kernel. | ||
686 | |||
687 | config SBUS | ||
688 | bool | ||
689 | |||
690 | config SUPERHYWAY | 647 | config SUPERHYWAY |
691 | tristate "SuperHyway Bus support" | 648 | tristate "SuperHyway Bus support" |
692 | depends on CPU_SUBTYPE_SH4_202 | 649 | depends on CPU_SUBTYPE_SH4_202 |
693 | 650 | ||
694 | config MAPLE | 651 | config MAPLE |
695 | bool "Maple Bus support" | 652 | bool "Maple Bus support" |
696 | depends on SH_DREAMCAST | 653 | depends on SH_DREAMCAST |
697 | help | 654 | help |
698 | The Maple Bus is SEGA's serial communication bus for peripherals | 655 | The Maple Bus is SEGA's serial communication bus for peripherals |
699 | on the Dreamcast. Without this bus support you won't be able to | 656 | on the Dreamcast. Without this bus support you won't be able to |
700 | get your Dreamcast keyboard etc to work, so most users | 657 | get your Dreamcast keyboard etc to work, so most users |
701 | probably want to say 'Y' here, unless you are only using the | 658 | probably want to say 'Y' here, unless you are only using the |
702 | Dreamcast with a serial line terminal or a remote network | 659 | Dreamcast with a serial line terminal or a remote network |
703 | connection. | 660 | connection. |
704 | 661 | ||
705 | source "arch/sh/drivers/pci/Kconfig" | 662 | source "arch/sh/drivers/pci/Kconfig" |
706 | 663 | ||
664 | source "drivers/pci/pcie/Kconfig" | ||
665 | |||
707 | source "drivers/pci/Kconfig" | 666 | source "drivers/pci/Kconfig" |
708 | 667 | ||
709 | source "drivers/pcmcia/Kconfig" | 668 | source "drivers/pcmcia/Kconfig" |