From bf11bf786fa3b38a3724d5966393e4445d9103be Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Sat, 1 May 2010 13:44:56 -0700
Subject: [PATCH] --- yaml --- r: 197176 b: refs/heads/master c:
 e2a0eab0a121a95be60a81911df07cc21e4ee429 h: refs/heads/master v: v3

---
 [refs]                                             | 2 +-
 trunk/drivers/staging/comedi/comedilib.h           | 2 --
 trunk/drivers/staging/comedi/drivers/comedi_bond.c | 1 +
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b9a01c5583a2..daf496e1d418 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 703f5936e2a4a31a5b2596d47c1504a472d4ab85
+refs/heads/master: e2a0eab0a121a95be60a81911df07cc21e4ee429
diff --git a/trunk/drivers/staging/comedi/comedilib.h b/trunk/drivers/staging/comedi/comedilib.h
index deb28cb234a9..4f86964835a9 100644
--- a/trunk/drivers/staging/comedi/comedilib.h
+++ b/trunk/drivers/staging/comedi/comedilib.h
@@ -24,8 +24,6 @@
 #ifndef _LINUX_COMEDILIB_H
 #define _LINUX_COMEDILIB_H
 
-#include "comedi.h"
-
 /* these functions may not be called at real-time priority */
 
 void *comedi_open(const char *path);
diff --git a/trunk/drivers/staging/comedi/drivers/comedi_bond.c b/trunk/drivers/staging/comedi/drivers/comedi_bond.c
index 4e6797a0b1e2..429ec703d596 100644
--- a/trunk/drivers/staging/comedi/drivers/comedi_bond.c
+++ b/trunk/drivers/staging/comedi/drivers/comedi_bond.c
@@ -87,6 +87,7 @@ Configuration Options:
  * options that are used with comedi_config.
  */
 
+#include "../comedi.h"
 #include "../comedilib.h"
 #include "../comedidev.h"
 #include <linux/string.h>