From patchwork Wed Oct 6 07:57:40 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nobuhiro Iwamatsu X-Patchwork-Id: 235231 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 o967uuW6002519 for ; Wed, 6 Oct 2010 07:56:56 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757150Ab0JFH44 (ORCPT ); Wed, 6 Oct 2010 03:56:56 -0400 Received: from mail-pz0-f46.google.com ([209.85.210.46]:48906 "EHLO mail-pz0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756517Ab0JFH4z (ORCPT ); Wed, 6 Oct 2010 03:56:55 -0400 Received: by pzk34 with SMTP id 34so1845370pzk.19 for ; Wed, 06 Oct 2010 00:56:55 -0700 (PDT) Received: by 10.114.122.13 with SMTP id u13mr15074736wac.93.1286351815331; Wed, 06 Oct 2010 00:56:55 -0700 (PDT) Received: from localhost.localdomain (49.14.32.202.bf.2iij.net [202.32.14.49]) by mx.google.com with ESMTPS id d39sm899877wam.4.2010.10.06.00.56.54 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 06 Oct 2010 00:56:55 -0700 (PDT) From: Nobuhiro Iwamatsu To: linux-sh@vger.kernel.org Cc: Nobuhiro Iwamatsu Subject: [PATCH] sh: Fix multiple definition of intc_balancing_enable Date: Wed, 6 Oct 2010 16:57:40 +0900 Message-Id: <1286351860-18777-1-git-send-email-nobuhiro.iwamatsu.yj@renesas.com> X-Mailer: git-send-email 1.7.1 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.3 (demeter1.kernel.org [140.211.167.41]); Wed, 06 Oct 2010 07:56:56 +0000 (UTC) diff --git a/drivers/sh/intc/internals.h b/drivers/sh/intc/internals.h index f02a47f..8799d35 100644 --- a/drivers/sh/intc/internals.h +++ b/drivers/sh/intc/internals.h @@ -143,9 +143,9 @@ void intc_balancing_disable(unsigned int irq); void intc_set_dist_handle(unsigned int irq, struct intc_desc *desc, struct intc_desc_int *d, intc_enum id); #else -void intc_balancing_enable(unsigned int irq) { } -void intc_balancing_disable(unsigned int irq) { } -void intc_set_dist_handle(unsigned int irq, struct intc_desc *desc, +static inline void intc_balancing_enable(unsigned int irq) { } +static inline void intc_balancing_disable(unsigned int irq) { } +static inline void intc_set_dist_handle(unsigned int irq, struct intc_desc *desc, struct intc_desc_int *d, intc_enum id) { } #endif