From patchwork Wed Mar 30 01:46:18 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshihiro Shimoda X-Patchwork-Id: 672972 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 p2U1l3mi001135 for ; Wed, 30 Mar 2011 01:47:03 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754020Ab1C3BrC (ORCPT ); Tue, 29 Mar 2011 21:47:02 -0400 Received: from relmlor4.renesas.com ([210.160.252.174]:39276 "EHLO relmlor4.renesas.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753785Ab1C3BrB (ORCPT ); Tue, 29 Mar 2011 21:47:01 -0400 Received: from relmlir4.idc.renesas.com ([10.200.68.154]) by relmlor4.idc.renesas.com ( SJSMS) with ESMTP id <0LIU00E7SKX64J20@relmlor4.idc.renesas.com> for linux-sh@vger.kernel.org; Wed, 30 Mar 2011 10:46:18 +0900 (JST) Received: from relmlac2.idc.renesas.com ([10.200.69.22]) by relmlir4.idc.renesas.com ( SJSMS) with ESMTP id <0LIU004SQKX6X3F0@relmlir4.idc.renesas.com> for linux-sh@vger.kernel.org; Wed, 30 Mar 2011 10:46:18 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id A891570002; Wed, 30 Mar 2011 10:46:18 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id 9F5CB78004; Wed, 30 Mar 2011 10:46:18 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac2.idc.renesas.com with ESMTP id LAF24884; Wed, 30 Mar 2011 10:46:18 +0900 X-IronPort-AV: E=Sophos; i="4.63,265,1299423600"; d="scan'208"; a="18976079" Received: from unknown (HELO [172.30.8.157]) ([172.30.8.157]) by relmlii2.idc.renesas.com with ESMTP; Wed, 30 Mar 2011 10:46:18 +0900 Message-id: <4D928B6A.0@renesas.com> Date: Wed, 30 Mar 2011 10:46:18 +0900 From: Yoshihiro Shimoda User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; ja; rv:1.9.2.15) Gecko/20110303 Thunderbird/3.1.9 MIME-version: 1.0 To: Paul Mundt Cc: SH-Linux Subject: [PATCH] sh: intc: fix build error in interrupts.h Content-type: text/plain; charset=ISO-8859-1 Content-transfer-encoding: 7bit Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@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]); Wed, 30 Mar 2011 01:47:03 +0000 (UTC) diff --git a/drivers/sh/intc/internals.h b/drivers/sh/intc/internals.h index df36a42..5b93485 100644 --- a/drivers/sh/intc/internals.h +++ b/drivers/sh/intc/internals.h @@ -86,7 +86,7 @@ enum { MODE_ENABLE_REG = 0, /* Bit(s) set -> interrupt enabled */ static inline struct intc_desc_int *get_intc_desc(unsigned int irq) { - struct irq_chip *chip = get_irq_chip(irq); + struct irq_chip *chip = irq_get_chip(irq); return container_of(chip, struct intc_desc_int, chip); } @@ -103,7 +103,7 @@ static inline void activate_irq(int irq) set_irq_flags(irq, IRQF_VALID); #else /* same effect on other architectures */ - set_irq_noprobe(irq); + irq_set_noprobe(irq); #endif }