From 76672ccef4c0a35ea86d2130e5ae0ad9417bd16a Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 21 Jan 2013 15:19:52 -0700 Subject: [PATCH] --- yaml --- r: 354125 b: refs/heads/master c: 26b3989946c4b346e5c9181bde7f4a3c969089e0 h: refs/heads/master i: 354123: f2affa51b77cedf78210513a39e5d8c5443991cc v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/Kconfig | 1 + trunk/drivers/staging/comedi/drivers/addi_apci_2200.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7ef624b52a47..f2d0cf760358 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 20f2e2e1ceee6575794e9957912399d7ead8458f +refs/heads/master: 26b3989946c4b346e5c9181bde7f4a3c969089e0 diff --git a/trunk/drivers/staging/comedi/Kconfig b/trunk/drivers/staging/comedi/Kconfig index b1d1a0e652a5..815c20a13248 100644 --- a/trunk/drivers/staging/comedi/Kconfig +++ b/trunk/drivers/staging/comedi/Kconfig @@ -634,6 +634,7 @@ config COMEDI_ADDI_APCI_2032 config COMEDI_ADDI_APCI_2200 tristate "ADDI-DATA APCI_2200 support" + select COMEDI_ADDI_WATCHDOG ---help--- Enable support for ADDI-DATA APCI_2200 cards diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_2200.c b/trunk/drivers/staging/comedi/drivers/addi_apci_2200.c index b8a8a3fc9375..4092faa6f661 100644 --- a/trunk/drivers/staging/comedi/drivers/addi_apci_2200.c +++ b/trunk/drivers/staging/comedi/drivers/addi_apci_2200.c @@ -172,6 +172,6 @@ static struct pci_driver apci2200_pci_driver = { }; module_comedi_pci_driver(apci2200_driver, apci2200_pci_driver); +MODULE_DESCRIPTION("ADDI-DATA APCI-2200 Relay board, optically isolated"); MODULE_AUTHOR("Comedi http://www.comedi.org"); -MODULE_DESCRIPTION("Comedi low-level driver"); MODULE_LICENSE("GPL");