From patchwork Mon Apr 18 19:21:32 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarkko Nikula X-Patchwork-Id: 716351 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p3IJLrZ9019676 for ; Mon, 18 Apr 2011 19:21:53 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756557Ab1DRTVw (ORCPT ); Mon, 18 Apr 2011 15:21:52 -0400 Received: from mail-ew0-f46.google.com ([209.85.215.46]:61034 "EHLO mail-ew0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756523Ab1DRTVv (ORCPT ); Mon, 18 Apr 2011 15:21:51 -0400 Received: by mail-ew0-f46.google.com with SMTP id 4so1481820ewy.19 for ; Mon, 18 Apr 2011 12:21:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=Qne3nPgWllzYmNUesDLMDJG9xi+/RYBRwEZDwYPBFIM=; b=OqGidRZgMQolc8tF/y0Ggg2zfeUugJ92Wtb2MJ/d6asxDbT5qZIMUu3f20JZxguTBq AGxIaQaRI7OCJmZdr2H1cpTZBZUTgXEqCJWGt8lDadpe6fs/6aWY9DTOu7h0gHA1mi0m RE4lAfP5IvvEmB/nd9/07lZN2HEIksLEgZWqw= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=xKNbihIBWiCwhxrS7qEfGnnJn3hACcc3gZUyFhQOT97yrOGRFzj1jL6gR8nyr21aau G3cpb7mTRkMD+ywxdZ+2OPAHUzBEexpuMJtR1D+iti/9BBhAD1KP5dCC99e9AQ9FOwkg K7NpSDrvTVINes67+7Hf2QWHj5fnj7mI6twSQ= Received: by 10.213.9.20 with SMTP id j20mr4033925ebj.59.1303154511224; Mon, 18 Apr 2011 12:21:51 -0700 (PDT) Received: from localhost (host-94-101-4-66.igua.fi [94.101.4.66]) by mx.google.com with ESMTPS id m55sm4292499eei.22.2011.04.18.12.21.50 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 18 Apr 2011 12:21:50 -0700 (PDT) From: Jarkko Nikula To: linux-omap@vger.kernel.org Cc: Tony Lindgren , Felipe Balbi , Jarkko Nikula Subject: [PATCH 3/3] omap: Fix board-nokia770.c and board-n8x0 cbus build breakage Date: Mon, 18 Apr 2011 22:21:32 +0300 Message-Id: <1303154492-13520-3-git-send-email-jhnikula@gmail.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1303154492-13520-1-git-send-email-jhnikula@gmail.com> References: <1303154492-13520-1-git-send-email-jhnikula@gmail.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Mon, 18 Apr 2011 19:21:53 +0000 (UTC) Fix a build breakage in CBUS initialization code in Nokia 770 and N8x0 boards that appeared after commit 0c6f8a8 "genirq: Remove compat code". Signed-off-by: Jarkko Nikula --- Build breakage that is only in linux-omap-2.6/cbus branch. --- arch/arm/mach-omap1/board-nokia770.c | 2 +- arch/arm/mach-omap2/board-n8x0.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c index e2537b8..5d174a3 100644 --- a/arch/arm/mach-omap1/board-nokia770.c +++ b/arch/arm/mach-omap1/board-nokia770.c @@ -177,7 +177,7 @@ static void __init nokia770_cbus_init(void) return; } - set_irq_type(gpio_to_irq(62), IRQ_TYPE_EDGE_RISING); + irq_set_irq_type(gpio_to_irq(62), IRQ_TYPE_EDGE_RISING); retu_resource[0].start = gpio_to_irq(62); platform_device_register(&retu_device); diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c index bd7937a..9ae6dff 100644 --- a/arch/arm/mach-omap2/board-n8x0.c +++ b/arch/arm/mach-omap2/board-n8x0.c @@ -274,7 +274,7 @@ static void __init n8x0_cbus_init(void) return; } - set_irq_type(gpio_to_irq(108), IRQ_TYPE_EDGE_RISING); + irq_set_irq_type(gpio_to_irq(108), IRQ_TYPE_EDGE_RISING); retu_resource[0].start = gpio_to_irq(108); platform_device_register(&retu_device);