diff -Nru curr/arch/i386/Kconfig rday/arch/i386/Kconfig
--- curr/arch/i386/Kconfig 2003-04-26 13:07:28.000000000 -0400
+++ rday/arch/i386/Kconfig 2003-04-26 13:14:39.000000000 -0400
@@ -989,6 +989,11 @@
depends on (X86_VISWS || SMP) && !X86_VOYAGER
default y
+config X86_IO_APIC
+ bool
+ depends on SMP && !(X86_VISWS || X86_VOYAGER)
+ default y
+
config PCI
bool "PCI support" if !X86_VISWS
depends on !X86_VOYAGER
@@ -1004,11 +1009,6 @@
information about which PCI hardware does work under Linux and which
doesn't.
-config X86_IO_APIC
- bool
- depends on SMP && !(X86_VISWS || X86_VOYAGER)
- default y
-
choice
prompt "PCI access mode"
depends on PCI && !X86_VISWS
@@ -1048,18 +1048,6 @@
depends on PCI && ((PCI_GODIRECT || PCI_GOANY) || X86_VISWS)
default y
-config SCx200
- tristate "NatSemi SCx200 support"
- depends on !X86_VOYAGER
- help
- This provides basic support for the National Semiconductor SCx200
- processor. Right now this is just a driver for the GPIO pins.
-
- If you don't know what to do here, say N.
-
- This support is also available as a module. If compiled as a
- module, it will be called scx200.
-
source "drivers/pci/Kconfig"
config ISA
@@ -1105,6 +1093,18 @@
source "drivers/mca/Kconfig"
+config SCx200
+ tristate "NatSemi SCx200 support"
+ depends on !X86_VOYAGER
+ help
+ This provides basic support for the National Semiconductor SCx200
+ processor. Right now this is just a driver for the GPIO pins.
+
+ If you don't know what to do here, say N.
+
+ This support is also available as a module. If compiled as a
+ module, it will be called scx200.
+
config HOTPLUG
bool "Support for hot-pluggable devices"
---help---
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Wed Apr 30 2003 - 22:00:24 EST