[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

diff --git a/drivers/block/paride/Kconfig b/drivers/block/paride/Kconfig
index ff736d839507d48305181aef46d905ab9696c526..265163f70dd6a863dbdc7e8f934674d09dfda066 100644 (file)
--- a/drivers/block/paride/Kconfig
+++ b/drivers/block/paride/Kconfig
@@ -130,7 +130,7 @@ config PARIDE_BPCK
 
 config PARIDE_BPCK6
        tristate "MicroSolutions backpack (Series 6) protocol"
-       depends on PARIDE
+       depends on PARIDE && !64BIT
        ---help---
          This option enables support for the Micro Solutions BACKPACK
          parallel port Series 6 IDE protocol.  (Most BACKPACK drives made

diff --git a/drivers/char/drm/Kconfig b/drivers/char/drm/Kconfig
index c7ec1306feed20ad9982a68feee9d73e91e48974..087ad5d29c68652a2d05d2861e235f83d8d0d701 100644 (file)
--- a/drivers/char/drm/Kconfig
+++ b/drivers/char/drm/Kconfig
@@ -64,10 +64,9 @@ config DRM_I830
          module will be called i830.  AGP support is required for this driver
          to work.
 
-
 config DRM_MGA
        tristate "Matrox g200/g400"
-       depends on DRM && AGP
+       depends on DRM && AGP && (!X86_64 || BROKEN) 
        help
          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

diff --git a/drivers/message/i2o/Kconfig b/drivers/message/i2o/Kconfig
index 01e6932afbf36dfcedbccb7a5432af5dccb44aeb..849d854657ed39cff2527d97220c0807cabfc8e2 100644 (file)
--- a/drivers/message/i2o/Kconfig
+++ b/drivers/message/i2o/Kconfig
@@ -3,7 +3,7 @@ menu "I2O device support"
 
 config I2O
        tristate "I2O support"
-       depends on PCI
+       depends on PCI && !64BIT
        ---help---
          The Intelligent Input/Output (I2O) architecture allows hardware
          drivers to be split into two parts: an operating system specific

diff --git a/drivers/pnp/Kconfig b/drivers/pnp/Kconfig
index 7c2007c2eab4c064187fbe1cff3defc0ac4e1138..4534baef128ffa969020cd1bbdd02b6ccfe219ad 100644 (file)
--- a/drivers/pnp/Kconfig
+++ b/drivers/pnp/Kconfig
@@ -6,6 +6,7 @@ menu "Plug and Play support"
 
 config PNP
        bool "Plug and Play support"
+       depends on ISA
        ---help---
          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

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index ce9f0d6ebe6fff60965ca33b2c1db74fa180355e..9fb0891df42c04313b5b7d18156e2019bb836a7a 100644 (file)
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -1390,7 +1390,7 @@ config SCSI_ULTRASTOR
 
 config SCSI_NSP32
        tristate "Workbit NinjaSCSI-32Bi/UDE support"
-       depends on PCI && SCSI
+       depends on PCI && SCSI && !64BIT
        help
          This is support for the Workbit NinjaSCSI-32Bi/UDE PCI/Cardbus
          SCSI host adapter. Please read the SCSI-HOWTO, available from