diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-22 12:33:51 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-22 12:33:51 -0400 |
| commit | ef7994fa2aecd8d1fb0d75034caa050ff908d26a (patch) | |
| tree | aa7bbe9499256ced149dce70891de5eedf33c283 /drivers/staging/comedi/Kconfig | |
| parent | ad8686bc05adc2b8301d749f5958bd904f3a46ee (diff) | |
| parent | a497c3ba1d97fc69c1e78e7b96435ba8c2cb42ee (diff) | |
Merge 3.16-rc2 into staging-next
We want the staging fixes here as well.
Diffstat (limited to 'drivers/staging/comedi/Kconfig')
| -rw-r--r-- | drivers/staging/comedi/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/staging/comedi/Kconfig b/drivers/staging/comedi/Kconfig index 3a07f0b9afd5..8d992a87d3c4 100644 --- a/drivers/staging/comedi/Kconfig +++ b/drivers/staging/comedi/Kconfig @@ -653,6 +653,7 @@ config COMEDI_ADDI_APCI_1516 config COMEDI_ADDI_APCI_1564 tristate "ADDI-DATA APCI_1564 support" + select COMEDI_ADDI_WATCHDOG ---help--- Enable support for ADDI-DATA APCI_1564 cards |