---

yaml --- r: 317265 b: refs/heads/master c: cbdfaff h: refs/heads/master i: 317263: 668df9e v: v3
git-mirror · Jun 11, 2012 · 6eae351 · 6eae351
1 parent 6d2d06d
commit 6eae351
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 83afda9d449c61b55881d50465833784d8fda786
+refs/heads/master: cbdfaffc461fd3df12f494655aca5cae68d6c7aa
diff --git a/trunk/drivers/staging/comedi/drivers/amplc_pci224.c b/trunk/drivers/staging/comedi/drivers/amplc_pci224.c
@@ -265,9 +265,6 @@ Passing a zero for an option is the same as leaving it unspecified.
 /* Combine old and new bits. */
 #define COMBINE(old, new, mask)	(((old) & ~(mask)) | ((new) & (mask)))
 
-/* A generic null function pointer value.  */
-#define NULLFUNC	0
-
 /* Current CPU.  XXX should this be hard_smp_processor_id()? */
 #define THISCPU		smp_processor_id()
 
@@ -703,7 +700,7 @@ pci224_ao_inttrig_start(struct comedi_device *dev, struct comedi_subdevice *s,
 	if (trignum != 0)
 		return -EINVAL;
 
-	s->async->inttrig = NULLFUNC;
+	s->async->inttrig = NULL;
 	pci224_ao_start(dev, s);
 
 	return 1;