Merge branch 'for-linus' of git://git.kernel.dk/linux-block

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

diff --git a/drivers/staging/comedi/comedi.h b/drivers/staging/comedi/comedi.h
index 6c900e2..14ea35a 100644 (file)
--- a/drivers/staging/comedi/comedi.h
+++ b/drivers/staging/comedi/comedi.h
@@ -514,12 +514,16 @@
                        return 0x1 + pfi_channel;
                else
                        return 0xb + pfi_channel;
-       } static inline unsigned NI_USUAL_RTSI_SELECT(unsigned rtsi_channel) {
+       }
+
+       static inline unsigned NI_USUAL_RTSI_SELECT(unsigned rtsi_channel)
+       {
                if (rtsi_channel < 7)
                        return 0xb + rtsi_channel;
                else
                        return 0x1b;
        }
+
 /* mode bits for NI general-purpose counters, set with
  * INSN_CONFIG_SET_COUNTER_MODE */
 #define NI_GPCT_COUNTING_MODE_SHIFT 16