diff options
Diffstat (limited to 'arch/sh/boards')
32 files changed, 26 insertions, 50 deletions
diff --git a/arch/sh/boards/bigsur/io.c b/arch/sh/boards/bigsur/io.c index 6835381da5fd..23071f97eec3 100644 --- a/arch/sh/boards/bigsur/io.c +++ b/arch/sh/boards/bigsur/io.c @@ -1,5 +1,5 @@ /* - * include/asm-sh/io_bigsur.c + * arch/sh/boards/bigsur/io.c * * By Dustin McIntire (dustin@sensoria.com) (c)2001 * Derived from io_hd64465.h, which bore the message: diff --git a/arch/sh/boards/bigsur/led.c b/arch/sh/boards/bigsur/led.c index 6b08c0e1c453..d221439aafcc 100644 --- a/arch/sh/boards/bigsur/led.c +++ b/arch/sh/boards/bigsur/led.c @@ -1,5 +1,5 @@ /* - * linux/arch/sh/kernel/led_bigsur.c + * linux/arch/sh/boards/bigsur/led.c * * By Dustin McIntire (dustin@sensoria.com) (c)2001 * Derived from led_se.c and led.c, which bore the message: diff --git a/arch/sh/boards/ec3104/io.c b/arch/sh/boards/ec3104/io.c index a70928c44753..2f86394b280b 100644 --- a/arch/sh/boards/ec3104/io.c +++ b/arch/sh/boards/ec3104/io.c @@ -1,5 +1,5 @@ /* - * linux/arch/sh/kernel/io_ec3104.c + * linux/arch/sh/boards/ec3104/io.c * EC3104 companion chip support * * Copyright (C) 2000 Philipp Rumpf <prumpf@tux.org> diff --git a/arch/sh/boards/hp6xx/hp6xx_apm.c b/arch/sh/boards/hp6xx/hp6xx_apm.c index ad0e712c29f6..75f91aaae077 100644 --- a/arch/sh/boards/hp6xx/hp6xx_apm.c +++ b/arch/sh/boards/hp6xx/hp6xx_apm.c @@ -6,7 +6,6 @@ * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License. */ -#include <linux/config.h> #include <linux/module.h> #include <linux/apm_bios.h> #include <linux/kernel.h> diff --git a/arch/sh/boards/hp6xx/pm.c b/arch/sh/boards/hp6xx/pm.c index 0e501bcbd7a9..83d327212064 100644 --- a/arch/sh/boards/hp6xx/pm.c +++ b/arch/sh/boards/hp6xx/pm.c @@ -6,7 +6,6 @@ * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License. */ -#include <linux/config.h> #include <linux/init.h> #include <linux/suspend.h> #include <linux/errno.h> diff --git a/arch/sh/boards/hp6xx/setup.c b/arch/sh/boards/hp6xx/setup.c index 60ab17ad6054..2d3a5b4faf58 100644 --- a/arch/sh/boards/hp6xx/setup.c +++ b/arch/sh/boards/hp6xx/setup.c @@ -1,5 +1,5 @@ /* - * linux/arch/sh/boards/hp6xx/hp680/setup.c + * linux/arch/sh/boards/hp6xx/setup.c * * Copyright (C) 2002 Andriy Skulysh * diff --git a/arch/sh/boards/landisk/irq.c b/arch/sh/boards/landisk/irq.c index a006d6443225..8f2e1c68b90f 100644 --- a/arch/sh/boards/landisk/irq.c +++ b/arch/sh/boards/landisk/irq.c @@ -14,8 +14,6 @@ * modified by kogiidena * 2005.03.03 */ - -#include <linux/config.h> #include <linux/init.h> #include <linux/irq.h> #include <asm/io.h> @@ -83,7 +81,7 @@ static struct hw_interrupt_type landisk_irq_type = { static void make_landisk_irq(unsigned int irq) { disable_irq_nosync(irq); - irq_desc[irq].handler = &landisk_irq_type; + irq_desc[irq].chip = &landisk_irq_type; disable_landisk_irq(irq); } diff --git a/arch/sh/boards/landisk/landisk_pwb.c b/arch/sh/boards/landisk/landisk_pwb.c index e75cb578a28b..0b7bee1a9ca5 100644 --- a/arch/sh/boards/landisk/landisk_pwb.c +++ b/arch/sh/boards/landisk/landisk_pwb.c @@ -11,8 +11,6 @@ * * LED control drive function added by kogiidena */ - -#include <linux/config.h> #include <linux/module.h> #include <linux/errno.h> #include <linux/signal.h> diff --git a/arch/sh/boards/landisk/rtc.c b/arch/sh/boards/landisk/rtc.c index 35ba726a0979..0a9a2a2ad05b 100644 --- a/arch/sh/boards/landisk/rtc.c +++ b/arch/sh/boards/landisk/rtc.c @@ -8,8 +8,6 @@ * modifed by kogiidena * 2005.09.16 */ - -#include <linux/config.h> #include <linux/init.h> #include <linux/kernel.h> #include <linux/sched.h> diff --git a/arch/sh/boards/landisk/setup.c b/arch/sh/boards/landisk/setup.c index 127b9e020e00..122d69962637 100644 --- a/arch/sh/boards/landisk/setup.c +++ b/arch/sh/boards/landisk/setup.c @@ -16,7 +16,6 @@ * License. See the file "COPYING" in the main directory of this archive * for more details. */ -#include <linux/config.h> #include <linux/init.h> #include <linux/pm.h> #include <linux/mm.h> diff --git a/arch/sh/boards/mpc1211/led.c b/arch/sh/boards/mpc1211/led.c index 1fe36927f691..8df1591823d6 100644 --- a/arch/sh/boards/mpc1211/led.c +++ b/arch/sh/boards/mpc1211/led.c @@ -1,5 +1,5 @@ /* - * linux/arch/sh/kernel/led_mpc1211.c + * linux/arch/sh/boards/mpc1211/led.c * * Copyright (C) 2001 Saito.K & Jeanne * diff --git a/arch/sh/boards/mpc1211/setup.c b/arch/sh/boards/mpc1211/setup.c index 8eb5d4303972..01c10fa5c058 100644 --- a/arch/sh/boards/mpc1211/setup.c +++ b/arch/sh/boards/mpc1211/setup.c @@ -1,5 +1,5 @@ /* - * linux/arch/sh/board/mpc1211/setup.c + * linux/arch/sh/boards/mpc1211/setup.c * * Copyright (C) 2002 Saito.K & Jeanne, Fujii.Y * diff --git a/arch/sh/boards/renesas/hs7751rvoip/io.c b/arch/sh/boards/renesas/hs7751rvoip/io.c index 9ea1136b219b..51f3f6574210 100644 --- a/arch/sh/boards/renesas/hs7751rvoip/io.c +++ b/arch/sh/boards/renesas/hs7751rvoip/io.c @@ -1,5 +1,5 @@ /* - * linux/arch/sh/kernel/io_hs7751rvoip.c + * linux/arch/sh/boards/renesas/hs7751rvoip/io.c * * Copyright (C) 2001 Ian da Silva, Jeremy Siegel * Based largely on io_se.c. diff --git a/arch/sh/boards/renesas/hs7751rvoip/pci.c b/arch/sh/boards/renesas/hs7751rvoip/pci.c index 7e5786b58110..1c0ddee30d21 100644 --- a/arch/sh/boards/renesas/hs7751rvoip/pci.c +++ b/arch/sh/boards/renesas/hs7751rvoip/pci.c @@ -1,5 +1,5 @@ /* - * linux/arch/sh/kernel/pci-hs7751rvoip.c + * linux/arch/sh/boards/renesas/hs7751rvoip/pci.c * * Author: Ian DaSilva (idasilva@mvista.com) * diff --git a/arch/sh/boards/renesas/r7780rp/irq.c b/arch/sh/boards/renesas/r7780rp/irq.c index 61d5e5d3c294..2d960e9a3143 100644 --- a/arch/sh/boards/renesas/r7780rp/irq.c +++ b/arch/sh/boards/renesas/r7780rp/irq.c @@ -8,8 +8,6 @@ * Modified for R7780RP-1 by * Atom Create Engineering Co., Ltd. 2002. */ - -#include <linux/config.h> #include <linux/init.h> #include <linux/irq.h> #include <asm/io.h> @@ -83,7 +81,7 @@ static struct hw_interrupt_type r7780rp_irq_type = { static void make_r7780rp_irq(unsigned int irq) { disable_irq_nosync(irq); - irq_desc[irq].handler = &r7780rp_irq_type; + irq_desc[irq].chip = &r7780rp_irq_type; disable_r7780rp_irq(irq); } diff --git a/arch/sh/boards/renesas/r7780rp/led.c b/arch/sh/boards/renesas/r7780rp/led.c index 9f02766b6f53..6a00a257afd2 100644 --- a/arch/sh/boards/renesas/r7780rp/led.c +++ b/arch/sh/boards/renesas/r7780rp/led.c @@ -6,8 +6,6 @@ * * This file contains Renesas Solutions HIGHLANDER R7780RP-1 specific LED code. */ - -#include <linux/config.h> #include <linux/sched.h> #include <asm/io.h> #include <asm/r7780rp/r7780rp.h> diff --git a/arch/sh/boards/renesas/rts7751r2d/led.c b/arch/sh/boards/renesas/rts7751r2d/led.c index e14a13d12d4a..a7ce66c1e4f0 100644 --- a/arch/sh/boards/renesas/rts7751r2d/led.c +++ b/arch/sh/boards/renesas/rts7751r2d/led.c @@ -1,5 +1,5 @@ /* - * linux/arch/sh/kernel/led_rts7751r2d.c + * linux/arch/sh/boards/renesas/rts7751r2d/led.c * * Copyright (C) Atom Create Engineering Co., Ltd. * diff --git a/arch/sh/boards/renesas/systemh/io.c b/arch/sh/boards/renesas/systemh/io.c index cde6e5d192c4..1b767e1a1428 100644 --- a/arch/sh/boards/renesas/systemh/io.c +++ b/arch/sh/boards/renesas/systemh/io.c @@ -1,5 +1,5 @@ /* - * linux/arch/sh/boards/systemh/io.c + * linux/arch/sh/boards/renesas/systemh/io.c * * Copyright (C) 2001 Ian da Silva, Jeremy Siegel * Based largely on io_se.c. diff --git a/arch/sh/boards/renesas/systemh/irq.c b/arch/sh/boards/renesas/systemh/irq.c index 8d016dae2333..0ba2fe674c47 100644 --- a/arch/sh/boards/renesas/systemh/irq.c +++ b/arch/sh/boards/renesas/systemh/irq.c @@ -1,5 +1,5 @@ /* - * linux/arch/sh/boards/systemh/irq.c + * linux/arch/sh/boards/renesas/systemh/irq.c * * Copyright (C) 2000 Kazumoto Kojima * diff --git a/arch/sh/boards/renesas/systemh/setup.c b/arch/sh/boards/renesas/systemh/setup.c index a8467bf90c25..936117659b74 100644 --- a/arch/sh/boards/renesas/systemh/setup.c +++ b/arch/sh/boards/renesas/systemh/setup.c @@ -1,5 +1,5 @@ /* - * linux/arch/sh/boards/systemh/setup.c + * linux/arch/sh/boards/renesas/systemh/setup.c * * Copyright (C) 2000 Kazumoto Kojima * Copyright (C) 2003 Paul Mundt @@ -53,6 +53,6 @@ struct sh_machine_vector mv_7751systemh __initmv = { .mv_outsw = sh7751systemh_outsw, .mv_outsl = sh7751systemh_outsl, - .mv_init_irq = sh7751system_init_irq, + .mv_init_irq = sh7751systemh_init_irq, }; ALIAS_MV(7751systemh) diff --git a/arch/sh/boards/se/7343/io.c b/arch/sh/boards/se/7343/io.c index 646661a146ad..3a6d11424938 100644 --- a/arch/sh/boards/se/7343/io.c +++ b/arch/sh/boards/se/7343/io.c @@ -4,8 +4,6 @@ * I/O routine for SH-Mobile3AS 7343 SolutionEngine. * */ - -#include <linux/config.h> #include <linux/kernel.h> #include <asm/io.h> #include <asm/mach/se7343.h> diff --git a/arch/sh/boards/se/7343/irq.c b/arch/sh/boards/se/7343/irq.c index b41e3d4ea37c..288b62f59419 100644 --- a/arch/sh/boards/se/7343/irq.c +++ b/arch/sh/boards/se/7343/irq.c @@ -2,8 +2,6 @@ * arch/sh/boards/se/7343/irq.c * */ - -#include <linux/config.h> #include <linux/init.h> #include <linux/interrupt.h> #include <linux/irq.h> @@ -73,7 +71,7 @@ static void make_intreq_irq(unsigned int irq) { disable_irq_nosync(irq); - irq_desc[irq].handler = &intreq_irq_type; + irq_desc[irq].chip = &intreq_irq_type; disable_intreq_irq(irq); } diff --git a/arch/sh/boards/se/7343/led.c b/arch/sh/boards/se/7343/led.c index 6a439cf83e46..6b39e191c420 100644 --- a/arch/sh/boards/se/7343/led.c +++ b/arch/sh/boards/se/7343/led.c @@ -2,8 +2,6 @@ * arch/sh/boards/se/7343/led.c * */ - -#include <linux/config.h> #include <linux/sched.h> #include <asm/mach/se7343.h> diff --git a/arch/sh/boards/se/7343/setup.c b/arch/sh/boards/se/7343/setup.c index 787322291fb3..c7d17fe7764e 100644 --- a/arch/sh/boards/se/7343/setup.c +++ b/arch/sh/boards/se/7343/setup.c @@ -1,4 +1,3 @@ -#include <linux/config.h> #include <linux/init.h> #include <linux/platform_device.h> #include <asm/machvec.h> diff --git a/arch/sh/boards/se/770x/led.c b/arch/sh/boards/se/770x/led.c index daf7b1ee786a..d93dd831b2ad 100644 --- a/arch/sh/boards/se/770x/led.c +++ b/arch/sh/boards/se/770x/led.c @@ -1,5 +1,5 @@ /* - * linux/arch/sh/kernel/led_se.c + * linux/arch/sh/boards/se/770x/led.c * * Copyright (C) 2000 Stuart Menefy <stuart.menefy@st.com> * diff --git a/arch/sh/boards/se/770x/setup.c b/arch/sh/boards/se/770x/setup.c index f3f82b7c8217..a1d51d5fa925 100644 --- a/arch/sh/boards/se/770x/setup.c +++ b/arch/sh/boards/se/770x/setup.c @@ -8,13 +8,10 @@ * */ #include <linux/init.h> -#include <linux/irq.h> -#include <linux/hdreg.h> -#include <linux/ide.h> -#include <asm/io.h> +#include <asm/machvec.h> #include <asm/se.h> +#include <asm/io.h> #include <asm/smc37c93x.h> -#include <asm/machvec.h> void heartbeat_se(void); void init_se_IRQ(void); diff --git a/arch/sh/boards/se/7751/led.c b/arch/sh/boards/se/7751/led.c index ff0355dea81b..de4194d97c88 100644 --- a/arch/sh/boards/se/7751/led.c +++ b/arch/sh/boards/se/7751/led.c @@ -1,5 +1,5 @@ /* - * linux/arch/sh/kernel/led_se.c + * linux/arch/sh/boards/se/7751/led.c * * Copyright (C) 2000 Stuart Menefy <stuart.menefy@st.com> * diff --git a/arch/sh/boards/se/7751/pci.c b/arch/sh/boards/se/7751/pci.c index 3ee03014dea3..203b2923fe7f 100644 --- a/arch/sh/boards/se/7751/pci.c +++ b/arch/sh/boards/se/7751/pci.c @@ -1,5 +1,5 @@ /* - * linux/arch/sh/kernel/pci-7751se.c + * linux/arch/sh/boards/se/7751/pci.c * * Author: Ian DaSilva (idasilva@mvista.com) * diff --git a/arch/sh/boards/se/7751/setup.c b/arch/sh/boards/se/7751/setup.c index 73e826310ba8..f7e1dd39c836 100644 --- a/arch/sh/boards/se/7751/setup.c +++ b/arch/sh/boards/se/7751/setup.c @@ -8,12 +8,10 @@ * Modified for 7751 Solution Engine by * Ian da Silva and Jeremy Siegel, 2001. */ - #include <linux/init.h> -#include <linux/irq.h> -#include <linux/ide.h> -#include <asm/io.h> +#include <asm/machvec.h> #include <asm/se7751.h> +#include <asm/io.h> void heartbeat_7751se(void); void init_7751se_IRQ(void); diff --git a/arch/sh/boards/sh03/setup.c b/arch/sh/boards/sh03/setup.c index 6c310587ddfe..137e2ba9243e 100644 --- a/arch/sh/boards/sh03/setup.c +++ b/arch/sh/boards/sh03/setup.c @@ -7,6 +7,7 @@ #include <linux/init.h> #include <linux/irq.h> +#include <linux/pci.h> #include <asm/io.h> #include <asm/rtc.h> #include <asm/sh03/io.h> diff --git a/arch/sh/boards/superh/microdev/io.c b/arch/sh/boards/superh/microdev/io.c index 4836b9422e27..83419bf4c834 100644 --- a/arch/sh/boards/superh/microdev/io.c +++ b/arch/sh/boards/superh/microdev/io.c @@ -1,5 +1,5 @@ /* - * linux/arch/sh/kernel/io_microdev.c + * linux/arch/sh/boards/superh/microdev/io.c * * Copyright (C) 2003 Sean McGoogan (Sean.McGoogan@superh.com) * Copyright (C) 2003, 2004 SuperH, Inc. diff --git a/arch/sh/boards/superh/microdev/led.c b/arch/sh/boards/superh/microdev/led.c index a38f5351bd16..36e54b47a752 100644 --- a/arch/sh/boards/superh/microdev/led.c +++ b/arch/sh/boards/superh/microdev/led.c @@ -1,5 +1,5 @@ /* - * linux/arch/sh/kernel/led_microdev.c + * linux/arch/sh/boards/superh/microdev/led.c * * Copyright (C) 2002 Stuart Menefy <stuart.menefy@st.com> * Copyright (C) 2003 Richard Curnow (Richard.Curnow@superh.com) |