From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Fri, 30 Nov 2012 01:20:04 +0000 (-0700)
Subject: staging: comedi: addi_apci_2032: remove need for addi-data/addi_common.h
X-Git-Tag: next-20121205~26^2~7
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f82a66132b5df489a56e463b63769f8b27202265;p=karo-tx-linux.git

staging: comedi: addi_apci_2032: remove need for addi-data/addi_common.h

Only the ADDIDATA_ENABLE define is used from this header. Just
open-code the value to remove the dependency and remove the include.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/comedi/drivers/addi_apci_2032.c b/drivers/staging/comedi/drivers/addi_apci_2032.c
index 46ab1da262a0..9b1dee46c2b3 100644
--- a/drivers/staging/comedi/drivers/addi_apci_2032.c
+++ b/drivers/staging/comedi/drivers/addi_apci_2032.c
@@ -32,8 +32,6 @@
 #include "../comedidev.h"
 #include "comedi_fc.h"
 
-#include "addi-data/addi_common.h"
-
 /*
  * PCI bar 1 I/O Register map
  */
@@ -71,12 +69,12 @@ static int i_APCI2032_ConfigDigitalOutput(struct comedi_device *dev,
 		return -EINVAL;
 	}
 
-	if (data[1] == ADDIDATA_ENABLE)
+	if (data[1] == 1)
 		ul_Command |= APCI2032_INT_CTRL_VCC_ENA;
 	else
 		ul_Command &= ~APCI2032_INT_CTRL_VCC_ENA;
 
-	if (data[2] == ADDIDATA_ENABLE)
+	if (data[2] == 1)
 		ul_Command |= APCI2032_INT_CTRL_CC_ENA;
 	else
 		ul_Command &= ~APCI2032_INT_CTRL_CC_ENA;