From 2e7bc7476b40cbb098b98f1d093d23f3b15f0aee Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Tue, 8 Feb 2011 15:26:33 +0000 Subject: [PATCH] --- yaml --- r: 233103 b: refs/heads/master c: 0742cecbd431fd057b45fd8c0d60f0907e00e17f h: refs/heads/master i: 233101: 799523cb4c62f22d233661215a570dc82e1b0aa8 233099: 0632cc0fdcbb41309482024677509d654ff6e9a7 233095: 2eb8cc3c8ee8a9fe17b488de062874ce9e052a58 233087: c1ce728dead9be1cb4429a950cdd4e8dbc040e68 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/Kconfig | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index df06956499b5..ae9cb47cbf4e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3c323c01b6bd5fd01be21a8f0cdc11e55997aa06 +refs/heads/master: 0742cecbd431fd057b45fd8c0d60f0907e00e17f diff --git a/trunk/drivers/staging/comedi/Kconfig b/trunk/drivers/staging/comedi/Kconfig index aad47326d6dc..1502d80f6f78 100644 --- a/trunk/drivers/staging/comedi/Kconfig +++ b/trunk/drivers/staging/comedi/Kconfig @@ -439,6 +439,7 @@ config COMEDI_NI_AT_AO config COMEDI_NI_ATMIO tristate "NI AT-MIO E series ISA-PNP card support" depends on ISAPNP && COMEDI_NI_TIO && COMEDI_NI_COMMON + select COMEDI_8255 default N ---help--- Enable support for National Instruments AT-MIO E series cards @@ -1040,6 +1041,8 @@ config COMEDI_NI_PCIDIO config COMEDI_NI_PCIMIO tristate "NI PCI-MIO-E series and M series support" depends on COMEDI_NI_TIO && COMEDI_NI_COMMON + select COMEDI_8255 + select COMEDI_FC default N ---help--- Enable support for National Instruments PCI-MIO-E series and M series @@ -1164,6 +1167,7 @@ config COMEDI_NI_LABPC_CS config COMEDI_NI_MIO_CS tristate "NI DAQCard E series PCMCIA support" depends on COMEDI_NI_TIO && COMEDI_NI_COMMON + select COMEDI_8255 select COMEDI_FC default N ---help--- @@ -1268,7 +1272,6 @@ config COMEDI_MITE config COMEDI_NI_TIO tristate "NI general purpose counter support" depends on COMEDI_MITE - select COMEDI_8255 default N ---help--- Enable support for National Instruments general purpose counters.