Commit debe916c authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds

[PATCH] Kconfig fixes for x86-64

x86-64 using drivers/Kconfig requires some minor changes. Mostly to disable drivers
that do not work.

- Mark paride bpck6 not 64bit clean
- Disable I2O on 64bit
- Mark PNP dependent on ISA
- Mark NSP32 driver as not 64bit clean
parent ab4a3042
...@@ -130,7 +130,7 @@ config PARIDE_BPCK ...@@ -130,7 +130,7 @@ config PARIDE_BPCK
config PARIDE_BPCK6 config PARIDE_BPCK6
tristate "MicroSolutions backpack (Series 6) protocol" tristate "MicroSolutions backpack (Series 6) protocol"
depends on PARIDE depends on PARIDE && !64BIT
---help--- ---help---
This option enables support for the Micro Solutions BACKPACK This option enables support for the Micro Solutions BACKPACK
parallel port Series 6 IDE protocol. (Most BACKPACK drives made parallel port Series 6 IDE protocol. (Most BACKPACK drives made
......
...@@ -64,10 +64,9 @@ config DRM_I830 ...@@ -64,10 +64,9 @@ config DRM_I830
module will be called i830. AGP support is required for this driver module will be called i830. AGP support is required for this driver
to work. to work.
config DRM_MGA config DRM_MGA
tristate "Matrox g200/g400" tristate "Matrox g200/g400"
depends on DRM && AGP depends on DRM && AGP && (!X86_64 || BROKEN)
help help
Choose this option if you have a Matrox G200, G400 or G450 graphics Choose this option if you have a Matrox G200, G400 or G450 graphics
card. If M is selected, the module will be called mga. AGP card. If M is selected, the module will be called mga. AGP
......
...@@ -3,7 +3,7 @@ menu "I2O device support" ...@@ -3,7 +3,7 @@ menu "I2O device support"
config I2O config I2O
tristate "I2O support" tristate "I2O support"
depends on PCI depends on PCI && !64BIT
---help--- ---help---
The Intelligent Input/Output (I2O) architecture allows hardware The Intelligent Input/Output (I2O) architecture allows hardware
drivers to be split into two parts: an operating system specific drivers to be split into two parts: an operating system specific
......
...@@ -6,6 +6,7 @@ menu "Plug and Play support" ...@@ -6,6 +6,7 @@ menu "Plug and Play support"
config PNP config PNP
bool "Plug and Play support" bool "Plug and Play support"
depends on ISA
---help--- ---help---
Plug and Play (PnP) is a standard for peripherals which allows those Plug and Play (PnP) is a standard for peripherals which allows those
peripherals to be configured by software, e.g. assign IRQ's or other peripherals to be configured by software, e.g. assign IRQ's or other
......
...@@ -1390,7 +1390,7 @@ config SCSI_ULTRASTOR ...@@ -1390,7 +1390,7 @@ config SCSI_ULTRASTOR
config SCSI_NSP32 config SCSI_NSP32
tristate "Workbit NinjaSCSI-32Bi/UDE support" tristate "Workbit NinjaSCSI-32Bi/UDE support"
depends on PCI && SCSI depends on PCI && SCSI && !64BIT
help help
This is support for the Workbit NinjaSCSI-32Bi/UDE PCI/Cardbus This is support for the Workbit NinjaSCSI-32Bi/UDE PCI/Cardbus
SCSI host adapter. Please read the SCSI-HOWTO, available from SCSI host adapter. Please read the SCSI-HOWTO, available from
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment