From patchwork Tue May 25 08:00:07 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Jiri Kosina <jkosina@suse.cz>
X-Patchwork-Id: 102096
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4P80Au3015285
	for <patchwork-linux-input@patchwork.kernel.org>;
	Tue, 25 May 2010 08:00:10 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1751484Ab0EYIAJ (ORCPT
	<rfc822;patchwork-linux-input@patchwork.kernel.org>);
	Tue, 25 May 2010 04:00:09 -0400
Received: from cantor2.suse.de ([195.135.220.15]:42835 "EHLO mx2.suse.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1750956Ab0EYIAJ (ORCPT <rfc822;linux-input@vger.kernel.org>);
	Tue, 25 May 2010 04:00:09 -0400
Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.221.2])
	by mx2.suse.de (Postfix) with ESMTP id EFE5C8655F;
	Tue, 25 May 2010 10:00:07 +0200 (CEST)
Date: Tue, 25 May 2010 10:00:07 +0200 (CEST)
From: Jiri Kosina <jkosina@suse.cz>
To: Stefan Achatz <erazor_de@users.sourceforge.net>
Cc: Stephane Chatty <chatty@enac.fr>, wylda@volny.cz,
	Jussi Kivilinna <jussi.kivilinna@mbnet.fi>, Tejun Heo <tj@kernel.org>,
	linux-input@vger.kernel.org, Jerome Vidal <jerom3@free.fr>,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH 5/5] HID: add chardev to propagate special events of
	Roccat hardware to userland
In-Reply-To: <alpine.LNX.2.00.1005250944580.28092@pobox.suse.cz>
Message-ID: <alpine.LNX.2.00.1005250959150.28092@pobox.suse.cz>
References: <1274288116.2248.3.camel@localhost>
	<alpine.LNX.2.00.1005250944580.28092@pobox.suse.cz>
User-Agent: Alpine 2.00 (LNX 1167 2008-08-23)
MIME-Version: 1.0
Sender: linux-input-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-input.vger.kernel.org>
X-Mailing-List: linux-input@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]);
	Tue, 25 May 2010 08:00:10 +0000 (UTC)


diff --git a/drivers/hid/hid-roccat.h b/drivers/hid/hid-roccat.h
index 40cca5b..d8aae0c 100644
--- a/drivers/hid/hid-roccat.h
+++ b/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);