From patchwork Sun Jul 10 19:55:45 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randy Dunlap X-Patchwork-Id: 962522 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p6AK1thA020479 for ; Sun, 10 Jul 2011 20:01:56 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755954Ab1GJUAm (ORCPT ); Sun, 10 Jul 2011 16:00:42 -0400 Received: from oproxy4-pub.bluehost.com ([69.89.21.11]:51498 "HELO oproxy4-pub.bluehost.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1755747Ab1GJUAj (ORCPT ); Sun, 10 Jul 2011 16:00:39 -0400 Received: (qmail 21265 invoked by uid 0); 10 Jul 2011 20:00:39 -0000 Received: from unknown (HELO box742.bluehost.com) (66.147.244.242) by cpoproxy1.bluehost.com with SMTP; 10 Jul 2011 20:00:39 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=xenotime.net; h=Received:Date:From:To:Cc:Subject:Message-Id:In-Reply-To:References:Organization:X-Mailer:Mime-Version:Content-Type:Content-Transfer-Encoding:X-Identified-User; b=K1RmS9wwNgdD3qDl+eC3NUQJL+TppmpuVRmhYKZiPNiBNPs/KBiG48ZB+MI7NEr5x0xnidzTWnQgSqCEjOaQIadjN8lmKBT7+NRy4tfQD+ntlkJvBEIb4yxdiMMfTJ2X; Received: from static-50-53-38-135.bvtn.or.frontiernet.net ([50.53.38.135] helo=chimera.site) by box742.bluehost.com with esmtpa (Exim 4.69) (envelope-from ) id 1Qg0BC-00029i-TY; Sun, 10 Jul 2011 14:00:39 -0600 Date: Sun, 10 Jul 2011 12:55:45 -0700 From: Randy Dunlap To: lkml Cc: linux-media@vger.kernel.org, mchehab@infradead.org Subject: [PATCH 4/9] media/radio: fix gemtek CONFIG IO PORT Message-Id: <20110710125545.8f010dd7.rdunlap@xenotime.net> In-Reply-To: <20110710125109.c72f9c2d.rdunlap@xenotime.net> References: <20110710125109.c72f9c2d.rdunlap@xenotime.net> Organization: YPO4 X-Mailer: Sylpheed 2.7.1 (GTK+ 2.16.6; x86_64-unknown-linux-gnu) Mime-Version: 1.0 X-Identified-User: {1807:box742.bluehost.com:xenotime:xenotime.net} {sentby:smtp auth 50.53.38.135 authed with rdunlap@xenotime.net} Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Sun, 10 Jul 2011 20:01:56 +0000 (UTC) From: Randy Dunlap Modify radio-gemtek to use HEX_STRING(CONFIG_RADIO_GEMTEK_PORT) so that the correct IO port value is used. Fixes this error message when CONFIG_RADIO_GEMTEK_PORT=34c: drivers/media/radio/radio-gemtek.c:49:18: error: invalid suffix "c" on integer constant Signed-off-by: Randy Dunlap --- drivers/media/radio/radio-gemtek.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- linux-next-20110707.orig/drivers/media/radio/radio-gemtek.c +++ linux-next-20110707/drivers/media/radio/radio-gemtek.c @@ -20,6 +20,7 @@ #include /* Initdata */ #include /* request_region */ #include /* udelay */ +#include #include /* kernel radio structs */ #include #include /* outb, outb_p */ @@ -40,13 +41,15 @@ MODULE_VERSION("0.0.4"); */ #ifndef CONFIG_RADIO_GEMTEK_PORT -#define CONFIG_RADIO_GEMTEK_PORT -1 +#define __RADIO_GEMTEK_PORT -1 +#else +#define __RADIO_GEMTEK_PORT HEX_STRING(CONFIG_RADIO_GEMTEK_PORT) #endif #ifndef CONFIG_RADIO_GEMTEK_PROBE #define CONFIG_RADIO_GEMTEK_PROBE 1 #endif -static int io = CONFIG_RADIO_GEMTEK_PORT; +static int io = __RADIO_GEMTEK_PORT; static int probe = CONFIG_RADIO_GEMTEK_PROBE; static int hardmute; static int shutdown = 1;