---

yaml --- r: 337595 b: refs/heads/master c: 33db6eb h: refs/heads/master i: 337593: 04f8d60 337591: 6f5f7b8 v: v3
git-mirror · Nov 2, 2012 · be69131 · be69131
1 parent 0d3e2e9
commit be69131
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 973781a821fe537ef1cb8ef227266faeed094ef6
+refs/heads/master: 33db6ebe0a124ef2ffb65c5f2ce4104e08fcec9c
diff --git a/trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c b/trunk/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
@@ -2378,7 +2378,6 @@ static int i_APCI3120_InsnWriteDigitalOutput(struct comedi_device *dev,
 
 }
 
-#ifdef CONFIG_APCI_3120
 static int i_APCI3120_InsnWriteAnalogOutput(struct comedi_device *dev,
 					    struct comedi_subdevice *s,
 					    struct comedi_insn *insn,
@@ -2437,4 +2436,3 @@ static int i_APCI3120_InsnWriteAnalogOutput(struct comedi_device *dev,
 
 	return insn->n;
 }
-#endif
diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_3120.c b/trunk/drivers/staging/comedi/drivers/addi_apci_3120.c
@@ -4,8 +4,6 @@
 
 #include "addi-data/addi_common.h"
 
-#define CONFIG_APCI_3120 1
-
 #include "addi-data/addi_eeprom.c"
 #include "addi-data/hwdrv_apci3120.c"
 #include "addi-data/addi_common.c"