Date: Sun, 26 Jun 2011 10:07:48 +0000 (UTC) From: Kevin Lo <kevlo@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r223562 - in head/sys: arm/at91 arm/sa11x0 mips/atheros mips/mips mips/rmi mips/rmi/dev/xlr mips/sentry5 mips/sibyte Message-ID: <201106261007.p5QA7m6Z048636@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kevlo Date: Sun Jun 26 10:07:48 2011 New Revision: 223562 URL: http://svn.freebsd.org/changeset/base/223562 Log: Remove duplicate header includes Modified: head/sys/arm/at91/at91_machdep.c head/sys/arm/sa11x0/assabet_machdep.c head/sys/arm/sa11x0/sa11x0.c head/sys/mips/atheros/ar71xx_chip.c head/sys/mips/atheros/ar71xx_machdep.c head/sys/mips/atheros/ar71xx_ohci.c head/sys/mips/atheros/ar71xx_setup.c head/sys/mips/atheros/ar724x_chip.c head/sys/mips/atheros/ar91xx_chip.c head/sys/mips/mips/genassym.c head/sys/mips/mips/trap.c head/sys/mips/rmi/dev/xlr/rge.c head/sys/mips/rmi/fmn.c head/sys/mips/rmi/iodi.c head/sys/mips/sentry5/s5_machdep.c head/sys/mips/sibyte/sb_machdep.c Modified: head/sys/arm/at91/at91_machdep.c ============================================================================== --- head/sys/arm/at91/at91_machdep.c Sun Jun 26 09:32:46 2011 (r223561) +++ head/sys/arm/at91/at91_machdep.c Sun Jun 26 10:07:48 2011 (r223562) @@ -91,7 +91,6 @@ __FBSDID("$FreeBSD$"); #include <arm/at91/at91var.h> #include <arm/at91/at91rm92reg.h> #include <arm/at91/at91sam9g20reg.h> -#include <arm/at91/at91board.h> #define KERNEL_PT_SYS 0 /* Page table for mapping proc0 zero page */ #define KERNEL_PT_KERN 1 Modified: head/sys/arm/sa11x0/assabet_machdep.c ============================================================================== --- head/sys/arm/sa11x0/assabet_machdep.c Sun Jun 26 09:32:46 2011 (r223561) +++ head/sys/arm/sa11x0/assabet_machdep.c Sun Jun 26 10:07:48 2011 (r223562) @@ -77,7 +77,6 @@ __FBSDID("$FreeBSD$"); #include <vm/vm.h> #include <vm/pmap.h> -#include <vm/vm.h> #include <vm/vm_object.h> #include <vm/vm_page.h> #include <vm/vm_pager.h> Modified: head/sys/arm/sa11x0/sa11x0.c ============================================================================== --- head/sys/arm/sa11x0/sa11x0.c Sun Jun 26 09:32:46 2011 (r223561) +++ head/sys/arm/sa11x0/sa11x0.c Sun Jun 26 10:07:48 2011 (r223562) @@ -58,7 +58,6 @@ __FBSDID("$FreeBSD$"); #include <sys/kernel.h> #include <sys/reboot.h> #include <sys/malloc.h> -#include <sys/bus.h> #include <sys/interrupt.h> #include <sys/module.h> #include <sys/rman.h> @@ -74,7 +73,6 @@ __FBSDID("$FreeBSD$"); #include <arm/sa11x0/sa11x0_dmacreg.h> #include <arm/sa11x0/sa11x0_ppcreg.h> #include <arm/sa11x0/sa11x0_gpioreg.h> -#include <machine/bus.h> extern void sa11x0_activateirqs(void); Modified: head/sys/mips/atheros/ar71xx_chip.c ============================================================================== --- head/sys/mips/atheros/ar71xx_chip.c Sun Jun 26 09:32:46 2011 (r223561) +++ head/sys/mips/atheros/ar71xx_chip.c Sun Jun 26 10:07:48 2011 (r223562) @@ -27,11 +27,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/param.h> -#include <machine/cpuregs.h> - -#include <mips/sentry5/s5reg.h> - #include "opt_ddb.h" #include <sys/param.h> @@ -50,6 +45,7 @@ __FBSDID("$FreeBSD$"); #include <machine/clock.h> #include <machine/cpu.h> +#include <machine/cpuregs.h> #include <machine/hwfunc.h> #include <machine/md_var.h> #include <machine/trap.h> @@ -61,6 +57,8 @@ __FBSDID("$FreeBSD$"); #include <mips/atheros/ar71xx_cpudef.h> +#include <mips/sentry5/s5reg.h> + /* XXX these should replace the current definitions in ar71xxreg.h */ /* XXX perhaps an ar71xx_chip.h header file? */ #define AR71XX_PLL_REG_CPU_CONFIG AR71XX_PLL_CPU_BASE + 0x00 Modified: head/sys/mips/atheros/ar71xx_machdep.c ============================================================================== --- head/sys/mips/atheros/ar71xx_machdep.c Sun Jun 26 09:32:46 2011 (r223561) +++ head/sys/mips/atheros/ar71xx_machdep.c Sun Jun 26 10:07:48 2011 (r223562) @@ -27,11 +27,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/param.h> -#include <machine/cpuregs.h> - -#include <mips/sentry5/s5reg.h> - #include "opt_ddb.h" #include <sys/param.h> @@ -50,6 +45,7 @@ __FBSDID("$FreeBSD$"); #include <machine/clock.h> #include <machine/cpu.h> +#include <machine/cpuregs.h> #include <machine/hwfunc.h> #include <machine/md_var.h> #include <machine/trap.h> @@ -60,6 +56,8 @@ __FBSDID("$FreeBSD$"); #include <mips/atheros/ar71xx_setup.h> #include <mips/atheros/ar71xx_cpudef.h> +#include <mips/sentry5/s5reg.h> + extern char edata[], end[]; uint32_t ar711_base_mac[ETHER_ADDR_LEN]; Modified: head/sys/mips/atheros/ar71xx_ohci.c ============================================================================== --- head/sys/mips/atheros/ar71xx_ohci.c Sun Jun 26 09:32:46 2011 (r223561) +++ head/sys/mips/atheros/ar71xx_ohci.c Sun Jun 26 10:07:48 2011 (r223562) @@ -49,8 +49,6 @@ __FBSDID("$FreeBSD$"); #include <dev/usb/controller/ohci.h> #include <dev/usb/controller/ohcireg.h> -#include <sys/rman.h> - static int ar71xx_ohci_attach(device_t dev); static int ar71xx_ohci_detach(device_t dev); static int ar71xx_ohci_probe(device_t dev); Modified: head/sys/mips/atheros/ar71xx_setup.c ============================================================================== --- head/sys/mips/atheros/ar71xx_setup.c Sun Jun 26 09:32:46 2011 (r223561) +++ head/sys/mips/atheros/ar71xx_setup.c Sun Jun 26 10:07:48 2011 (r223562) @@ -27,11 +27,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/param.h> -#include <machine/cpuregs.h> - -#include <mips/sentry5/s5reg.h> - #include "opt_ddb.h" #include <sys/param.h> @@ -50,6 +45,7 @@ __FBSDID("$FreeBSD$"); #include <machine/clock.h> #include <machine/cpu.h> +#include <machine/cpuregs.h> #include <machine/hwfunc.h> #include <machine/md_var.h> #include <machine/trap.h> @@ -64,6 +60,8 @@ __FBSDID("$FreeBSD$"); #include <mips/atheros/ar724x_chip.h> #include <mips/atheros/ar91xx_chip.h> +#include <mips/sentry5/s5reg.h> + #define AR71XX_SYS_TYPE_LEN 128 static char ar71xx_sys_type[AR71XX_SYS_TYPE_LEN]; Modified: head/sys/mips/atheros/ar724x_chip.c ============================================================================== --- head/sys/mips/atheros/ar724x_chip.c Sun Jun 26 09:32:46 2011 (r223561) +++ head/sys/mips/atheros/ar724x_chip.c Sun Jun 26 10:07:48 2011 (r223562) @@ -27,11 +27,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/param.h> -#include <machine/cpuregs.h> - -#include <mips/sentry5/s5reg.h> - #include "opt_ddb.h" #include <sys/param.h> @@ -50,6 +45,7 @@ __FBSDID("$FreeBSD$"); #include <machine/clock.h> #include <machine/cpu.h> +#include <machine/cpuregs.h> #include <machine/hwfunc.h> #include <machine/md_var.h> #include <machine/trap.h> @@ -62,6 +58,8 @@ __FBSDID("$FreeBSD$"); #include <mips/atheros/ar71xx_setup.h> #include <mips/atheros/ar724x_chip.h> +#include <mips/sentry5/s5reg.h> + static void ar724x_chip_detect_mem_size(void) { Modified: head/sys/mips/atheros/ar91xx_chip.c ============================================================================== --- head/sys/mips/atheros/ar91xx_chip.c Sun Jun 26 09:32:46 2011 (r223561) +++ head/sys/mips/atheros/ar91xx_chip.c Sun Jun 26 10:07:48 2011 (r223562) @@ -27,11 +27,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/param.h> -#include <machine/cpuregs.h> - -#include <mips/sentry5/s5reg.h> - #include "opt_ddb.h" #include <sys/param.h> @@ -50,6 +45,7 @@ __FBSDID("$FreeBSD$"); #include <machine/clock.h> #include <machine/cpu.h> +#include <machine/cpuregs.h> #include <machine/hwfunc.h> #include <machine/md_var.h> #include <machine/trap.h> @@ -61,6 +57,8 @@ __FBSDID("$FreeBSD$"); #include <mips/atheros/ar71xx_cpudef.h> #include <mips/atheros/ar91xx_chip.h> +#include <mips/sentry5/s5reg.h> + static void ar91xx_chip_detect_mem_size(void) { Modified: head/sys/mips/mips/genassym.c ============================================================================== --- head/sys/mips/mips/genassym.c Sun Jun 26 09:32:46 2011 (r223561) +++ head/sys/mips/mips/genassym.c Sun Jun 26 10:07:48 2011 (r223562) @@ -53,7 +53,6 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_param.h> #include <vm/pmap.h> #include <vm/vm_map.h> -#include <sys/proc.h> #include <machine/cpuregs.h> #include <machine/pcb.h> #include <machine/sigframe.h> Modified: head/sys/mips/mips/trap.c ============================================================================== --- head/sys/mips/mips/trap.c Sun Jun 26 09:32:46 2011 (r223561) +++ head/sys/mips/mips/trap.c Sun Jun 26 10:07:48 2011 (r223562) @@ -91,10 +91,6 @@ __FBSDID("$FreeBSD$"); #include <sys/kdb.h> #endif -#include <sys/cdefs.h> -#include <sys/syslog.h> - - #ifdef TRAP_DEBUG int trap_debug = 0; SYSCTL_INT(_machdep, OID_AUTO, trap_debug, CTLFLAG_RW, Modified: head/sys/mips/rmi/dev/xlr/rge.c ============================================================================== --- head/sys/mips/rmi/dev/xlr/rge.c Sun Jun 26 09:32:46 2011 (r223561) +++ head/sys/mips/rmi/dev/xlr/rge.c Sun Jun 26 10:07:48 2011 (r223562) @@ -78,8 +78,6 @@ __FBSDID("$FreeBSD$"); #include <machine/cpu.h> #include <machine/mips_opcode.h> #include <machine/asm.h> -#include <mips/rmi/rmi_mips_exts.h> -#include <machine/cpuregs.h> #include <machine/param.h> #include <machine/intr_machdep.h> Modified: head/sys/mips/rmi/fmn.c ============================================================================== --- head/sys/mips/rmi/fmn.c Sun Jun 26 09:32:46 2011 (r223561) +++ head/sys/mips/rmi/fmn.c Sun Jun 26 10:07:48 2011 (r223562) @@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$"); #include <sys/ktr.h> #include <sys/kernel.h> #include <sys/kthread.h> -#include <sys/proc.h> #include <sys/resourcevar.h> #include <sys/sched.h> #include <sys/unistd.h> Modified: head/sys/mips/rmi/iodi.c ============================================================================== --- head/sys/mips/rmi/iodi.c Sun Jun 26 09:32:46 2011 (r223561) +++ head/sys/mips/rmi/iodi.c Sun Jun 26 10:07:48 2011 (r223562) @@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$"); #include <sys/rman.h> #include <sys/types.h> #include <sys/malloc.h> -#include <sys/bus.h> #include <sys/interrupt.h> #include <sys/module.h> Modified: head/sys/mips/sentry5/s5_machdep.c ============================================================================== --- head/sys/mips/sentry5/s5_machdep.c Sun Jun 26 09:32:46 2011 (r223561) +++ head/sys/mips/sentry5/s5_machdep.c Sun Jun 26 10:07:48 2011 (r223562) @@ -27,11 +27,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/param.h> -#include <machine/cpuregs.h> - -#include <mips/sentry5/s5reg.h> - #include "opt_ddb.h" #include <sys/param.h> @@ -75,6 +70,8 @@ __FBSDID("$FreeBSD$"); #include <machine/trap.h> #include <machine/vmparam.h> +#include <mips/sentry5/s5reg.h> + #ifdef CFE #include <dev/cfe/cfe_api.h> #endif Modified: head/sys/mips/sibyte/sb_machdep.c ============================================================================== --- head/sys/mips/sibyte/sb_machdep.c Sun Jun 26 09:32:46 2011 (r223561) +++ head/sys/mips/sibyte/sb_machdep.c Sun Jun 26 10:07:48 2011 (r223562) @@ -27,8 +27,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/param.h> - #include "opt_ddb.h" #include "opt_kdb.h"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201106261007.p5QA7m6Z048636>