From patchwork Tue Nov 17 22:50:45 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 60837 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nAHMthvn018913 for ; Tue, 17 Nov 2009 22:55:44 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756704AbZKQWx6 (ORCPT ); Tue, 17 Nov 2009 17:53:58 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756632AbZKQWwD (ORCPT ); Tue, 17 Nov 2009 17:52:03 -0500 Received: from www.tglx.de ([62.245.132.106]:41634 "EHLO www.tglx.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756669AbZKQWwB (ORCPT ); Tue, 17 Nov 2009 17:52:01 -0500 Received: from localhost.localdomain (www.tglx.de [127.0.0.1]) by www.tglx.de (8.13.8/8.13.8/TGLX-2007100201) with ESMTP id nAHMoiTB019145; Tue, 17 Nov 2009 23:50:45 +0100 Message-Id: <20091117224916.528768738@linutronix.de> User-Agent: quilt/0.47-1 Date: Tue, 17 Nov 2009 22:50:45 -0000 From: Thomas Gleixner To: LKML Cc: Ingo Molnar , Paul Mundt , linux-sh@vger.kernel.org Subject: [patch 05/13] sh: Fixup last users of irq_chip->typename References: <20091117224852.846805939@linutronix.de> Content-Disposition: inline; filename=sh-replace-obsolete-typename.patch X-Virus-Scanned: clamav-milter 0.95.1 at www.tglx.de X-Virus-Status: Clean X-Spam-Status: No, score=-1.8 required=5.0 tests=ALL_TRUSTED,AWL autolearn=failed version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on www.tglx.de Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org Index: linux-2.6/arch/sh/kernel/cpu/irq/imask.c =================================================================== --- linux-2.6.orig/arch/sh/kernel/cpu/irq/imask.c +++ linux-2.6/arch/sh/kernel/cpu/irq/imask.c @@ -68,7 +68,7 @@ static void unmask_imask_irq(unsigned in } static struct irq_chip imask_irq_chip = { - .typename = "SR.IMASK", + .name = "SR.IMASK", .mask = mask_imask_irq, .unmask = unmask_imask_irq, .mask_ack = mask_imask_irq, Index: linux-2.6/arch/sh/kernel/cpu/irq/intc-sh5.c =================================================================== --- linux-2.6.orig/arch/sh/kernel/cpu/irq/intc-sh5.c +++ linux-2.6/arch/sh/kernel/cpu/irq/intc-sh5.c @@ -85,7 +85,7 @@ static void mask_and_ack_intc(unsigned i static void end_intc_irq(unsigned int irq); static struct irq_chip intc_irq_type = { - .typename = "INTC", + .name = "INTC", .startup = startup_intc_irq, .shutdown = shutdown_intc_irq, .enable = enable_intc_irq,