From patchwork Wed Jun 1 18:05:08 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ralf Baechle X-Patchwork-Id: 841682 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p51JmFJC029082 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 1 Jun 2011 19:48:36 GMT Received: from canuck.infradead.org ([134.117.69.58]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QRrOX-0006fG-Q2; Wed, 01 Jun 2011 19:47:58 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QRrOX-0001j8-K3; Wed, 01 Jun 2011 19:47:57 +0000 Received: from h5.dl5rb.org.uk ([81.2.74.5] helo=duck.linux-mips.net) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QRrOD-0001fQ-UX for linux-arm-kernel@lists.infradead.org; Wed, 01 Jun 2011 19:47:40 +0000 Received: from duck.linux-mips.net (duck.linux-mips.net [127.0.0.1]) by duck.linux-mips.net (8.14.4/8.14.3) with ESMTP id p51JlcXQ010163; Wed, 1 Jun 2011 20:47:38 +0100 Received: (from ralf@localhost) by duck.linux-mips.net (8.14.4/8.14.4/Submit) id p51JlbQp010162; Wed, 1 Jun 2011 20:47:37 +0100 Message-Id: <20110601180610.913463093@duck.linux-mips.net> User-Agent: quilt/0.48-1 Date: Wed, 01 Jun 2011 19:05:08 +0100 From: ralf@linux-mips.org To: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org Subject: [patch 12/14] i8253: Move remaining content and delete References: <20110601180456.801265664@duck.linux-mips.net> Content-Disposition: inline; filename=i8253-sort-remaining-definitions.patch X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110601_154738_292141_A169C5A4 X-CRM114-Status: GOOD ( 14.50 ) X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- Cc: linux-mips@linux-mips.org, Russell King , x86@kernel.org, Ingo Molnar , "H. Peter Anvin" , Thomas Gleixner , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Wed, 01 Jun 2011 19:48:36 +0000 (UTC) There is no really good other place but one line for two out of three architectures that have a file doesn't justify this files existence. Signed-off-by: Ralf Baechle To: linux-kernel@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: Russell King Cc: linux-mips@linux-mips.org Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: x86@kernel.org arch/arm/include/asm/i8253.h | 4 ---- arch/mips/include/asm/i8253.h | 10 ---------- arch/mips/include/asm/time.h | 5 +++++ arch/x86/include/asm/i8253.h | 6 ------ arch/x86/include/asm/time.h | 1 + include/linux/i8253.h | 1 - 6 files changed, 6 insertions(+), 21 deletions(-) Index: linux-i8253/arch/x86/include/asm/i8253.h =================================================================== --- linux-i8253.orig/arch/x86/include/asm/i8253.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_X86_I8253_H -#define _ASM_X86_I8253_H - -extern void setup_pit_timer(void); - -#endif /* _ASM_X86_I8253_H */ Index: linux-i8253/include/linux/i8253.h =================================================================== --- linux-i8253.orig/include/linux/i8253.h +++ linux-i8253/include/linux/i8253.h @@ -12,7 +12,6 @@ #include #include #include -#include /* i8253A PIT registers */ #define PIT_MODE 0x43 Index: linux-i8253/arch/x86/include/asm/time.h =================================================================== --- linux-i8253.orig/arch/x86/include/asm/time.h +++ linux-i8253/arch/x86/include/asm/time.h @@ -6,6 +6,7 @@ extern void hpet_time_init(void); extern void time_init(void); +extern void setup_pit_timer(void); extern struct clock_event_device *global_clock_event; Index: linux-i8253/arch/mips/include/asm/i8253.h =================================================================== --- linux-i8253.orig/arch/mips/include/asm/i8253.h +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Machine specific IO port address definition for generic. - * Written by Osamu Tomita - */ -#ifndef __ASM_I8253_H -#define __ASM_I8253_H - -extern void setup_pit_timer(void); - -#endif /* __ASM_I8253_H */ Index: linux-i8253/arch/arm/include/asm/i8253.h =================================================================== --- linux-i8253.orig/arch/arm/include/asm/i8253.h +++ /dev/null @@ -1,4 +0,0 @@ -#ifndef __ASMARM_I8253_H -#define __ASMARM_I8253_H - -#endif Index: linux-i8253/arch/mips/include/asm/time.h =================================================================== --- linux-i8253.orig/arch/mips/include/asm/time.h +++ linux-i8253/arch/mips/include/asm/time.h @@ -36,6 +36,11 @@ extern int rtc_mips_set_mmss(unsigned lo extern void plat_time_init(void); /* + * Initialize i8253 / i8254 PIT clockevent device. + */ +extern void setup_pit_timer(void); + +/* * mips_hpt_frequency - must be set if you intend to use an R4k-compatible * counter as a timer interrupt source. */