aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-06-03 12:29:29 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-06-18 15:11:22 -0700
commit88513624be0489b36c04cd3220a7e11f5e2a11fe (patch)
treec72704e6abeed8f3a4b0b9a7f8a4b9b170016362
parente28642c04a19b934e6832a218ccc9e54977f0213 (diff)
downloadlinux-88513624be0489b36c04cd3220a7e11f5e2a11fe.tar.gz
staging: comedi: addi_apci_1564: add addi_watchdog dependency
With commit aed3f9d498b ("staging: comedi: addi_apci_1564: absorb apci1564_reset()"), the apci 1564 driver has gained a dependency on the addi watchdog module, which is not reflected correctly in Kconfig, and that can lead to link errors when the watchdog is disabled. This adds an explicit 'select', like it is done in the other addi apci drivers that need it. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: H Hartley Sweeten <hsweeten@visionengravers.com> Acked-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/comedi/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/staging/comedi/Kconfig b/drivers/staging/comedi/Kconfig
index 5d56428d508ab..a2f6957e7ee96 100644
--- a/drivers/staging/comedi/Kconfig
+++ b/drivers/staging/comedi/Kconfig
@@ -651,6 +651,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