From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 3 Jun 2014 10:29:29 +0000 (+0200)
Subject: staging: comedi: addi_apci_1564: add addi_watchdog dependency
X-Git-Tag: v3.16-rc2~11^2~2
X-Git-Url: https://git.fsl.cs.sunysb.edu/?a=commitdiff_plain;h=88513624be0489b36c04cd3220a7e11f5e2a11fe;p=unionfs-2.6.39.y.git

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>
---

diff --git a/drivers/staging/comedi/Kconfig b/drivers/staging/comedi/Kconfig
index 5d56428d508..a2f6957e7ee 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