From patchwork Mon Jul 8 12:04:43 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Machek X-Patchwork-Id: 2824815 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C47CB9FA1A for ; Mon, 8 Jul 2013 12:05:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A20002013A for ; Mon, 8 Jul 2013 12:05:31 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B6D4B20103 for ; Mon, 8 Jul 2013 12:05:29 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UwABv-0005EC-Sf; Mon, 08 Jul 2013 12:05:16 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UwABt-0006vM-C9; Mon, 08 Jul 2013 12:05:13 +0000 Received: from atrey.karlin.mff.cuni.cz ([195.113.26.193]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UwABp-0006un-J1 for linux-arm-kernel@lists.infradead.org; Mon, 08 Jul 2013 12:05:11 +0000 Received: by atrey.karlin.mff.cuni.cz (Postfix, from userid 512) id 958948172B; Mon, 8 Jul 2013 14:04:44 +0200 (CEST) Date: Mon, 8 Jul 2013 14:04:43 +0200 From: Pavel Machek To: pali.rohar@gmail.com, linux-arm-kernel@lists.infradead.org Subject: pali's n900 tree: fix compilation Message-ID: <20130708120443.GA2158@amd.pavel.ucw.cz> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130708_080509_746512_5B91D96F X-CRM114-Status: UNSURE ( 9.11 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Hi! This fixes compilation w/o CONFIG_TWL4030_MADC. Please apply :-). Signed-off-by: Pavel Machek diff --git a/arch/arm/mach-omap2/board-rx51-compat.c b/arch/arm/mach-omap2/board-rx51-compat.c index ceabe8b..f3a82a3 100644 --- a/arch/arm/mach-omap2/board-rx51-compat.c +++ b/arch/arm/mach-omap2/board-rx51-compat.c @@ -125,6 +125,7 @@ static long twl4030_madc_ioctl(struct file *filp, unsigned int cmd, } switch (cmd) { +#ifdef CONFIG_TWL4030_MADC case TWL4030_MADC_IOCX_ADC_RAW_READ: { struct twl4030_madc_request req; if (par.channel >= TWL4030_MADC_MAX_CHANNELS) @@ -148,6 +149,7 @@ static long twl4030_madc_ioctl(struct file *filp, unsigned int cmd, } break; } +#endif default: return -EINVAL; }