From 6866c2b512f4cefa580499037b022af29f9d8bdd Mon Sep 17 00:00:00 2001
From: Jiri Kosina <jkosina@suse.cz>
Date: Tue, 25 May 2010 09:58:05 +0200
Subject: [PATCH] --- yaml --- r: 198651 b: refs/heads/master c:
 0e927bfc87037c1f44d6b61be12c36f6215ee5b2 h: refs/heads/master i:   198649:
 ce310d76fb7840813c98f9f63841890b089b17d3   198647:
 f650a369fb6c33cf3b90376ad4f0678f628cc40d v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/hid/hid-roccat.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d09435a073be..aae5bb442a08 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 206f5f2fcb5ff5bb0c60f9e9189937f3ca03e378
+refs/heads/master: 0e927bfc87037c1f44d6b61be12c36f6215ee5b2
diff --git a/trunk/drivers/hid/hid-roccat.h b/trunk/drivers/hid/hid-roccat.h
index 40cca5b918dc..d8aae0c1fa7e 100644
--- a/trunk/drivers/hid/hid-roccat.h
+++ b/trunk/drivers/hid/hid-roccat.h
@@ -15,7 +15,7 @@
 #include <linux/hid.h>
 #include <linux/types.h>
 
-#ifdef CONFIG_HID_ROCCAT
+#if defined(CONFIG_HID_ROCCAT) || defined (CONFIG_HID_ROCCAT_MODULE)
 int roccat_connect(struct hid_device *hid);
 void roccat_disconnect(int minor);
 int roccat_report_event(int minor, u8 const *data, int len);