From 579dfa936b10f2d97ba31f2f4689420c8bbdc2ea Mon Sep 17 00:00:00 2001
From: Ralf Thielow <ralf.thielow@googlemail.com>
Date: Sat, 28 May 2011 01:37:03 +0200
Subject: [PATCH] --- yaml --- r: 259551 b: refs/heads/master c:
 f80d1d22b6c30771f8d4576d5c741c33b0cfd8ab h: refs/heads/master i:   259549:
 febfc373adebb4a53a2f4a97cecaa94944296f58   259547:
 1d513f5010e590d12e9cb1f9d2a07a7303fdccf8   259543:
 814765fd9155c11ca5cc0d59991de1473cea0fe6   259535:
 186bd6bd4ed618ecff1757b268c34149c256d1d2   259519:
 c2c38a89bb640e9ab006bb492cb25840fed4ce3f v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/staging/comedi/comedi.h | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c39fc907e090..379853c4da59 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2265e2e7fd23ad9cd1408866658aa747c4c1e9f5
+refs/heads/master: f80d1d22b6c30771f8d4576d5c741c33b0cfd8ab
diff --git a/trunk/drivers/staging/comedi/comedi.h b/trunk/drivers/staging/comedi/comedi.h
index 6c900e2756fb..14ea35ac0156 100644
--- a/trunk/drivers/staging/comedi/comedi.h
+++ b/trunk/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