[PATCH 1/4] staging: comedi: Kconfig: menuconfig options should be bool not tristate

[H Hartley Sweeten]

On Monday, June 18, 2012 5:31 PM, Greg KH wrote:
> Below is the .config I use.  Apply your patch, and select 'y' for the
> different options it asks for when running 'make oldconfig' and then see
> the build errors.

Ok. It looks like the patch below should fix it. Can you test it?

Regards,
Hartley


>From 41080f5af022a13e96bad3a5818e8cd816a7a925 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hsweeten at visionengravers.com>
Date: Mon, 18 Jun 2012 17:45:51 -0700
Subject: [PATCH] staging: comedi: Kconfig: fix drivers that require the 8255 driver

Many of the comedi drivers require the 8255 driver for various
subdevices. The Makefile currently uses CONFIG_COMEDI_PCI_DRIVERS
to make sure the 8255 driver is compiled. The Kconfig help for
that option says that this option does not directly affect the
kernel.

Fix this by adding the proper 'select COMEDI_8255' where needed.

Also, remove two cases where the drivers don't actually need the
8255 support.

Signed-off-by: H Hartley Sweeten <hsweeten at visionengravers.com>
Cc: Ian Abbott <abbotti at mev.co.uk>
Cc: Frank Mori Hess <fmhess at users.sourceforge.net>
Cc: Greg Kroah-hartman <gregkh at linuxfoundation.org>
---
 drivers/staging/comedi/Kconfig          | 3 +--
 drivers/staging/comedi/drivers/Makefile | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/staging/comedi/Kconfig b/drivers/staging/comedi/Kconfig
index 2ca7f08..198a55d 100644
--- a/drivers/staging/comedi/Kconfig
+++ b/drivers/staging/comedi/Kconfig
@@ -672,7 +672,6 @@ config COMEDI_ADDI_APCI_3XXX
 
 config COMEDI_ADL_PCI6208
 	tristate "ADLink PCI-6208A support"
-	select COMEDI_8255
 	---help---
 	  Enable support for ADLink PCI-6208A cards
 
@@ -689,6 +688,7 @@ config COMEDI_ADL_PCI7230
 
 config COMEDI_ADL_PCI7296
 	tristate "ADLink PCI-7296 96 ch. digital io board support"
+	select COMED_8255
 	---help---
 	  Enable support for ADlink PCI-7296 96 ch. digital io board support
 
@@ -1061,7 +1061,6 @@ config COMEDI_NI_PCIMIO
 
 config COMEDI_RTD520
 	tristate "Real Time Devices PCI4520/DM7520 support"
-	select COMEDI_8255
 	---help---
 	  Enable support for Real Time Devices PCI4520/DM7520
 
diff --git a/drivers/staging/comedi/drivers/Makefile b/drivers/staging/comedi/drivers/Makefile
index 170da60..513469d 100644
--- a/drivers/staging/comedi/drivers/Makefile
+++ b/drivers/staging/comedi/drivers/Makefile
@@ -55,7 +55,6 @@ obj-$(CONFIG_COMEDI_MULTIQ3)		+= multiq3.o
 obj-$(CONFIG_COMEDI_POC)		+= poc.o
 
 # Comedi PCI drivers
-obj-$(CONFIG_COMEDI_PCI_DRIVERS)	+= 8255.o
 obj-$(CONFIG_COMEDI_ADDI_APCI_035)	+= addi_apci_035.o
 obj-$(CONFIG_COMEDI_ADDI_APCI_1032)	+= addi_apci_1032.o
 obj-$(CONFIG_COMEDI_ADDI_APCI_1500)	+= addi_apci_1500.o
-- 
1.7.11