Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6

[pandora-kernel.git] / drivers / staging / comedi / drivers / addi-data / APCI1710_Inp_cpt.h

diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.h b/drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.h
index 2825287..31fbb0b 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.h
+++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.h
@@ -6,7 +6,7 @@
  *     D-77833 Ottersweier
  *     Tel: +19(0)7223/9493-0
  *     Fax: +49(0)7223/9493-92
- *     http://www.addi-data-com
+ *     http://www.addi-data.com
  *     info@addi-data.com
  *
  * This program is free software; you can redistribute it and/or modify it
@@ -21,11 +21,11 @@
 #define APCI1710_PULSEENCODER_READ     0
 #define APCI1710_PULSEENCODER_WRITE    1
 
-INT i_APCI1710_InsnConfigInitPulseEncoder(struct comedi_device *dev,
+int i_APCI1710_InsnConfigInitPulseEncoder(struct comedi_device *dev,
                                          struct comedi_subdevice *s,
                                          struct comedi_insn *insn, unsigned int *data);
 
-INT i_APCI1710_InsnWriteEnableDisablePulseEncoder(struct comedi_device *dev,
+int i_APCI1710_InsnWriteEnableDisablePulseEncoder(struct comedi_device *dev,
                                                  struct comedi_subdevice *s,
                                                  struct comedi_insn *insn,
                                                  unsigned int *data);
@@ -33,7 +33,7 @@ INT i_APCI1710_InsnWriteEnableDisablePulseEncoder(struct comedi_device *dev,
 /*
  * READ PULSE ENCODER FUNCTIONS
  */
-INT i_APCI1710_InsnReadInterruptPulseEncoder(struct comedi_device *dev,
+int i_APCI1710_InsnReadInterruptPulseEncoder(struct comedi_device *dev,
                                             struct comedi_subdevice *s,
                                             struct comedi_insn *insn,
                                             unsigned int *data);
@@ -41,7 +41,7 @@ INT i_APCI1710_InsnReadInterruptPulseEncoder(struct comedi_device *dev,
 /*
  * WRITE PULSE ENCODER FUNCTIONS
  */
-INT i_APCI1710_InsnBitsReadWritePulseEncoder(struct comedi_device *dev,
+int i_APCI1710_InsnBitsReadWritePulseEncoder(struct comedi_device *dev,
                                             struct comedi_subdevice *s,
                                             struct comedi_insn *insn,
                                             unsigned int *data);