RE: [PATCH 11/11] staging: comedi: remove comedi_fc module

[Hartley Sweeten]

On Monday, September 15, 2014 5:46 AM, Ian Abbott wrote:
> All the exported functions in the "comedi_fc" module have been migrated
> to the core "comedi" module and renamed, so it is now just a dummy
> module.  Remove it.
>
> Signed-off-by: Ian Abbott <abbotti@xxxxxxxxx>
> ---
> drivers/staging/comedi/Kconfig             | 31 ------------------------
>  drivers/staging/comedi/drivers/Makefile    |  1 -
>  drivers/staging/comedi/drivers/comedi_fc.c | 38 ------------------------------
>  3 files changed, 70 deletions(-)
>  delete mode 100644 drivers/staging/comedi/drivers/comedi_fc.c
>
> diff --git a/drivers/staging/comedi/Kconfig b/drivers/staging/comedi/Kconfig
> index fd5f939..ea4948f 100644
> --- a/drivers/staging/comedi/Kconfig
> +++ b/drivers/staging/comedi/Kconfig

[snip]

> @@ -678,7 +667,6 @@ config COMEDI_ADDI_APCI_2200
>  config COMEDI_ADDI_APCI_3120
>  	tristate "ADDI-DATA APCI_3120/3001 support"
>  	depends on VIRT_TO_BUS
> -	select COMEDI_FC
>  	---help---
>  	  Enable support for ADDI-DATA APCI_3120/3001 cards

Ian,

I'm not sure of the patch order for this series and your:
" [PATCH 0/4] staging: comedi: addi_apci_3120: redo DMA buffer allocation"

This patch has a conflict with 3/4 of that series:

config COMEDI_ADDI_APCI_3120
	tristate "ADDI-DATA APCI_3120/3001 support"
	depends on HAS_DMA
	select COMEDI_FC
	---help---
	  Enable support for ADDI-DATA APCI_3120/3001 cards

Regards,
Hartley

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/