diff options
author | Oleksandr Tymoshenko <gonzo@FreeBSD.org> | 2008-09-10 03:49:08 +0000 |
---|---|---|
committer | Oleksandr Tymoshenko <gonzo@FreeBSD.org> | 2008-09-10 03:49:08 +0000 |
commit | c30b5c7330b8ee8af57d97694cb18bcf3e1a15cb (patch) | |
tree | 783e25f9509c1573c46d90b3b644df1bbb1a1c82 /sys/mips | |
parent | d8cabb0b9ebb604e61536a4611c6588385d355bc (diff) | |
download | src-c30b5c7330b8ee8af57d97694cb18bcf3e1a15cb.tar.gz src-c30b5c7330b8ee8af57d97694cb18bcf3e1a15cb.zip |
Fix path in all includes: remove /mips32 subdirectory
Notes
Notes:
svn path=/head/; revision=182901
Diffstat (limited to 'sys/mips')
-rw-r--r-- | sys/mips/adm5120/admpci.c | 2 | ||||
-rw-r--r-- | sys/mips/adm5120/if_admsw.c | 6 | ||||
-rw-r--r-- | sys/mips/adm5120/if_admswvar.h | 4 | ||||
-rw-r--r-- | sys/mips/adm5120/obio.c | 4 | ||||
-rw-r--r-- | sys/mips/adm5120/uart_bus_adm5120.c | 2 | ||||
-rw-r--r-- | sys/mips/adm5120/uart_cpu_adm5120.c | 2 | ||||
-rw-r--r-- | sys/mips/adm5120/uart_dev_adm5120.c | 2 | ||||
-rw-r--r-- | sys/mips/idt/idtpci.c | 2 | ||||
-rw-r--r-- | sys/mips/idt/if_kr.c | 2 | ||||
-rw-r--r-- | sys/mips/idt/obio.c | 4 | ||||
-rw-r--r-- | sys/mips/idt/uart_bus_rc32434.c | 2 | ||||
-rw-r--r-- | sys/mips/malta/gt.c | 2 | ||||
-rw-r--r-- | sys/mips/malta/gt_pci.c | 6 | ||||
-rw-r--r-- | sys/mips/malta/malta_machdep.c | 4 | ||||
-rw-r--r-- | sys/mips/malta/obio.c | 4 | ||||
-rw-r--r-- | sys/mips/malta/uart_bus_maltausart.c | 2 | ||||
-rw-r--r-- | sys/mips/malta/uart_cpu_maltausart.c | 2 | ||||
-rw-r--r-- | sys/mips/malta/yamon.c | 2 | ||||
-rw-r--r-- | sys/mips/sentry5/obio.c | 4 | ||||
-rw-r--r-- | sys/mips/sentry5/s5_machdep.c | 2 | ||||
-rw-r--r-- | sys/mips/sentry5/uart_bus_sbusart.c | 2 | ||||
-rw-r--r-- | sys/mips/sentry5/uart_cpu_sbusart.c | 2 |
22 files changed, 32 insertions, 32 deletions
diff --git a/sys/mips/adm5120/admpci.c b/sys/mips/adm5120/admpci.c index 741a2fa46d63..0ae753019132 100644 --- a/sys/mips/adm5120/admpci.c +++ b/sys/mips/adm5120/admpci.c @@ -87,7 +87,7 @@ __FBSDID("$FreeBSD$"); #include <dev/pci/pcib_private.h> #include "pcib_if.h" -#include <mips/mips32/adm5120/adm5120reg.h> +#include <mips/adm5120/adm5120reg.h> #ifdef ADMPCI_DEBUG int admpci_debug = 1; diff --git a/sys/mips/adm5120/if_admsw.c b/sys/mips/adm5120/if_admsw.c index c6f57e5d4f28..a1c5b5081cba 100644 --- a/sys/mips/adm5120/if_admsw.c +++ b/sys/mips/adm5120/if_admsw.c @@ -109,9 +109,9 @@ __FBSDID("$FreeBSD$"); #include <net/bpf.h> #include <net/bpfdesc.h> -#include <mips/mips32/adm5120/adm5120reg.h> -#include <mips/mips32/adm5120/if_admswreg.h> -#include <mips/mips32/adm5120/if_admswvar.h> +#include <mips/adm5120/adm5120reg.h> +#include <mips/adm5120/if_admswreg.h> +#include <mips/adm5120/if_admswvar.h> /* TODO: add locking */ #define ADMSW_LOCK(sc) do {} while(0); diff --git a/sys/mips/adm5120/if_admswvar.h b/sys/mips/adm5120/if_admswvar.h index ea252885972d..a94bb89f3a19 100644 --- a/sys/mips/adm5120/if_admswvar.h +++ b/sys/mips/adm5120/if_admswvar.h @@ -70,8 +70,8 @@ __FBSDID("$FreeBSD$"); #include <dev/mii/mii.h> #include <dev/mii/miivar.h> -#include <mips/mips32/adm5120/adm5120reg.h> -#include <mips/mips32/adm5120/if_admswreg.h> +#include <mips/adm5120/adm5120reg.h> +#include <mips/adm5120/if_admswreg.h> #define MAC_BUFLEN 0x07ff diff --git a/sys/mips/adm5120/obio.c b/sys/mips/adm5120/obio.c index e4ca26403bd4..4123a239f164 100644 --- a/sys/mips/adm5120/obio.c +++ b/sys/mips/adm5120/obio.c @@ -49,8 +49,8 @@ __FBSDID("$FreeBSD$"); #include <machine/bus.h> -#include <mips/mips32/adm5120/adm5120reg.h> -#include <mips/mips32/adm5120/obiovar.h> +#include <mips/adm5120/adm5120reg.h> +#include <mips/adm5120/obiovar.h> /* MIPS HW interrupts of IRQ/FIQ respectively */ #define ADM5120_INTR 0 diff --git a/sys/mips/adm5120/uart_bus_adm5120.c b/sys/mips/adm5120/uart_bus_adm5120.c index b3b7b67dd5d8..8d7943f23510 100644 --- a/sys/mips/adm5120/uart_bus_adm5120.c +++ b/sys/mips/adm5120/uart_bus_adm5120.c @@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$"); #include <dev/uart/uart_bus.h> #include <dev/uart/uart_cpu.h> -#include <mips/mips32/adm5120/adm5120reg.h> +#include <mips/adm5120/adm5120reg.h> #include "uart_if.h" diff --git a/sys/mips/adm5120/uart_cpu_adm5120.c b/sys/mips/adm5120/uart_cpu_adm5120.c index 0f1ebabceeda..59bed5af2667 100644 --- a/sys/mips/adm5120/uart_cpu_adm5120.c +++ b/sys/mips/adm5120/uart_cpu_adm5120.c @@ -48,7 +48,7 @@ __FBSDID("$FreeBSD$"); #include <dev/uart/uart.h> #include <dev/uart/uart_cpu.h> -#include <mips/mips32/adm5120/adm5120reg.h> +#include <mips/adm5120/adm5120reg.h> extern struct uart_class uart_adm5120_uart_class; bus_space_tag_t uart_bus_space_io; diff --git a/sys/mips/adm5120/uart_dev_adm5120.c b/sys/mips/adm5120/uart_dev_adm5120.c index 8cef8f8a1d6d..877538934b8d 100644 --- a/sys/mips/adm5120/uart_dev_adm5120.c +++ b/sys/mips/adm5120/uart_dev_adm5120.c @@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$"); #include <dev/uart/uart_cpu.h> #include <dev/uart/uart_bus.h> -#include <mips/mips32/adm5120/uart_dev_adm5120.h> +#include <mips/adm5120/uart_dev_adm5120.h> #include "uart_if.h" diff --git a/sys/mips/idt/idtpci.c b/sys/mips/idt/idtpci.c index 7e4414faaa0f..c7e31617a5d0 100644 --- a/sys/mips/idt/idtpci.c +++ b/sys/mips/idt/idtpci.c @@ -88,7 +88,7 @@ __FBSDID("$FreeBSD$"); #include <dev/pci/pcib_private.h> #include "pcib_if.h" -#include <mips/mips32/idt/idtreg.h> +#include <mips/idt/idtreg.h> #ifdef IDTPCI_DEBUG int idtpci_debug = 1; diff --git a/sys/mips/idt/if_kr.c b/sys/mips/idt/if_kr.c index 817cff2c6e62..36fcdc9ab743 100644 --- a/sys/mips/idt/if_kr.c +++ b/sys/mips/idt/if_kr.c @@ -69,7 +69,7 @@ MODULE_DEPEND(kr, miibus, 1, 1, 1); #include "miibus_if.h" -#include <mips/mips32/idt/if_krreg.h> +#include <mips/idt/if_krreg.h> #define KR_DEBUG diff --git a/sys/mips/idt/obio.c b/sys/mips/idt/obio.c index c938f72d2bd7..1cf5efbbc301 100644 --- a/sys/mips/idt/obio.c +++ b/sys/mips/idt/obio.c @@ -44,8 +44,8 @@ __FBSDID("$FreeBSD$"); #include <machine/bus.h> -#include <mips/mips32/idt/idtreg.h> -#include <mips/mips32/idt/obiovar.h> +#include <mips/idt/idtreg.h> +#include <mips/idt/obiovar.h> #define ICU_REG_READ(o) \ *((volatile uint32_t *)MIPS_PHYS_TO_KSEG1(IDT_BASE_ICU + (o))) diff --git a/sys/mips/idt/uart_bus_rc32434.c b/sys/mips/idt/uart_bus_rc32434.c index 0626b521bb71..35e937d6ce70 100644 --- a/sys/mips/idt/uart_bus_rc32434.c +++ b/sys/mips/idt/uart_bus_rc32434.c @@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$"); #include <machine/bus.h> #include <sys/rman.h> #include <machine/resource.h> -#include <mips/mips32/idt/idtreg.h> +#include <mips/idt/idtreg.h> #include <dev/pci/pcivar.h> diff --git a/sys/mips/malta/gt.c b/sys/mips/malta/gt.c index daa9e252355a..257ac641652a 100644 --- a/sys/mips/malta/gt.c +++ b/sys/mips/malta/gt.c @@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$"); #include <machine/bus.h> #include <machine/intr_machdep.h> -#include <mips/mips32/malta/gtvar.h> +#include <mips/malta/gtvar.h> static int gt_probe(device_t dev) diff --git a/sys/mips/malta/gt_pci.c b/sys/mips/malta/gt_pci.c index 25210580551f..b6fc3d1159d2 100644 --- a/sys/mips/malta/gt_pci.c +++ b/sys/mips/malta/gt_pci.c @@ -60,10 +60,10 @@ __FBSDID("$FreeBSD$"); #include <machine/cpu.h> #include <machine/pmap.h> -#include <mips/mips32/malta/maltareg.h> +#include <mips/malta/maltareg.h> -#include <mips/mips32/malta/gtreg.h> -#include <mips/mips32/malta/gtvar.h> +#include <mips/malta/gtreg.h> +#include <mips/malta/gtvar.h> #include <isa/isareg.h> #include <dev/ic/i8259.h> diff --git a/sys/mips/malta/malta_machdep.c b/sys/mips/malta/malta_machdep.c index 7464c60de673..c5c28af8b639 100644 --- a/sys/mips/malta/malta_machdep.c +++ b/sys/mips/malta/malta_machdep.c @@ -65,7 +65,7 @@ __FBSDID("$FreeBSD$"); #include <machine/trap.h> #ifdef TICK_USE_YAMON_FREQ -#include <mips/mips32/malta/yamon.h> +#include <mips/malta/yamon.h> #endif #ifdef TICK_USE_MALTA_RTC @@ -74,7 +74,7 @@ __FBSDID("$FreeBSD$"); #include <isa/rtc.h> #endif -#include <mips/mips32/malta/maltareg.h> +#include <mips/malta/maltareg.h> extern int *edata; extern int *end; diff --git a/sys/mips/malta/obio.c b/sys/mips/malta/obio.c index 9e2fd7e2334a..ae486edc97c3 100644 --- a/sys/mips/malta/obio.c +++ b/sys/mips/malta/obio.c @@ -53,8 +53,8 @@ __FBSDID("$FreeBSD$"); #include <machine/bus.h> -#include <mips/mips32/malta/maltareg.h> -#include <mips/mips32/malta/obiovar.h> +#include <mips/malta/maltareg.h> +#include <mips/malta/obiovar.h> int obio_probe(device_t); int obio_attach(device_t); diff --git a/sys/mips/malta/uart_bus_maltausart.c b/sys/mips/malta/uart_bus_maltausart.c index 0d95694107fe..da266a8d54fd 100644 --- a/sys/mips/malta/uart_bus_maltausart.c +++ b/sys/mips/malta/uart_bus_maltausart.c @@ -56,7 +56,7 @@ __FBSDID("$FreeBSD$"); /* * XXXMIPS: */ -#include <mips/mips32/malta/maltareg.h> +#include <mips/malta/maltareg.h> #include "uart_if.h" diff --git a/sys/mips/malta/uart_cpu_maltausart.c b/sys/mips/malta/uart_cpu_maltausart.c index ee5b1630504d..758d9a7fedbe 100644 --- a/sys/mips/malta/uart_cpu_maltausart.c +++ b/sys/mips/malta/uart_cpu_maltausart.c @@ -48,7 +48,7 @@ __FBSDID("$FreeBSD$"); #include <dev/uart/uart.h> #include <dev/uart/uart_cpu.h> -#include <mips/mips32/malta/maltareg.h> +#include <mips/malta/maltareg.h> bus_space_tag_t uart_bus_space_io; bus_space_tag_t uart_bus_space_mem; diff --git a/sys/mips/malta/yamon.c b/sys/mips/malta/yamon.c index 71ea109f3e24..00bfe17d3db4 100644 --- a/sys/mips/malta/yamon.c +++ b/sys/mips/malta/yamon.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> -#include <mips/mips32/malta/yamon.h> +#include <mips/malta/yamon.h> char * yamon_getenv(char *name) diff --git a/sys/mips/sentry5/obio.c b/sys/mips/sentry5/obio.c index 1c1b9c90d0a3..073035800ff6 100644 --- a/sys/mips/sentry5/obio.c +++ b/sys/mips/sentry5/obio.c @@ -55,8 +55,8 @@ __FBSDID("$FreeBSD$"); #include <machine/bus.h> -#include <mips/mips32/sentry5/obiovar.h> -#include <mips/mips32/sentry5/sentry5reg.h> +#include <mips/sentry5/obiovar.h> +#include <mips/sentry5/sentry5reg.h> int obio_probe(device_t); int obio_attach(device_t); diff --git a/sys/mips/sentry5/s5_machdep.c b/sys/mips/sentry5/s5_machdep.c index c8a2bae3f4a4..c758c45daa74 100644 --- a/sys/mips/sentry5/s5_machdep.c +++ b/sys/mips/sentry5/s5_machdep.c @@ -30,7 +30,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <machine/cpuregs.h> -#include <mips/mips32/sentry5/s5reg.h> +#include <mips/sentry5/s5reg.h> #include "opt_ddb.h" diff --git a/sys/mips/sentry5/uart_bus_sbusart.c b/sys/mips/sentry5/uart_bus_sbusart.c index e4808cd8a5ab..21a6f58c019e 100644 --- a/sys/mips/sentry5/uart_bus_sbusart.c +++ b/sys/mips/sentry5/uart_bus_sbusart.c @@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$"); #include <dev/uart/uart_bus.h> #include <dev/uart/uart_cpu.h> -#include <mips/mips32/sentry5/sentry5reg.h> +#include <mips/sentry5/sentry5reg.h> #include "uart_if.h" diff --git a/sys/mips/sentry5/uart_cpu_sbusart.c b/sys/mips/sentry5/uart_cpu_sbusart.c index e1da9b237088..10ee7be94462 100644 --- a/sys/mips/sentry5/uart_cpu_sbusart.c +++ b/sys/mips/sentry5/uart_cpu_sbusart.c @@ -48,7 +48,7 @@ __FBSDID("$FreeBSD$"); #include <dev/uart/uart.h> #include <dev/uart/uart_cpu.h> -#include <mips/mips32/sentry5/sentry5reg.h> +#include <mips/sentry5/sentry5reg.h> bus_space_tag_t uart_bus_space_io; bus_space_tag_t uart_bus_space_mem; |