From 384740dc49ea651ba350704d13ff6be9976e37fe Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Tue, 16 Sep 2008 19:48:51 +0200 Subject: [PATCH] MIPS: Move headfiles to new location below arch/mips/include Signed-off-by: Ralf Baechle --- arch/mips/Makefile | 84 +++++++++---------- .../asm-mips => arch/mips/include/asm}/Kbuild | 0 .../mips/include/asm}/a.out.h | 0 .../asm-mips => arch/mips/include/asm}/abi.h | 0 .../mips/include/asm}/addrspace.h | 0 .../asm-mips => arch/mips/include/asm}/asm.h | 0 .../mips/include/asm}/asmmacro-32.h | 0 .../mips/include/asm}/asmmacro-64.h | 0 .../mips/include/asm}/asmmacro.h | 0 .../mips/include/asm}/atomic.h | 0 .../mips/include/asm}/auxvec.h | 0 .../mips/include/asm}/barrier.h | 0 .../mips/include/asm}/bcache.h | 0 .../mips/include/asm}/bitops.h | 0 .../mips/include/asm}/bootinfo.h | 0 .../mips/include/asm}/branch.h | 0 .../mips/include/asm}/break.h | 0 .../asm-mips => arch/mips/include/asm}/bug.h | 0 .../asm-mips => arch/mips/include/asm}/bugs.h | 0 .../mips/include/asm}/byteorder.h | 0 .../mips/include/asm}/cache.h | 0 .../mips/include/asm}/cachectl.h | 0 .../mips/include/asm}/cacheflush.h | 0 .../mips/include/asm}/cacheops.h | 0 .../mips/include/asm}/checksum.h | 0 .../asm-mips => arch/mips/include/asm}/cmp.h | 0 .../mips/include/asm}/cmpxchg.h | 0 .../mips/include/asm}/compat-signal.h | 0 .../mips/include/asm}/compat.h | 0 .../mips/include/asm}/compiler.h | 0 .../mips/include/asm}/cpu-features.h | 0 .../mips/include/asm}/cpu-info.h | 0 .../asm-mips => arch/mips/include/asm}/cpu.h | 0 .../mips/include/asm}/cputime.h | 0 .../mips/include/asm}/current.h | 0 .../mips/include/asm}/debug.h | 0 .../mips/include/asm}/dec/ecc.h | 0 .../mips/include/asm}/dec/interrupts.h | 0 .../mips/include/asm}/dec/ioasic.h | 0 .../mips/include/asm}/dec/ioasic_addrs.h | 0 .../mips/include/asm}/dec/ioasic_ints.h | 0 .../mips/include/asm}/dec/kn01.h | 0 .../mips/include/asm}/dec/kn02.h | 0 .../mips/include/asm}/dec/kn02ba.h | 0 .../mips/include/asm}/dec/kn02ca.h | 0 .../mips/include/asm}/dec/kn02xa.h | 0 .../mips/include/asm}/dec/kn03.h | 0 .../mips/include/asm}/dec/kn05.h | 0 .../mips/include/asm}/dec/kn230.h | 0 .../mips/include/asm}/dec/machtype.h | 0 .../mips/include/asm}/dec/prom.h | 0 .../mips/include/asm}/dec/system.h | 0 .../mips/include/asm}/delay.h | 0 .../mips/include/asm}/device.h | 0 .../mips/include/asm}/div64.h | 0 .../mips/include/asm}/dma-mapping.h | 0 .../asm-mips => arch/mips/include/asm}/dma.h | 0 .../mips/include/asm}/ds1286.h | 0 .../mips/include/asm}/ds1287.h | 0 .../asm-mips => arch/mips/include/asm}/dsp.h | 0 .../asm-mips => arch/mips/include/asm}/edac.h | 0 .../asm-mips => arch/mips/include/asm}/elf.h | 0 .../mips/include/asm}/emergency-restart.h | 0 .../mips/include/asm}/emma2rh/emma2rh.h | 0 .../mips/include/asm}/emma2rh/markeins.h | 0 .../mips/include/asm}/errno.h | 0 .../asm-mips => arch/mips/include/asm}/fb.h | 0 .../mips/include/asm}/fcntl.h | 0 .../mips/include/asm}/fixmap.h | 0 .../mips/include/asm}/floppy.h | 0 .../mips/include/asm}/fpregdef.h | 0 .../asm-mips => arch/mips/include/asm}/fpu.h | 0 .../mips/include/asm}/fpu_emulator.h | 0 .../mips/include/asm}/futex.h | 0 .../mips/include/asm}/fw/arc/hinv.h | 0 .../mips/include/asm}/fw/arc/types.h | 0 .../mips/include/asm}/fw/cfe/cfe_api.h | 0 .../mips/include/asm}/fw/cfe/cfe_error.h | 0 .../mips/include/asm}/gcmpregs.h | 0 .../asm-mips => arch/mips/include/asm}/gic.h | 0 .../asm-mips => arch/mips/include/asm}/gpio.h | 0 .../mips/include/asm}/gt64120.h | 0 .../mips/include/asm}/hardirq.h | 0 .../mips/include/asm}/hazards.h | 0 .../mips/include/asm}/highmem.h | 0 .../mips/include/asm}/hw_irq.h | 0 .../mips/include/asm}/i8253.h | 0 .../mips/include/asm}/i8259.h | 0 .../asm-mips => arch/mips/include/asm}/ide.h | 0 .../asm-mips => arch/mips/include/asm}/inst.h | 0 .../asm-mips => arch/mips/include/asm}/io.h | 0 .../mips/include/asm}/ioctl.h | 0 .../mips/include/asm}/ioctls.h | 0 .../mips/include/asm}/ip32/crime.h | 0 .../mips/include/asm}/ip32/ip32_ints.h | 0 .../mips/include/asm}/ip32/mace.h | 0 .../mips/include/asm}/ipcbuf.h | 0 .../asm-mips => arch/mips/include/asm}/irq.h | 0 .../mips/include/asm}/irq_cpu.h | 0 .../mips/include/asm}/irq_gt641xx.h | 0 .../mips/include/asm}/irq_regs.h | 0 .../mips/include/asm}/irqflags.h | 0 .../mips/include/asm}/isadep.h | 0 .../asm-mips => arch/mips/include/asm}/jazz.h | 0 .../mips/include/asm}/jazzdma.h | 0 .../mips/include/asm}/kdebug.h | 0 .../mips/include/asm}/kexec.h | 0 .../asm-mips => arch/mips/include/asm}/kgdb.h | 0 .../mips/include/asm}/kmap_types.h | 0 .../asm-mips => arch/mips/include/asm}/kspd.h | 0 .../mips/include/asm}/lasat/ds1603.h | 0 .../mips/include/asm}/lasat/eeprom.h | 0 .../mips/include/asm}/lasat/head.h | 0 .../mips/include/asm}/lasat/lasat.h | 0 .../mips/include/asm}/lasat/lasatint.h | 0 .../mips/include/asm}/lasat/picvue.h | 0 .../mips/include/asm}/lasat/serial.h | 0 .../mips/include/asm}/linkage.h | 0 .../mips/include/asm}/local.h | 0 .../mips/include/asm}/m48t35.h | 0 .../mips/include/asm}/m48t37.h | 0 .../mips/include/asm}/mach-au1x00/au1000.h | 0 .../include/asm}/mach-au1x00/au1000_dma.h | 0 .../include/asm}/mach-au1x00/au1000_gpio.h | 0 .../include/asm}/mach-au1x00/au1100_mmc.h | 0 .../include/asm}/mach-au1x00/au1550_spi.h | 0 .../mips/include/asm}/mach-au1x00/au1xxx.h | 0 .../include/asm}/mach-au1x00/au1xxx_dbdma.h | 0 .../include/asm}/mach-au1x00/au1xxx_ide.h | 0 .../include/asm}/mach-au1x00/au1xxx_psc.h | 0 .../mips/include/asm}/mach-au1x00/gpio.h | 0 .../mips/include/asm}/mach-au1x00/ioremap.h | 0 .../mips/include/asm}/mach-au1x00/prom.h | 0 .../mips/include/asm}/mach-au1x00/war.h | 0 .../mips/include/asm}/mach-bcm47xx/bcm47xx.h | 0 .../mips/include/asm}/mach-bcm47xx/gpio.h | 0 .../mips/include/asm}/mach-bcm47xx/war.h | 0 .../mips/include/asm}/mach-cobalt/cobalt.h | 0 .../asm}/mach-cobalt/cpu-feature-overrides.h | 0 .../mips/include/asm}/mach-cobalt/irq.h | 0 .../include/asm}/mach-cobalt/mach-gt64120.h | 0 .../mips/include/asm}/mach-cobalt/war.h | 0 .../mips/include/asm}/mach-db1x00/db1200.h | 0 .../mips/include/asm}/mach-db1x00/db1x00.h | 0 .../mips/include/asm}/mach-dec/mc146818rtc.h | 0 .../mips/include/asm}/mach-dec/war.h | 0 .../mips/include/asm}/mach-emma2rh/irq.h | 0 .../mips/include/asm}/mach-emma2rh/war.h | 0 .../asm}/mach-excite/cpu-feature-overrides.h | 0 .../mips/include/asm}/mach-excite/excite.h | 0 .../include/asm}/mach-excite/excite_fpga.h | 0 .../asm}/mach-excite/excite_nandflash.h | 0 .../mips/include/asm}/mach-excite/rm9k_eth.h | 0 .../mips/include/asm}/mach-excite/rm9k_wdt.h | 0 .../include/asm}/mach-excite/rm9k_xicap.h | 0 .../mips/include/asm}/mach-excite/war.h | 0 .../asm}/mach-generic/cpu-feature-overrides.h | 0 .../include/asm}/mach-generic/dma-coherence.h | 0 .../mips/include/asm}/mach-generic/floppy.h | 0 .../mips/include/asm}/mach-generic/gpio.h | 0 .../mips/include/asm}/mach-generic/ide.h | 0 .../mips/include/asm}/mach-generic/ioremap.h | 0 .../mips/include/asm}/mach-generic/irq.h | 0 .../asm}/mach-generic/kernel-entry-init.h | 0 .../mips/include/asm}/mach-generic/kmalloc.h | 0 .../include/asm}/mach-generic/mangle-port.h | 0 .../include/asm}/mach-generic/mc146818rtc.h | 0 .../mips/include/asm}/mach-generic/spaces.h | 0 .../mips/include/asm}/mach-generic/topology.h | 0 .../asm}/mach-ip22/cpu-feature-overrides.h | 0 .../mips/include/asm}/mach-ip22/ds1286.h | 0 .../mips/include/asm}/mach-ip22/spaces.h | 0 .../mips/include/asm}/mach-ip22/war.h | 0 .../asm}/mach-ip27/cpu-feature-overrides.h | 0 .../include/asm}/mach-ip27/dma-coherence.h | 0 .../mips/include/asm}/mach-ip27/irq.h | 0 .../asm}/mach-ip27/kernel-entry-init.h | 0 .../mips/include/asm}/mach-ip27/kmalloc.h | 0 .../mips/include/asm}/mach-ip27/mangle-port.h | 0 .../mips/include/asm}/mach-ip27/mmzone.h | 0 .../mips/include/asm}/mach-ip27/spaces.h | 0 .../mips/include/asm}/mach-ip27/topology.h | 0 .../mips/include/asm}/mach-ip27/war.h | 0 .../asm}/mach-ip28/cpu-feature-overrides.h | 0 .../mips/include/asm}/mach-ip28/ds1286.h | 0 .../mips/include/asm}/mach-ip28/spaces.h | 0 .../mips/include/asm}/mach-ip28/war.h | 0 .../asm}/mach-ip32/cpu-feature-overrides.h | 0 .../include/asm}/mach-ip32/dma-coherence.h | 0 .../mips/include/asm}/mach-ip32/kmalloc.h | 0 .../mips/include/asm}/mach-ip32/mangle-port.h | 0 .../mips/include/asm}/mach-ip32/mc146818rtc.h | 0 .../mips/include/asm}/mach-ip32/war.h | 0 .../include/asm}/mach-jazz/dma-coherence.h | 0 .../mips/include/asm}/mach-jazz/floppy.h | 0 .../mips/include/asm}/mach-jazz/mc146818rtc.h | 0 .../mips/include/asm}/mach-jazz/war.h | 0 .../mips/include/asm}/mach-lasat/irq.h | 0 .../include/asm}/mach-lasat/mach-gt64120.h | 0 .../mips/include/asm}/mach-lasat/war.h | 0 .../include/asm}/mach-lemote/dma-coherence.h | 0 .../include/asm}/mach-lemote/mc146818rtc.h | 0 .../mips/include/asm}/mach-lemote/war.h | 0 .../asm}/mach-malta/cpu-feature-overrides.h | 0 .../mips/include/asm}/mach-malta/irq.h | 0 .../asm}/mach-malta/kernel-entry-init.h | 0 .../include/asm}/mach-malta/mach-gt64120.h | 0 .../include/asm}/mach-malta/mc146818rtc.h | 0 .../mips/include/asm}/mach-malta/war.h | 0 .../asm}/mach-mipssim/cpu-feature-overrides.h | 0 .../mips/include/asm}/mach-mipssim/war.h | 0 .../include/asm}/mach-pb1x00/mc146818rtc.h | 0 .../mips/include/asm}/mach-pb1x00/pb1000.h | 0 .../mips/include/asm}/mach-pb1x00/pb1100.h | 0 .../mips/include/asm}/mach-pb1x00/pb1200.h | 0 .../mips/include/asm}/mach-pb1x00/pb1500.h | 0 .../mips/include/asm}/mach-pb1x00/pb1550.h | 0 .../mips/include/asm}/mach-pnx8550/cm.h | 0 .../mips/include/asm}/mach-pnx8550/glb.h | 0 .../mips/include/asm}/mach-pnx8550/int.h | 0 .../asm}/mach-pnx8550/kernel-entry-init.h | 0 .../mips/include/asm}/mach-pnx8550/nand.h | 0 .../mips/include/asm}/mach-pnx8550/pci.h | 0 .../mips/include/asm}/mach-pnx8550/uart.h | 0 .../mips/include/asm}/mach-pnx8550/usb.h | 0 .../mips/include/asm}/mach-pnx8550/war.h | 0 .../asm}/mach-rc32434/cpu-feature-overrides.h | 0 .../mips/include/asm}/mach-rc32434/ddr.h | 0 .../mips/include/asm}/mach-rc32434/dma.h | 0 .../mips/include/asm}/mach-rc32434/dma_v.h | 0 .../mips/include/asm}/mach-rc32434/eth.h | 0 .../mips/include/asm}/mach-rc32434/gpio.h | 0 .../mips/include/asm}/mach-rc32434/integ.h | 0 .../mips/include/asm}/mach-rc32434/irq.h | 0 .../mips/include/asm}/mach-rc32434/pci.h | 0 .../mips/include/asm}/mach-rc32434/prom.h | 0 .../mips/include/asm}/mach-rc32434/rb.h | 0 .../mips/include/asm}/mach-rc32434/rc32434.h | 0 .../mips/include/asm}/mach-rc32434/timer.h | 0 .../mips/include/asm}/mach-rc32434/war.h | 0 .../asm}/mach-rm/cpu-feature-overrides.h | 0 .../mips/include/asm}/mach-rm/mc146818rtc.h | 0 .../mips/include/asm}/mach-rm/war.h | 0 .../asm}/mach-sibyte/cpu-feature-overrides.h | 0 .../mips/include/asm}/mach-sibyte/war.h | 0 .../mips/include/asm}/mach-tx39xx/ioremap.h | 0 .../include/asm}/mach-tx39xx/mangle-port.h | 0 .../mips/include/asm}/mach-tx39xx/war.h | 0 .../asm}/mach-tx49xx/cpu-feature-overrides.h | 0 .../mips/include/asm}/mach-tx49xx/ioremap.h | 0 .../mips/include/asm}/mach-tx49xx/kmalloc.h | 0 .../mips/include/asm}/mach-tx49xx/war.h | 0 .../mips/include/asm}/mach-vr41xx/irq.h | 0 .../mips/include/asm}/mach-vr41xx/war.h | 0 .../include/asm}/mach-wrppmc/mach-gt64120.h | 0 .../mips/include/asm}/mach-wrppmc/war.h | 0 .../mach-yosemite/cpu-feature-overrides.h | 0 .../mips/include/asm}/mach-yosemite/war.h | 0 .../mips/include/asm}/mc146818-time.h | 0 .../mips/include/asm}/mc146818rtc.h | 0 .../mips/include/asm}/mips-boards/bonito64.h | 0 .../mips/include/asm}/mips-boards/generic.h | 0 .../mips/include/asm}/mips-boards/launch.h | 0 .../mips/include/asm}/mips-boards/malta.h | 0 .../mips/include/asm}/mips-boards/maltaint.h | 0 .../mips/include/asm}/mips-boards/msc01_pci.h | 0 .../mips/include/asm}/mips-boards/piix4.h | 0 .../mips/include/asm}/mips-boards/prom.h | 0 .../mips/include/asm}/mips-boards/sim.h | 0 .../mips/include/asm}/mips-boards/simint.h | 0 .../mips/include/asm}/mips_mt.h | 0 .../mips/include/asm}/mipsmtregs.h | 0 .../mips/include/asm}/mipsprom.h | 0 .../mips/include/asm}/mipsregs.h | 0 .../asm-mips => arch/mips/include/asm}/mman.h | 0 .../asm-mips => arch/mips/include/asm}/mmu.h | 0 .../mips/include/asm}/mmu_context.h | 8 +- .../mips/include/asm}/mmzone.h | 0 .../mips/include/asm}/module.h | 0 .../mips/include/asm}/msc01_ic.h | 0 .../mips/include/asm}/msgbuf.h | 0 .../mips/include/asm}/mutex.h | 0 .../mips/include/asm}/nile4.h | 0 .../mips/include/asm}/paccess.h | 0 .../asm-mips => arch/mips/include/asm}/page.h | 0 .../mips/include/asm}/param.h | 0 .../mips/include/asm}/parport.h | 0 .../asm-mips => arch/mips/include/asm}/pci.h | 0 .../mips/include/asm}/pci/bridge.h | 0 .../mips/include/asm}/percpu.h | 0 .../mips/include/asm}/pgalloc.h | 0 .../mips/include/asm}/pgtable-32.h | 0 .../mips/include/asm}/pgtable-64.h | 0 .../mips/include/asm}/pgtable-bits.h | 0 .../mips/include/asm}/pgtable.h | 0 .../include/asm}/pmc-sierra/msp71xx/gpio.h | 0 .../asm}/pmc-sierra/msp71xx/msp_cic_int.h | 0 .../include/asm}/pmc-sierra/msp71xx/msp_int.h | 0 .../include/asm}/pmc-sierra/msp71xx/msp_pci.h | 0 .../asm}/pmc-sierra/msp71xx/msp_prom.h | 0 .../asm}/pmc-sierra/msp71xx/msp_regops.h | 0 .../asm}/pmc-sierra/msp71xx/msp_regs.h | 0 .../asm}/pmc-sierra/msp71xx/msp_slp_int.h | 0 .../include/asm}/pmc-sierra/msp71xx/war.h | 0 .../asm-mips => arch/mips/include/asm}/pmon.h | 0 .../asm-mips => arch/mips/include/asm}/poll.h | 0 .../mips/include/asm}/posix_types.h | 0 .../mips/include/asm}/prefetch.h | 0 .../mips/include/asm}/processor.h | 0 .../mips/include/asm}/ptrace.h | 0 .../mips/include/asm}/r4k-timer.h | 0 .../mips/include/asm}/r4kcache.h | 0 .../mips/include/asm}/reboot.h | 0 .../asm-mips => arch/mips/include/asm}/reg.h | 0 .../mips/include/asm}/regdef.h | 0 .../mips/include/asm}/resource.h | 0 .../mips/include/asm}/rm9k-ocd.h | 0 .../asm-mips => arch/mips/include/asm}/rtlx.h | 0 .../mips/include/asm}/scatterlist.h | 0 .../mips/include/asm}/seccomp.h | 0 .../mips/include/asm}/sections.h | 0 .../mips/include/asm}/segment.h | 0 .../mips/include/asm}/sembuf.h | 0 .../mips/include/asm}/serial.h | 0 .../mips/include/asm}/setup.h | 0 .../mips/include/asm}/sgi/gio.h | 0 .../mips/include/asm}/sgi/hpc3.h | 0 .../mips/include/asm}/sgi/ioc.h | 0 .../mips/include/asm}/sgi/ip22.h | 0 .../mips/include/asm}/sgi/mc.h | 0 .../mips/include/asm}/sgi/pi1.h | 0 .../mips/include/asm}/sgi/seeq.h | 0 .../mips/include/asm}/sgi/sgi.h | 0 .../mips/include/asm}/sgi/wd.h | 0 .../mips/include/asm}/sgialib.h | 0 .../mips/include/asm}/sgiarcs.h | 0 .../mips/include/asm}/sgidefs.h | 0 .../mips/include/asm}/shmbuf.h | 0 .../mips/include/asm}/shmparam.h | 0 .../mips/include/asm}/sibyte/bcm1480_int.h | 0 .../mips/include/asm}/sibyte/bcm1480_l2c.h | 0 .../mips/include/asm}/sibyte/bcm1480_mc.h | 0 .../mips/include/asm}/sibyte/bcm1480_regs.h | 0 .../mips/include/asm}/sibyte/bcm1480_scd.h | 0 .../mips/include/asm}/sibyte/bigsur.h | 0 .../mips/include/asm}/sibyte/board.h | 0 .../mips/include/asm}/sibyte/carmel.h | 0 .../mips/include/asm}/sibyte/sb1250.h | 0 .../mips/include/asm}/sibyte/sb1250_defs.h | 0 .../mips/include/asm}/sibyte/sb1250_dma.h | 0 .../mips/include/asm}/sibyte/sb1250_genbus.h | 0 .../mips/include/asm}/sibyte/sb1250_int.h | 0 .../mips/include/asm}/sibyte/sb1250_l2c.h | 0 .../mips/include/asm}/sibyte/sb1250_ldt.h | 0 .../mips/include/asm}/sibyte/sb1250_mac.h | 0 .../mips/include/asm}/sibyte/sb1250_mc.h | 0 .../mips/include/asm}/sibyte/sb1250_regs.h | 0 .../mips/include/asm}/sibyte/sb1250_scd.h | 0 .../mips/include/asm}/sibyte/sb1250_smbus.h | 0 .../mips/include/asm}/sibyte/sb1250_syncser.h | 0 .../mips/include/asm}/sibyte/sb1250_uart.h | 0 .../mips/include/asm}/sibyte/sentosa.h | 0 .../mips/include/asm}/sibyte/swarm.h | 0 .../mips/include/asm}/sigcontext.h | 0 .../mips/include/asm}/siginfo.h | 0 .../mips/include/asm}/signal.h | 0 .../asm-mips => arch/mips/include/asm}/sim.h | 0 .../mips/include/asm}/smp-ops.h | 0 .../asm-mips => arch/mips/include/asm}/smp.h | 0 .../asm-mips => arch/mips/include/asm}/smtc.h | 0 .../mips/include/asm}/smtc_ipi.h | 0 .../mips/include/asm}/smtc_proc.h | 0 .../asm-mips => arch/mips/include/asm}/smvp.h | 0 .../mips/include/asm}/sn/addrs.h | 0 .../mips/include/asm}/sn/agent.h | 0 .../mips/include/asm}/sn/arch.h | 0 .../mips/include/asm}/sn/fru.h | 0 .../mips/include/asm}/sn/gda.h | 0 .../mips/include/asm}/sn/hub.h | 0 .../mips/include/asm}/sn/intr.h | 0 .../mips/include/asm}/sn/io.h | 0 .../mips/include/asm}/sn/ioc3.h | 0 .../mips/include/asm}/sn/klconfig.h | 36 ++++---- .../mips/include/asm}/sn/kldir.h | 0 .../mips/include/asm}/sn/klkernvars.h | 0 .../mips/include/asm}/sn/launch.h | 0 .../mips/include/asm}/sn/mapped_kernel.h | 0 .../mips/include/asm}/sn/nmi.h | 0 .../mips/include/asm}/sn/sn0/addrs.h | 0 .../mips/include/asm}/sn/sn0/arch.h | 0 .../mips/include/asm}/sn/sn0/hub.h | 0 .../mips/include/asm}/sn/sn0/hubio.h | 36 ++++---- .../mips/include/asm}/sn/sn0/hubmd.h | 0 .../mips/include/asm}/sn/sn0/hubni.h | 0 .../mips/include/asm}/sn/sn0/hubpi.h | 0 .../mips/include/asm}/sn/sn0/ip27.h | 0 .../mips/include/asm}/sn/sn_private.h | 0 .../mips/include/asm}/sn/types.h | 0 .../asm-mips => arch/mips/include/asm}/sni.h | 0 .../mips/include/asm}/socket.h | 0 .../mips/include/asm}/sockios.h | 0 .../mips/include/asm}/sparsemem.h | 0 .../mips/include/asm}/spinlock.h | 0 .../mips/include/asm}/spinlock_types.h | 0 .../mips/include/asm}/stackframe.h | 0 .../mips/include/asm}/stacktrace.h | 0 .../asm-mips => arch/mips/include/asm}/stat.h | 0 .../mips/include/asm}/statfs.h | 0 .../mips/include/asm}/string.h | 0 .../mips/include/asm}/suspend.h | 0 .../mips/include/asm}/sysmips.h | 0 .../mips/include/asm}/system.h | 0 .../mips/include/asm}/termbits.h | 0 .../mips/include/asm}/termios.h | 0 .../mips/include/asm}/thread_info.h | 0 .../asm-mips => arch/mips/include/asm}/time.h | 0 .../mips/include/asm}/timex.h | 0 .../mips/include/asm}/titan_dep.h | 0 .../asm-mips => arch/mips/include/asm}/tlb.h | 0 .../mips/include/asm}/tlbdebug.h | 0 .../mips/include/asm}/tlbflush.h | 0 .../mips/include/asm}/topology.h | 0 .../mips/include/asm}/traps.h | 0 .../mips/include/asm}/txx9/boards.h | 0 .../mips/include/asm}/txx9/generic.h | 0 .../mips/include/asm}/txx9/jmr3927.h | 0 .../mips/include/asm}/txx9/pci.h | 0 .../mips/include/asm}/txx9/rbtx4927.h | 0 .../mips/include/asm}/txx9/rbtx4938.h | 0 .../mips/include/asm}/txx9/rbtx4939.h | 0 .../mips/include/asm}/txx9/smsc_fdc37m81x.h | 0 .../mips/include/asm}/txx9/spi.h | 0 .../mips/include/asm}/txx9/tx3927.h | 0 .../mips/include/asm}/txx9/tx4927.h | 0 .../mips/include/asm}/txx9/tx4927pcic.h | 0 .../mips/include/asm}/txx9/tx4938.h | 0 .../mips/include/asm}/txx9/tx4939.h | 0 .../mips/include/asm}/txx9irq.h | 0 .../mips/include/asm}/txx9pio.h | 0 .../mips/include/asm}/txx9tmr.h | 0 .../mips/include/asm}/types.h | 0 .../mips/include/asm}/uaccess.h | 0 .../mips/include/asm}/ucontext.h | 0 .../mips/include/asm}/unaligned.h | 0 .../mips/include/asm}/unistd.h | 0 .../asm-mips => arch/mips/include/asm}/user.h | 0 .../asm-mips => arch/mips/include/asm}/vga.h | 0 .../asm-mips => arch/mips/include/asm}/vpe.h | 0 .../mips/include/asm}/vr41xx/capcella.h | 0 .../mips/include/asm}/vr41xx/giu.h | 0 .../mips/include/asm}/vr41xx/irq.h | 0 .../mips/include/asm}/vr41xx/mpc30x.h | 0 .../mips/include/asm}/vr41xx/pci.h | 0 .../mips/include/asm}/vr41xx/siu.h | 0 .../mips/include/asm}/vr41xx/tb0219.h | 0 .../mips/include/asm}/vr41xx/tb0226.h | 0 .../mips/include/asm}/vr41xx/tb0287.h | 0 .../mips/include/asm}/vr41xx/vr41xx.h | 0 .../asm-mips => arch/mips/include/asm}/war.h | 0 .../mips/include/asm}/wbflush.h | 0 .../asm-mips => arch/mips/include/asm}/xor.h | 0 .../mips/include/asm}/xtalk/xtalk.h | 0 .../mips/include/asm}/xtalk/xwidget.h | 0 463 files changed, 82 insertions(+), 82 deletions(-) rename {include/asm-mips => arch/mips/include/asm}/Kbuild (100%) rename {include/asm-mips => arch/mips/include/asm}/a.out.h (100%) rename {include/asm-mips => arch/mips/include/asm}/abi.h (100%) rename {include/asm-mips => arch/mips/include/asm}/addrspace.h (100%) rename {include/asm-mips => arch/mips/include/asm}/asm.h (100%) rename {include/asm-mips => arch/mips/include/asm}/asmmacro-32.h (100%) rename {include/asm-mips => arch/mips/include/asm}/asmmacro-64.h (100%) rename {include/asm-mips => arch/mips/include/asm}/asmmacro.h (100%) rename {include/asm-mips => arch/mips/include/asm}/atomic.h (100%) rename {include/asm-mips => arch/mips/include/asm}/auxvec.h (100%) rename {include/asm-mips => arch/mips/include/asm}/barrier.h (100%) rename {include/asm-mips => arch/mips/include/asm}/bcache.h (100%) rename {include/asm-mips => arch/mips/include/asm}/bitops.h (100%) rename {include/asm-mips => arch/mips/include/asm}/bootinfo.h (100%) rename {include/asm-mips => arch/mips/include/asm}/branch.h (100%) rename {include/asm-mips => arch/mips/include/asm}/break.h (100%) rename {include/asm-mips => arch/mips/include/asm}/bug.h (100%) rename {include/asm-mips => arch/mips/include/asm}/bugs.h (100%) rename {include/asm-mips => arch/mips/include/asm}/byteorder.h (100%) rename {include/asm-mips => arch/mips/include/asm}/cache.h (100%) rename {include/asm-mips => arch/mips/include/asm}/cachectl.h (100%) rename {include/asm-mips => arch/mips/include/asm}/cacheflush.h (100%) rename {include/asm-mips => arch/mips/include/asm}/cacheops.h (100%) rename {include/asm-mips => arch/mips/include/asm}/checksum.h (100%) rename {include/asm-mips => arch/mips/include/asm}/cmp.h (100%) rename {include/asm-mips => arch/mips/include/asm}/cmpxchg.h (100%) rename {include/asm-mips => arch/mips/include/asm}/compat-signal.h (100%) rename {include/asm-mips => arch/mips/include/asm}/compat.h (100%) rename {include/asm-mips => arch/mips/include/asm}/compiler.h (100%) rename {include/asm-mips => arch/mips/include/asm}/cpu-features.h (100%) rename {include/asm-mips => arch/mips/include/asm}/cpu-info.h (100%) rename {include/asm-mips => arch/mips/include/asm}/cpu.h (100%) rename {include/asm-mips => arch/mips/include/asm}/cputime.h (100%) rename {include/asm-mips => arch/mips/include/asm}/current.h (100%) rename {include/asm-mips => arch/mips/include/asm}/debug.h (100%) rename {include/asm-mips => arch/mips/include/asm}/dec/ecc.h (100%) rename {include/asm-mips => arch/mips/include/asm}/dec/interrupts.h (100%) rename {include/asm-mips => arch/mips/include/asm}/dec/ioasic.h (100%) rename {include/asm-mips => arch/mips/include/asm}/dec/ioasic_addrs.h (100%) rename {include/asm-mips => arch/mips/include/asm}/dec/ioasic_ints.h (100%) rename {include/asm-mips => arch/mips/include/asm}/dec/kn01.h (100%) rename {include/asm-mips => arch/mips/include/asm}/dec/kn02.h (100%) rename {include/asm-mips => arch/mips/include/asm}/dec/kn02ba.h (100%) rename {include/asm-mips => arch/mips/include/asm}/dec/kn02ca.h (100%) rename {include/asm-mips => arch/mips/include/asm}/dec/kn02xa.h (100%) rename {include/asm-mips => arch/mips/include/asm}/dec/kn03.h (100%) rename {include/asm-mips => arch/mips/include/asm}/dec/kn05.h (100%) rename {include/asm-mips => arch/mips/include/asm}/dec/kn230.h (100%) rename {include/asm-mips => arch/mips/include/asm}/dec/machtype.h (100%) rename {include/asm-mips => arch/mips/include/asm}/dec/prom.h (100%) rename {include/asm-mips => arch/mips/include/asm}/dec/system.h (100%) rename {include/asm-mips => arch/mips/include/asm}/delay.h (100%) rename {include/asm-mips => arch/mips/include/asm}/device.h (100%) rename {include/asm-mips => arch/mips/include/asm}/div64.h (100%) rename {include/asm-mips => arch/mips/include/asm}/dma-mapping.h (100%) rename {include/asm-mips => arch/mips/include/asm}/dma.h (100%) rename {include/asm-mips => arch/mips/include/asm}/ds1286.h (100%) rename {include/asm-mips => arch/mips/include/asm}/ds1287.h (100%) rename {include/asm-mips => arch/mips/include/asm}/dsp.h (100%) rename {include/asm-mips => arch/mips/include/asm}/edac.h (100%) rename {include/asm-mips => arch/mips/include/asm}/elf.h (100%) rename {include/asm-mips => arch/mips/include/asm}/emergency-restart.h (100%) rename {include/asm-mips => arch/mips/include/asm}/emma2rh/emma2rh.h (100%) rename {include/asm-mips => arch/mips/include/asm}/emma2rh/markeins.h (100%) rename {include/asm-mips => arch/mips/include/asm}/errno.h (100%) rename {include/asm-mips => arch/mips/include/asm}/fb.h (100%) rename {include/asm-mips => arch/mips/include/asm}/fcntl.h (100%) rename {include/asm-mips => arch/mips/include/asm}/fixmap.h (100%) rename {include/asm-mips => arch/mips/include/asm}/floppy.h (100%) rename {include/asm-mips => arch/mips/include/asm}/fpregdef.h (100%) rename {include/asm-mips => arch/mips/include/asm}/fpu.h (100%) rename {include/asm-mips => arch/mips/include/asm}/fpu_emulator.h (100%) rename {include/asm-mips => arch/mips/include/asm}/futex.h (100%) rename {include/asm-mips => arch/mips/include/asm}/fw/arc/hinv.h (100%) rename {include/asm-mips => arch/mips/include/asm}/fw/arc/types.h (100%) rename {include/asm-mips => arch/mips/include/asm}/fw/cfe/cfe_api.h (100%) rename {include/asm-mips => arch/mips/include/asm}/fw/cfe/cfe_error.h (100%) rename {include/asm-mips => arch/mips/include/asm}/gcmpregs.h (100%) rename {include/asm-mips => arch/mips/include/asm}/gic.h (100%) rename {include/asm-mips => arch/mips/include/asm}/gpio.h (100%) rename {include/asm-mips => arch/mips/include/asm}/gt64120.h (100%) rename {include/asm-mips => arch/mips/include/asm}/hardirq.h (100%) rename {include/asm-mips => arch/mips/include/asm}/hazards.h (100%) rename {include/asm-mips => arch/mips/include/asm}/highmem.h (100%) rename {include/asm-mips => arch/mips/include/asm}/hw_irq.h (100%) rename {include/asm-mips => arch/mips/include/asm}/i8253.h (100%) rename {include/asm-mips => arch/mips/include/asm}/i8259.h (100%) rename {include/asm-mips => arch/mips/include/asm}/ide.h (100%) rename {include/asm-mips => arch/mips/include/asm}/inst.h (100%) rename {include/asm-mips => arch/mips/include/asm}/io.h (100%) rename {include/asm-mips => arch/mips/include/asm}/ioctl.h (100%) rename {include/asm-mips => arch/mips/include/asm}/ioctls.h (100%) rename {include/asm-mips => arch/mips/include/asm}/ip32/crime.h (100%) rename {include/asm-mips => arch/mips/include/asm}/ip32/ip32_ints.h (100%) rename {include/asm-mips => arch/mips/include/asm}/ip32/mace.h (100%) rename {include/asm-mips => arch/mips/include/asm}/ipcbuf.h (100%) rename {include/asm-mips => arch/mips/include/asm}/irq.h (100%) rename {include/asm-mips => arch/mips/include/asm}/irq_cpu.h (100%) rename {include/asm-mips => arch/mips/include/asm}/irq_gt641xx.h (100%) rename {include/asm-mips => arch/mips/include/asm}/irq_regs.h (100%) rename {include/asm-mips => arch/mips/include/asm}/irqflags.h (100%) rename {include/asm-mips => arch/mips/include/asm}/isadep.h (100%) rename {include/asm-mips => arch/mips/include/asm}/jazz.h (100%) rename {include/asm-mips => arch/mips/include/asm}/jazzdma.h (100%) rename {include/asm-mips => arch/mips/include/asm}/kdebug.h (100%) rename {include/asm-mips => arch/mips/include/asm}/kexec.h (100%) rename {include/asm-mips => arch/mips/include/asm}/kgdb.h (100%) rename {include/asm-mips => arch/mips/include/asm}/kmap_types.h (100%) rename {include/asm-mips => arch/mips/include/asm}/kspd.h (100%) rename {include/asm-mips => arch/mips/include/asm}/lasat/ds1603.h (100%) rename {include/asm-mips => arch/mips/include/asm}/lasat/eeprom.h (100%) rename {include/asm-mips => arch/mips/include/asm}/lasat/head.h (100%) rename {include/asm-mips => arch/mips/include/asm}/lasat/lasat.h (100%) rename {include/asm-mips => arch/mips/include/asm}/lasat/lasatint.h (100%) rename {include/asm-mips => arch/mips/include/asm}/lasat/picvue.h (100%) rename {include/asm-mips => arch/mips/include/asm}/lasat/serial.h (100%) rename {include/asm-mips => arch/mips/include/asm}/linkage.h (100%) rename {include/asm-mips => arch/mips/include/asm}/local.h (100%) rename {include/asm-mips => arch/mips/include/asm}/m48t35.h (100%) rename {include/asm-mips => arch/mips/include/asm}/m48t37.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-au1x00/au1000.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-au1x00/au1000_dma.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-au1x00/au1000_gpio.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-au1x00/au1100_mmc.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-au1x00/au1550_spi.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-au1x00/au1xxx.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-au1x00/au1xxx_dbdma.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-au1x00/au1xxx_ide.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-au1x00/au1xxx_psc.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-au1x00/gpio.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-au1x00/ioremap.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-au1x00/prom.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-au1x00/war.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-bcm47xx/bcm47xx.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-bcm47xx/gpio.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-bcm47xx/war.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-cobalt/cobalt.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-cobalt/cpu-feature-overrides.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-cobalt/irq.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-cobalt/mach-gt64120.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-cobalt/war.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-db1x00/db1200.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-db1x00/db1x00.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-dec/mc146818rtc.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-dec/war.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-emma2rh/irq.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-emma2rh/war.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-excite/cpu-feature-overrides.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-excite/excite.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-excite/excite_fpga.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-excite/excite_nandflash.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-excite/rm9k_eth.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-excite/rm9k_wdt.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-excite/rm9k_xicap.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-excite/war.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-generic/cpu-feature-overrides.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-generic/dma-coherence.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-generic/floppy.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-generic/gpio.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-generic/ide.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-generic/ioremap.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-generic/irq.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-generic/kernel-entry-init.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-generic/kmalloc.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-generic/mangle-port.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-generic/mc146818rtc.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-generic/spaces.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-generic/topology.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-ip22/cpu-feature-overrides.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-ip22/ds1286.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-ip22/spaces.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-ip22/war.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-ip27/cpu-feature-overrides.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-ip27/dma-coherence.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-ip27/irq.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-ip27/kernel-entry-init.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-ip27/kmalloc.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-ip27/mangle-port.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-ip27/mmzone.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-ip27/spaces.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-ip27/topology.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-ip27/war.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-ip28/cpu-feature-overrides.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-ip28/ds1286.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-ip28/spaces.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-ip28/war.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-ip32/cpu-feature-overrides.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-ip32/dma-coherence.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-ip32/kmalloc.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-ip32/mangle-port.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-ip32/mc146818rtc.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-ip32/war.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-jazz/dma-coherence.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-jazz/floppy.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-jazz/mc146818rtc.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-jazz/war.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-lasat/irq.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-lasat/mach-gt64120.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-lasat/war.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-lemote/dma-coherence.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-lemote/mc146818rtc.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-lemote/war.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-malta/cpu-feature-overrides.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-malta/irq.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-malta/kernel-entry-init.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-malta/mach-gt64120.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-malta/mc146818rtc.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-malta/war.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-mipssim/cpu-feature-overrides.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-mipssim/war.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-pb1x00/mc146818rtc.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-pb1x00/pb1000.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-pb1x00/pb1100.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-pb1x00/pb1200.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-pb1x00/pb1500.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-pb1x00/pb1550.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-pnx8550/cm.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-pnx8550/glb.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-pnx8550/int.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-pnx8550/kernel-entry-init.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-pnx8550/nand.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-pnx8550/pci.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-pnx8550/uart.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-pnx8550/usb.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-pnx8550/war.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-rc32434/cpu-feature-overrides.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-rc32434/ddr.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-rc32434/dma.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-rc32434/dma_v.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-rc32434/eth.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-rc32434/gpio.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-rc32434/integ.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-rc32434/irq.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-rc32434/pci.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-rc32434/prom.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-rc32434/rb.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-rc32434/rc32434.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-rc32434/timer.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-rc32434/war.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-rm/cpu-feature-overrides.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-rm/mc146818rtc.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-rm/war.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-sibyte/cpu-feature-overrides.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-sibyte/war.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-tx39xx/ioremap.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-tx39xx/mangle-port.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-tx39xx/war.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-tx49xx/cpu-feature-overrides.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-tx49xx/ioremap.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-tx49xx/kmalloc.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-tx49xx/war.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-vr41xx/irq.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-vr41xx/war.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-wrppmc/mach-gt64120.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-wrppmc/war.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-yosemite/cpu-feature-overrides.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mach-yosemite/war.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mc146818-time.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mc146818rtc.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mips-boards/bonito64.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mips-boards/generic.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mips-boards/launch.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mips-boards/malta.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mips-boards/maltaint.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mips-boards/msc01_pci.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mips-boards/piix4.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mips-boards/prom.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mips-boards/sim.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mips-boards/simint.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mips_mt.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mipsmtregs.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mipsprom.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mipsregs.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mman.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mmu.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mmu_context.h (97%) rename {include/asm-mips => arch/mips/include/asm}/mmzone.h (100%) rename {include/asm-mips => arch/mips/include/asm}/module.h (100%) rename {include/asm-mips => arch/mips/include/asm}/msc01_ic.h (100%) rename {include/asm-mips => arch/mips/include/asm}/msgbuf.h (100%) rename {include/asm-mips => arch/mips/include/asm}/mutex.h (100%) rename {include/asm-mips => arch/mips/include/asm}/nile4.h (100%) rename {include/asm-mips => arch/mips/include/asm}/paccess.h (100%) rename {include/asm-mips => arch/mips/include/asm}/page.h (100%) rename {include/asm-mips => arch/mips/include/asm}/param.h (100%) rename {include/asm-mips => arch/mips/include/asm}/parport.h (100%) rename {include/asm-mips => arch/mips/include/asm}/pci.h (100%) rename {include/asm-mips => arch/mips/include/asm}/pci/bridge.h (100%) rename {include/asm-mips => arch/mips/include/asm}/percpu.h (100%) rename {include/asm-mips => arch/mips/include/asm}/pgalloc.h (100%) rename {include/asm-mips => arch/mips/include/asm}/pgtable-32.h (100%) rename {include/asm-mips => arch/mips/include/asm}/pgtable-64.h (100%) rename {include/asm-mips => arch/mips/include/asm}/pgtable-bits.h (100%) rename {include/asm-mips => arch/mips/include/asm}/pgtable.h (100%) rename {include/asm-mips => arch/mips/include/asm}/pmc-sierra/msp71xx/gpio.h (100%) rename {include/asm-mips => arch/mips/include/asm}/pmc-sierra/msp71xx/msp_cic_int.h (100%) rename {include/asm-mips => arch/mips/include/asm}/pmc-sierra/msp71xx/msp_int.h (100%) rename {include/asm-mips => arch/mips/include/asm}/pmc-sierra/msp71xx/msp_pci.h (100%) rename {include/asm-mips => arch/mips/include/asm}/pmc-sierra/msp71xx/msp_prom.h (100%) rename {include/asm-mips => arch/mips/include/asm}/pmc-sierra/msp71xx/msp_regops.h (100%) rename {include/asm-mips => arch/mips/include/asm}/pmc-sierra/msp71xx/msp_regs.h (100%) rename {include/asm-mips => arch/mips/include/asm}/pmc-sierra/msp71xx/msp_slp_int.h (100%) rename {include/asm-mips => arch/mips/include/asm}/pmc-sierra/msp71xx/war.h (100%) rename {include/asm-mips => arch/mips/include/asm}/pmon.h (100%) rename {include/asm-mips => arch/mips/include/asm}/poll.h (100%) rename {include/asm-mips => arch/mips/include/asm}/posix_types.h (100%) rename {include/asm-mips => arch/mips/include/asm}/prefetch.h (100%) rename {include/asm-mips => arch/mips/include/asm}/processor.h (100%) rename {include/asm-mips => arch/mips/include/asm}/ptrace.h (100%) rename {include/asm-mips => arch/mips/include/asm}/r4k-timer.h (100%) rename {include/asm-mips => arch/mips/include/asm}/r4kcache.h (100%) rename {include/asm-mips => arch/mips/include/asm}/reboot.h (100%) rename {include/asm-mips => arch/mips/include/asm}/reg.h (100%) rename {include/asm-mips => arch/mips/include/asm}/regdef.h (100%) rename {include/asm-mips => arch/mips/include/asm}/resource.h (100%) rename {include/asm-mips => arch/mips/include/asm}/rm9k-ocd.h (100%) rename {include/asm-mips => arch/mips/include/asm}/rtlx.h (100%) rename {include/asm-mips => arch/mips/include/asm}/scatterlist.h (100%) rename {include/asm-mips => arch/mips/include/asm}/seccomp.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sections.h (100%) rename {include/asm-mips => arch/mips/include/asm}/segment.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sembuf.h (100%) rename {include/asm-mips => arch/mips/include/asm}/serial.h (100%) rename {include/asm-mips => arch/mips/include/asm}/setup.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sgi/gio.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sgi/hpc3.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sgi/ioc.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sgi/ip22.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sgi/mc.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sgi/pi1.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sgi/seeq.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sgi/sgi.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sgi/wd.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sgialib.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sgiarcs.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sgidefs.h (100%) rename {include/asm-mips => arch/mips/include/asm}/shmbuf.h (100%) rename {include/asm-mips => arch/mips/include/asm}/shmparam.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sibyte/bcm1480_int.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sibyte/bcm1480_l2c.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sibyte/bcm1480_mc.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sibyte/bcm1480_regs.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sibyte/bcm1480_scd.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sibyte/bigsur.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sibyte/board.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sibyte/carmel.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sibyte/sb1250.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sibyte/sb1250_defs.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sibyte/sb1250_dma.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sibyte/sb1250_genbus.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sibyte/sb1250_int.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sibyte/sb1250_l2c.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sibyte/sb1250_ldt.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sibyte/sb1250_mac.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sibyte/sb1250_mc.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sibyte/sb1250_regs.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sibyte/sb1250_scd.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sibyte/sb1250_smbus.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sibyte/sb1250_syncser.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sibyte/sb1250_uart.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sibyte/sentosa.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sibyte/swarm.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sigcontext.h (100%) rename {include/asm-mips => arch/mips/include/asm}/siginfo.h (100%) rename {include/asm-mips => arch/mips/include/asm}/signal.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sim.h (100%) rename {include/asm-mips => arch/mips/include/asm}/smp-ops.h (100%) rename {include/asm-mips => arch/mips/include/asm}/smp.h (100%) rename {include/asm-mips => arch/mips/include/asm}/smtc.h (100%) rename {include/asm-mips => arch/mips/include/asm}/smtc_ipi.h (100%) rename {include/asm-mips => arch/mips/include/asm}/smtc_proc.h (100%) rename {include/asm-mips => arch/mips/include/asm}/smvp.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sn/addrs.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sn/agent.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sn/arch.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sn/fru.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sn/gda.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sn/hub.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sn/intr.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sn/io.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sn/ioc3.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sn/klconfig.h (96%) rename {include/asm-mips => arch/mips/include/asm}/sn/kldir.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sn/klkernvars.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sn/launch.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sn/mapped_kernel.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sn/nmi.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sn/sn0/addrs.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sn/sn0/arch.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sn/sn0/hub.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sn/sn0/hubio.h (96%) rename {include/asm-mips => arch/mips/include/asm}/sn/sn0/hubmd.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sn/sn0/hubni.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sn/sn0/hubpi.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sn/sn0/ip27.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sn/sn_private.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sn/types.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sni.h (100%) rename {include/asm-mips => arch/mips/include/asm}/socket.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sockios.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sparsemem.h (100%) rename {include/asm-mips => arch/mips/include/asm}/spinlock.h (100%) rename {include/asm-mips => arch/mips/include/asm}/spinlock_types.h (100%) rename {include/asm-mips => arch/mips/include/asm}/stackframe.h (100%) rename {include/asm-mips => arch/mips/include/asm}/stacktrace.h (100%) rename {include/asm-mips => arch/mips/include/asm}/stat.h (100%) rename {include/asm-mips => arch/mips/include/asm}/statfs.h (100%) rename {include/asm-mips => arch/mips/include/asm}/string.h (100%) rename {include/asm-mips => arch/mips/include/asm}/suspend.h (100%) rename {include/asm-mips => arch/mips/include/asm}/sysmips.h (100%) rename {include/asm-mips => arch/mips/include/asm}/system.h (100%) rename {include/asm-mips => arch/mips/include/asm}/termbits.h (100%) rename {include/asm-mips => arch/mips/include/asm}/termios.h (100%) rename {include/asm-mips => arch/mips/include/asm}/thread_info.h (100%) rename {include/asm-mips => arch/mips/include/asm}/time.h (100%) rename {include/asm-mips => arch/mips/include/asm}/timex.h (100%) rename {include/asm-mips => arch/mips/include/asm}/titan_dep.h (100%) rename {include/asm-mips => arch/mips/include/asm}/tlb.h (100%) rename {include/asm-mips => arch/mips/include/asm}/tlbdebug.h (100%) rename {include/asm-mips => arch/mips/include/asm}/tlbflush.h (100%) rename {include/asm-mips => arch/mips/include/asm}/topology.h (100%) rename {include/asm-mips => arch/mips/include/asm}/traps.h (100%) rename {include/asm-mips => arch/mips/include/asm}/txx9/boards.h (100%) rename {include/asm-mips => arch/mips/include/asm}/txx9/generic.h (100%) rename {include/asm-mips => arch/mips/include/asm}/txx9/jmr3927.h (100%) rename {include/asm-mips => arch/mips/include/asm}/txx9/pci.h (100%) rename {include/asm-mips => arch/mips/include/asm}/txx9/rbtx4927.h (100%) rename {include/asm-mips => arch/mips/include/asm}/txx9/rbtx4938.h (100%) rename {include/asm-mips => arch/mips/include/asm}/txx9/rbtx4939.h (100%) rename {include/asm-mips => arch/mips/include/asm}/txx9/smsc_fdc37m81x.h (100%) rename {include/asm-mips => arch/mips/include/asm}/txx9/spi.h (100%) rename {include/asm-mips => arch/mips/include/asm}/txx9/tx3927.h (100%) rename {include/asm-mips => arch/mips/include/asm}/txx9/tx4927.h (100%) rename {include/asm-mips => arch/mips/include/asm}/txx9/tx4927pcic.h (100%) rename {include/asm-mips => arch/mips/include/asm}/txx9/tx4938.h (100%) rename {include/asm-mips => arch/mips/include/asm}/txx9/tx4939.h (100%) rename {include/asm-mips => arch/mips/include/asm}/txx9irq.h (100%) rename {include/asm-mips => arch/mips/include/asm}/txx9pio.h (100%) rename {include/asm-mips => arch/mips/include/asm}/txx9tmr.h (100%) rename {include/asm-mips => arch/mips/include/asm}/types.h (100%) rename {include/asm-mips => arch/mips/include/asm}/uaccess.h (100%) rename {include/asm-mips => arch/mips/include/asm}/ucontext.h (100%) rename {include/asm-mips => arch/mips/include/asm}/unaligned.h (100%) rename {include/asm-mips => arch/mips/include/asm}/unistd.h (100%) rename {include/asm-mips => arch/mips/include/asm}/user.h (100%) rename {include/asm-mips => arch/mips/include/asm}/vga.h (100%) rename {include/asm-mips => arch/mips/include/asm}/vpe.h (100%) rename {include/asm-mips => arch/mips/include/asm}/vr41xx/capcella.h (100%) rename {include/asm-mips => arch/mips/include/asm}/vr41xx/giu.h (100%) rename {include/asm-mips => arch/mips/include/asm}/vr41xx/irq.h (100%) rename {include/asm-mips => arch/mips/include/asm}/vr41xx/mpc30x.h (100%) rename {include/asm-mips => arch/mips/include/asm}/vr41xx/pci.h (100%) rename {include/asm-mips => arch/mips/include/asm}/vr41xx/siu.h (100%) rename {include/asm-mips => arch/mips/include/asm}/vr41xx/tb0219.h (100%) rename {include/asm-mips => arch/mips/include/asm}/vr41xx/tb0226.h (100%) rename {include/asm-mips => arch/mips/include/asm}/vr41xx/tb0287.h (100%) rename {include/asm-mips => arch/mips/include/asm}/vr41xx/vr41xx.h (100%) rename {include/asm-mips => arch/mips/include/asm}/war.h (100%) rename {include/asm-mips => arch/mips/include/asm}/wbflush.h (100%) rename {include/asm-mips => arch/mips/include/asm}/xor.h (100%) rename {include/asm-mips => arch/mips/include/asm}/xtalk/xtalk.h (100%) rename {include/asm-mips => arch/mips/include/asm}/xtalk/xwidget.h (100%) diff --git a/arch/mips/Makefile b/arch/mips/Makefile index 4401a0c1278c..7f39fd8a91fe 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile @@ -170,97 +170,97 @@ libs-$(CONFIG_SIBYTE_CFE) += arch/mips/sibyte/cfe/ # Acer PICA 61, Mips Magnum 4000 and Olivetti M700. # core-$(CONFIG_MACH_JAZZ) += arch/mips/jazz/ -cflags-$(CONFIG_MACH_JAZZ) += -Iinclude/asm-mips/mach-jazz +cflags-$(CONFIG_MACH_JAZZ) += -I$(srctree)/arch/mips/include/asm/mach-jazz load-$(CONFIG_MACH_JAZZ) += 0xffffffff80080000 # # Common Alchemy Au1x00 stuff # core-$(CONFIG_SOC_AU1X00) += arch/mips/alchemy/common/ -cflags-$(CONFIG_SOC_AU1X00) += -Iinclude/asm-mips/mach-au1x00 +cflags-$(CONFIG_SOC_AU1X00) += -I$(srctree)/arch/mips/include/asm/mach-au1x00 # # AMD Alchemy Pb1000 eval board # libs-$(CONFIG_MIPS_PB1000) += arch/mips/alchemy/pb1000/ -cflags-$(CONFIG_MIPS_PB1000) += -Iinclude/asm-mips/mach-pb1x00 +cflags-$(CONFIG_MIPS_PB1000) += -I$(srctree)/arch/mips/include/asm/mach-pb1x00 load-$(CONFIG_MIPS_PB1000) += 0xffffffff80100000 # # AMD Alchemy Pb1100 eval board # libs-$(CONFIG_MIPS_PB1100) += arch/mips/alchemy/pb1100/ -cflags-$(CONFIG_MIPS_PB1100) += -Iinclude/asm-mips/mach-pb1x00 +cflags-$(CONFIG_MIPS_PB1100) += -I$(srctree)/arch/mips/include/asm/mach-pb1x00 load-$(CONFIG_MIPS_PB1100) += 0xffffffff80100000 # # AMD Alchemy Pb1500 eval board # libs-$(CONFIG_MIPS_PB1500) += arch/mips/alchemy/pb1500/ -cflags-$(CONFIG_MIPS_PB1500) += -Iinclude/asm-mips/mach-pb1x00 +cflags-$(CONFIG_MIPS_PB1500) += -I$(srctree)/arch/mips/include/asm/mach-pb1x00 load-$(CONFIG_MIPS_PB1500) += 0xffffffff80100000 # # AMD Alchemy Pb1550 eval board # libs-$(CONFIG_MIPS_PB1550) += arch/mips/alchemy/pb1550/ -cflags-$(CONFIG_MIPS_PB1550) += -Iinclude/asm-mips/mach-pb1x00 +cflags-$(CONFIG_MIPS_PB1550) += -I$(srctree)/arch/mips/include/asm/mach-pb1x00 load-$(CONFIG_MIPS_PB1550) += 0xffffffff80100000 # # AMD Alchemy Pb1200 eval board # libs-$(CONFIG_MIPS_PB1200) += arch/mips/alchemy/pb1200/ -cflags-$(CONFIG_MIPS_PB1200) += -Iinclude/asm-mips/mach-pb1x00 +cflags-$(CONFIG_MIPS_PB1200) += -I$(srctree)/arch/mips/include/asm/mach-pb1x00 load-$(CONFIG_MIPS_PB1200) += 0xffffffff80100000 # # AMD Alchemy Db1000 eval board # libs-$(CONFIG_MIPS_DB1000) += arch/mips/alchemy/db1x00/ -cflags-$(CONFIG_MIPS_DB1000) += -Iinclude/asm-mips/mach-db1x00 +cflags-$(CONFIG_MIPS_DB1000) += -I$(srctree)/arch/mips/include/asm/mach-db1x00 load-$(CONFIG_MIPS_DB1000) += 0xffffffff80100000 # # AMD Alchemy Db1100 eval board # libs-$(CONFIG_MIPS_DB1100) += arch/mips/alchemy/db1x00/ -cflags-$(CONFIG_MIPS_DB1100) += -Iinclude/asm-mips/mach-db1x00 +cflags-$(CONFIG_MIPS_DB1100) += -I$(srctree)/arch/mips/include/asm/mach-db1x00 load-$(CONFIG_MIPS_DB1100) += 0xffffffff80100000 # # AMD Alchemy Db1500 eval board # libs-$(CONFIG_MIPS_DB1500) += arch/mips/alchemy/db1x00/ -cflags-$(CONFIG_MIPS_DB1500) += -Iinclude/asm-mips/mach-db1x00 +cflags-$(CONFIG_MIPS_DB1500) += -I$(srctree)/arch/mips/include/asm/mach-db1x00 load-$(CONFIG_MIPS_DB1500) += 0xffffffff80100000 # # AMD Alchemy Db1550 eval board # libs-$(CONFIG_MIPS_DB1550) += arch/mips/alchemy/db1x00/ -cflags-$(CONFIG_MIPS_DB1550) += -Iinclude/asm-mips/mach-db1x00 +cflags-$(CONFIG_MIPS_DB1550) += -I$(srctree)/arch/mips/include/asm/mach-db1x00 load-$(CONFIG_MIPS_DB1550) += 0xffffffff80100000 # # AMD Alchemy Db1200 eval board # libs-$(CONFIG_MIPS_DB1200) += arch/mips/alchemy/pb1200/ -cflags-$(CONFIG_MIPS_DB1200) += -Iinclude/asm-mips/mach-db1x00 +cflags-$(CONFIG_MIPS_DB1200) += -I$(srctree)/arch/mips/include/asm/mach-db1x00 load-$(CONFIG_MIPS_DB1200) += 0xffffffff80100000 # # AMD Alchemy Bosporus eval board # libs-$(CONFIG_MIPS_BOSPORUS) += arch/mips/alchemy/db1x00/ -cflags-$(CONFIG_MIPS_BOSPORUS) += -Iinclude/asm-mips/mach-db1x00 +cflags-$(CONFIG_MIPS_BOSPORUS) += -I$(srctree)/arch/mips/include/asm/mach-db1x00 load-$(CONFIG_MIPS_BOSPORUS) += 0xffffffff80100000 # # AMD Alchemy Mirage eval board # libs-$(CONFIG_MIPS_MIRAGE) += arch/mips/alchemy/db1x00/ -cflags-$(CONFIG_MIPS_MIRAGE) += -Iinclude/asm-mips/mach-db1x00 +cflags-$(CONFIG_MIPS_MIRAGE) += -I$(srctree)/arch/mips/include/asm/mach-db1x00 load-$(CONFIG_MIPS_MIRAGE) += 0xffffffff80100000 # @@ -279,14 +279,14 @@ load-$(CONFIG_MIPS_XXS1500) += 0xffffffff80100000 # Cobalt Server # core-$(CONFIG_MIPS_COBALT) += arch/mips/cobalt/ -cflags-$(CONFIG_MIPS_COBALT) += -Iinclude/asm-mips/mach-cobalt +cflags-$(CONFIG_MIPS_COBALT) += -I$(srctree)/arch/mips/include/asm/mach-cobalt load-$(CONFIG_MIPS_COBALT) += 0xffffffff80080000 # # DECstation family # core-$(CONFIG_MACH_DECSTATION) += arch/mips/dec/ -cflags-$(CONFIG_MACH_DECSTATION)+= -Iinclude/asm-mips/mach-dec +cflags-$(CONFIG_MACH_DECSTATION)+= -I$(srctree)/arch/mips/include/asm/mach-dec libs-$(CONFIG_MACH_DECSTATION) += arch/mips/dec/prom/ load-$(CONFIG_MACH_DECSTATION) += 0xffffffff80040000 @@ -294,7 +294,7 @@ load-$(CONFIG_MACH_DECSTATION) += 0xffffffff80040000 # Wind River PPMC Board (4KC + GT64120) # core-$(CONFIG_WR_PPMC) += arch/mips/gt64120/wrppmc/ -cflags-$(CONFIG_WR_PPMC) += -Iinclude/asm-mips/mach-wrppmc +cflags-$(CONFIG_WR_PPMC) += -I$(srctree)/arch/mips/include/asm/mach-wrppmc load-$(CONFIG_WR_PPMC) += 0xffffffff80100000 # @@ -302,13 +302,13 @@ load-$(CONFIG_WR_PPMC) += 0xffffffff80100000 # core-$(CONFIG_LEMOTE_FULONG) +=arch/mips/lemote/lm2e/ load-$(CONFIG_LEMOTE_FULONG) +=0xffffffff80100000 -cflags-$(CONFIG_LEMOTE_FULONG) += -Iinclude/asm-mips/mach-lemote +cflags-$(CONFIG_LEMOTE_FULONG) += -I$(srctree)/arch/mips/include/asm/mach-lemote # # MIPS Malta board # core-$(CONFIG_MIPS_MALTA) += arch/mips/mti-malta/ -cflags-$(CONFIG_MIPS_MALTA) += -Iinclude/asm-mips/mach-malta +cflags-$(CONFIG_MIPS_MALTA) += -I$(srctree)/arch/mips/include/asm/mach-malta load-$(CONFIG_MIPS_MALTA) += 0xffffffff80100000 all-$(CONFIG_MIPS_MALTA) := vmlinux.bin @@ -316,14 +316,14 @@ all-$(CONFIG_MIPS_MALTA) := vmlinux.bin # MIPS SIM # core-$(CONFIG_MIPS_SIM) += arch/mips/mipssim/ -cflags-$(CONFIG_MIPS_SIM) += -Iinclude/asm-mips/mach-mipssim +cflags-$(CONFIG_MIPS_SIM) += -I$(srctree)/arch/mips/include/asm/mach-mipssim load-$(CONFIG_MIPS_SIM) += 0x80100000 # # PMC-Sierra MSP SOCs # core-$(CONFIG_PMC_MSP) += arch/mips/pmc-sierra/msp71xx/ -cflags-$(CONFIG_PMC_MSP) += -Iinclude/asm-mips/pmc-sierra/msp71xx \ +cflags-$(CONFIG_PMC_MSP) += -I$(srctree)/arch/mips/include/asm/pmc-sierra/msp71xx \ -mno-branch-likely load-$(CONFIG_PMC_MSP) += 0xffffffff80100000 @@ -331,28 +331,28 @@ load-$(CONFIG_PMC_MSP) += 0xffffffff80100000 # PMC-Sierra Yosemite # core-$(CONFIG_PMC_YOSEMITE) += arch/mips/pmc-sierra/yosemite/ -cflags-$(CONFIG_PMC_YOSEMITE) += -Iinclude/asm-mips/mach-yosemite +cflags-$(CONFIG_PMC_YOSEMITE) += -I$(srctree)/arch/mips/include/asm/mach-yosemite load-$(CONFIG_PMC_YOSEMITE) += 0xffffffff80100000 # # Basler eXcite # core-$(CONFIG_BASLER_EXCITE) += arch/mips/basler/excite/ -cflags-$(CONFIG_BASLER_EXCITE) += -Iinclude/asm-mips/mach-excite +cflags-$(CONFIG_BASLER_EXCITE) += -I$(srctree)/arch/mips/include/asm/mach-excite load-$(CONFIG_BASLER_EXCITE) += 0x80100000 # # LASAT platforms # core-$(CONFIG_LASAT) += arch/mips/lasat/ -cflags-$(CONFIG_LASAT) += -Iinclude/asm-mips/mach-lasat +cflags-$(CONFIG_LASAT) += -I$(srctree)/arch/mips/include/asm/mach-lasat load-$(CONFIG_LASAT) += 0xffffffff80000000 # # Common VR41xx # core-$(CONFIG_MACH_VR41XX) += arch/mips/vr41xx/common/ -cflags-$(CONFIG_MACH_VR41XX) += -Iinclude/asm-mips/mach-vr41xx +cflags-$(CONFIG_MACH_VR41XX) += -I$(srctree)/arch/mips/include/asm/mach-vr41xx # # ZAO Networks Capcella (VR4131) @@ -385,13 +385,13 @@ load-$(CONFIG_TANBAC_TB022X) += 0xffffffff80000000 # Common NXP PNX8550 # core-$(CONFIG_SOC_PNX8550) += arch/mips/nxp/pnx8550/common/ -cflags-$(CONFIG_SOC_PNX8550) += -Iinclude/asm-mips/mach-pnx8550 +cflags-$(CONFIG_SOC_PNX8550) += -I$(srctree)/arch/mips/include/asm/mach-pnx8550 # # NXP PNX8550 JBS board # libs-$(CONFIG_PNX8550_JBS) += arch/mips/nxp/pnx8550/jbs/ -#cflags-$(CONFIG_PNX8550_JBS) += -Iinclude/asm-mips/mach-pnx8550 +#cflags-$(CONFIG_PNX8550_JBS) += -I$(srctree)/arch/mips/include/asm/mach-pnx8550 load-$(CONFIG_PNX8550_JBS) += 0xffffffff80060000 # NXP PNX8550 STB810 board @@ -402,7 +402,7 @@ load-$(CONFIG_PNX8550_STB810) += 0xffffffff80060000 # NEC EMMA2RH boards # core-$(CONFIG_EMMA2RH) += arch/mips/emma2rh/common/ -cflags-$(CONFIG_EMMA2RH) += -Iinclude/asm-mips/mach-emma2rh +cflags-$(CONFIG_EMMA2RH) += -I$(srctree)/arch/mips/include/asm/mach-emma2rh # NEC EMMA2RH Mark-eins core-$(CONFIG_MARKEINS) += arch/mips/emma2rh/markeins/ @@ -418,7 +418,7 @@ load-$(CONFIG_MARKEINS) += 0xffffffff88100000 # address by 8kb. # core-$(CONFIG_SGI_IP22) += arch/mips/sgi-ip22/ -cflags-$(CONFIG_SGI_IP22) += -Iinclude/asm-mips/mach-ip22 +cflags-$(CONFIG_SGI_IP22) += -I$(srctree)/arch/mips/include/asm/mach-ip22 ifdef CONFIG_32BIT load-$(CONFIG_SGI_IP22) += 0xffffffff88002000 endif @@ -435,7 +435,7 @@ endif # ifdef CONFIG_SGI_IP27 core-$(CONFIG_SGI_IP27) += arch/mips/sgi-ip27/ -cflags-$(CONFIG_SGI_IP27) += -Iinclude/asm-mips/mach-ip27 +cflags-$(CONFIG_SGI_IP27) += -I$(srctree)/arch/mips/include/asm/mach-ip27 ifdef CONFIG_MAPPED_KERNEL load-$(CONFIG_SGI_IP27) += 0xc00000004001c000 OBJCOPYFLAGS := --change-addresses=0x3fffffff80000000 @@ -460,7 +460,7 @@ ifdef CONFIG_SGI_IP28 endif endif core-$(CONFIG_SGI_IP28) += arch/mips/sgi-ip22/ -cflags-$(CONFIG_SGI_IP28) += -mr10k-cache-barrier=1 -Iinclude/asm-mips/mach-ip28 +cflags-$(CONFIG_SGI_IP28) += -mr10k-cache-barrier=1 -I$(srctree)/arch/mips/include/asm/mach-ip28 load-$(CONFIG_SGI_IP28) += 0xa800000020004000 # @@ -472,7 +472,7 @@ load-$(CONFIG_SGI_IP28) += 0xa800000020004000 # will break. # core-$(CONFIG_SGI_IP32) += arch/mips/sgi-ip32/ -cflags-$(CONFIG_SGI_IP32) += -Iinclude/asm-mips/mach-ip32 +cflags-$(CONFIG_SGI_IP32) += -I$(srctree)/arch/mips/include/asm/mach-ip32 load-$(CONFIG_SGI_IP32) += 0xffffffff80004000 # @@ -484,22 +484,22 @@ load-$(CONFIG_SGI_IP32) += 0xffffffff80004000 # core-$(CONFIG_SIBYTE_BCM112X) += arch/mips/sibyte/sb1250/ core-$(CONFIG_SIBYTE_BCM112X) += arch/mips/sibyte/common/ -cflags-$(CONFIG_SIBYTE_BCM112X) += -Iinclude/asm-mips/mach-sibyte \ +cflags-$(CONFIG_SIBYTE_BCM112X) += -I$(srctree)/arch/mips/include/asm/mach-sibyte \ -DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1250_112x_ALL core-$(CONFIG_SIBYTE_SB1250) += arch/mips/sibyte/sb1250/ core-$(CONFIG_SIBYTE_SB1250) += arch/mips/sibyte/common/ -cflags-$(CONFIG_SIBYTE_SB1250) += -Iinclude/asm-mips/mach-sibyte \ +cflags-$(CONFIG_SIBYTE_SB1250) += -I$(srctree)/arch/mips/include/asm/mach-sibyte \ -DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1250_112x_ALL core-$(CONFIG_SIBYTE_BCM1x55) += arch/mips/sibyte/bcm1480/ core-$(CONFIG_SIBYTE_BCM1x55) += arch/mips/sibyte/common/ -cflags-$(CONFIG_SIBYTE_BCM1x55) += -Iinclude/asm-mips/mach-sibyte \ +cflags-$(CONFIG_SIBYTE_BCM1x55) += -I$(srctree)/arch/mips/include/asm/mach-sibyte \ -DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1480_ALL core-$(CONFIG_SIBYTE_BCM1x80) += arch/mips/sibyte/bcm1480/ core-$(CONFIG_SIBYTE_BCM1x80) += arch/mips/sibyte/common/ -cflags-$(CONFIG_SIBYTE_BCM1x80) += -Iinclude/asm-mips/mach-sibyte \ +cflags-$(CONFIG_SIBYTE_BCM1x80) += -I$(srctree)/arch/mips/include/asm/mach-sibyte \ -DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1480_ALL # @@ -529,14 +529,14 @@ load-$(CONFIG_SIBYTE_BIGSUR) := 0xffffffff80100000 # Broadcom BCM47XX boards # core-$(CONFIG_BCM47XX) += arch/mips/bcm47xx/ -cflags-$(CONFIG_BCM47XX) += -Iinclude/asm-mips/mach-bcm47xx +cflags-$(CONFIG_BCM47XX) += -I$(srctree)/arch/mips/include/asm/mach-bcm47xx load-$(CONFIG_BCM47XX) := 0xffffffff80001000 # # SNI RM # core-$(CONFIG_SNI_RM) += arch/mips/sni/ -cflags-$(CONFIG_SNI_RM) += -Iinclude/asm-mips/mach-rm +cflags-$(CONFIG_SNI_RM) += -I$(srctree)/arch/mips/include/asm/mach-rm ifdef CONFIG_CPU_LITTLE_ENDIAN load-$(CONFIG_SNI_RM) += 0xffffffff80600000 else @@ -548,10 +548,10 @@ all-$(CONFIG_SNI_RM) := vmlinux.ecoff # Common TXx9 # core-$(CONFIG_MACH_TX39XX) += arch/mips/txx9/generic/ -cflags-$(CONFIG_MACH_TX39XX) += -Iinclude/asm-mips/mach-tx39xx +cflags-$(CONFIG_MACH_TX39XX) += -I$(srctree)/arch/mips/include/asm/mach-tx39xx load-$(CONFIG_MACH_TX39XX) += 0xffffffff80050000 core-$(CONFIG_MACH_TX49XX) += arch/mips/txx9/generic/ -cflags-$(CONFIG_MACH_TX49XX) += -Iinclude/asm-mips/mach-tx49xx +cflags-$(CONFIG_MACH_TX49XX) += -I$(srctree)/arch/mips/include/asm/mach-tx49xx load-$(CONFIG_MACH_TX49XX) += 0xffffffff80100000 # @@ -563,7 +563,7 @@ core-$(CONFIG_TOSHIBA_JMR3927) += arch/mips/txx9/jmr3927/ # Routerboard 532 board # core-$(CONFIG_MIKROTIK_RB532) += arch/mips/rb532/ -cflags-$(CONFIG_MIKROTIK_RB532) += -Iinclude/asm-mips/mach-rc32434 +cflags-$(CONFIG_MIKROTIK_RB532) += -I$(srctree)/arch/mips/include/asm/mach-rc32434 load-$(CONFIG_MIKROTIK_RB532) += 0xffffffff80101000 # @@ -573,7 +573,7 @@ core-$(CONFIG_TOSHIBA_RBTX4927) += arch/mips/txx9/rbtx4927/ core-$(CONFIG_TOSHIBA_RBTX4938) += arch/mips/txx9/rbtx4938/ core-$(CONFIG_TOSHIBA_RBTX4939) += arch/mips/txx9/rbtx4939/ -cflags-y += -Iinclude/asm-mips/mach-generic +cflags-y += -I$(srctree)/arch/mips/include/asm/mach-generic drivers-$(CONFIG_PCI) += arch/mips/pci/ ifdef CONFIG_32BIT diff --git a/include/asm-mips/Kbuild b/arch/mips/include/asm/Kbuild similarity index 100% rename from include/asm-mips/Kbuild rename to arch/mips/include/asm/Kbuild diff --git a/include/asm-mips/a.out.h b/arch/mips/include/asm/a.out.h similarity index 100% rename from include/asm-mips/a.out.h rename to arch/mips/include/asm/a.out.h diff --git a/include/asm-mips/abi.h b/arch/mips/include/asm/abi.h similarity index 100% rename from include/asm-mips/abi.h rename to arch/mips/include/asm/abi.h diff --git a/include/asm-mips/addrspace.h b/arch/mips/include/asm/addrspace.h similarity index 100% rename from include/asm-mips/addrspace.h rename to arch/mips/include/asm/addrspace.h diff --git a/include/asm-mips/asm.h b/arch/mips/include/asm/asm.h similarity index 100% rename from include/asm-mips/asm.h rename to arch/mips/include/asm/asm.h diff --git a/include/asm-mips/asmmacro-32.h b/arch/mips/include/asm/asmmacro-32.h similarity index 100% rename from include/asm-mips/asmmacro-32.h rename to arch/mips/include/asm/asmmacro-32.h diff --git a/include/asm-mips/asmmacro-64.h b/arch/mips/include/asm/asmmacro-64.h similarity index 100% rename from include/asm-mips/asmmacro-64.h rename to arch/mips/include/asm/asmmacro-64.h diff --git a/include/asm-mips/asmmacro.h b/arch/mips/include/asm/asmmacro.h similarity index 100% rename from include/asm-mips/asmmacro.h rename to arch/mips/include/asm/asmmacro.h diff --git a/include/asm-mips/atomic.h b/arch/mips/include/asm/atomic.h similarity index 100% rename from include/asm-mips/atomic.h rename to arch/mips/include/asm/atomic.h diff --git a/include/asm-mips/auxvec.h b/arch/mips/include/asm/auxvec.h similarity index 100% rename from include/asm-mips/auxvec.h rename to arch/mips/include/asm/auxvec.h diff --git a/include/asm-mips/barrier.h b/arch/mips/include/asm/barrier.h similarity index 100% rename from include/asm-mips/barrier.h rename to arch/mips/include/asm/barrier.h diff --git a/include/asm-mips/bcache.h b/arch/mips/include/asm/bcache.h similarity index 100% rename from include/asm-mips/bcache.h rename to arch/mips/include/asm/bcache.h diff --git a/include/asm-mips/bitops.h b/arch/mips/include/asm/bitops.h similarity index 100% rename from include/asm-mips/bitops.h rename to arch/mips/include/asm/bitops.h diff --git a/include/asm-mips/bootinfo.h b/arch/mips/include/asm/bootinfo.h similarity index 100% rename from include/asm-mips/bootinfo.h rename to arch/mips/include/asm/bootinfo.h diff --git a/include/asm-mips/branch.h b/arch/mips/include/asm/branch.h similarity index 100% rename from include/asm-mips/branch.h rename to arch/mips/include/asm/branch.h diff --git a/include/asm-mips/break.h b/arch/mips/include/asm/break.h similarity index 100% rename from include/asm-mips/break.h rename to arch/mips/include/asm/break.h diff --git a/include/asm-mips/bug.h b/arch/mips/include/asm/bug.h similarity index 100% rename from include/asm-mips/bug.h rename to arch/mips/include/asm/bug.h diff --git a/include/asm-mips/bugs.h b/arch/mips/include/asm/bugs.h similarity index 100% rename from include/asm-mips/bugs.h rename to arch/mips/include/asm/bugs.h diff --git a/include/asm-mips/byteorder.h b/arch/mips/include/asm/byteorder.h similarity index 100% rename from include/asm-mips/byteorder.h rename to arch/mips/include/asm/byteorder.h diff --git a/include/asm-mips/cache.h b/arch/mips/include/asm/cache.h similarity index 100% rename from include/asm-mips/cache.h rename to arch/mips/include/asm/cache.h diff --git a/include/asm-mips/cachectl.h b/arch/mips/include/asm/cachectl.h similarity index 100% rename from include/asm-mips/cachectl.h rename to arch/mips/include/asm/cachectl.h diff --git a/include/asm-mips/cacheflush.h b/arch/mips/include/asm/cacheflush.h similarity index 100% rename from include/asm-mips/cacheflush.h rename to arch/mips/include/asm/cacheflush.h diff --git a/include/asm-mips/cacheops.h b/arch/mips/include/asm/cacheops.h similarity index 100% rename from include/asm-mips/cacheops.h rename to arch/mips/include/asm/cacheops.h diff --git a/include/asm-mips/checksum.h b/arch/mips/include/asm/checksum.h similarity index 100% rename from include/asm-mips/checksum.h rename to arch/mips/include/asm/checksum.h diff --git a/include/asm-mips/cmp.h b/arch/mips/include/asm/cmp.h similarity index 100% rename from include/asm-mips/cmp.h rename to arch/mips/include/asm/cmp.h diff --git a/include/asm-mips/cmpxchg.h b/arch/mips/include/asm/cmpxchg.h similarity index 100% rename from include/asm-mips/cmpxchg.h rename to arch/mips/include/asm/cmpxchg.h diff --git a/include/asm-mips/compat-signal.h b/arch/mips/include/asm/compat-signal.h similarity index 100% rename from include/asm-mips/compat-signal.h rename to arch/mips/include/asm/compat-signal.h diff --git a/include/asm-mips/compat.h b/arch/mips/include/asm/compat.h similarity index 100% rename from include/asm-mips/compat.h rename to arch/mips/include/asm/compat.h diff --git a/include/asm-mips/compiler.h b/arch/mips/include/asm/compiler.h similarity index 100% rename from include/asm-mips/compiler.h rename to arch/mips/include/asm/compiler.h diff --git a/include/asm-mips/cpu-features.h b/arch/mips/include/asm/cpu-features.h similarity index 100% rename from include/asm-mips/cpu-features.h rename to arch/mips/include/asm/cpu-features.h diff --git a/include/asm-mips/cpu-info.h b/arch/mips/include/asm/cpu-info.h similarity index 100% rename from include/asm-mips/cpu-info.h rename to arch/mips/include/asm/cpu-info.h diff --git a/include/asm-mips/cpu.h b/arch/mips/include/asm/cpu.h similarity index 100% rename from include/asm-mips/cpu.h rename to arch/mips/include/asm/cpu.h diff --git a/include/asm-mips/cputime.h b/arch/mips/include/asm/cputime.h similarity index 100% rename from include/asm-mips/cputime.h rename to arch/mips/include/asm/cputime.h diff --git a/include/asm-mips/current.h b/arch/mips/include/asm/current.h similarity index 100% rename from include/asm-mips/current.h rename to arch/mips/include/asm/current.h diff --git a/include/asm-mips/debug.h b/arch/mips/include/asm/debug.h similarity index 100% rename from include/asm-mips/debug.h rename to arch/mips/include/asm/debug.h diff --git a/include/asm-mips/dec/ecc.h b/arch/mips/include/asm/dec/ecc.h similarity index 100% rename from include/asm-mips/dec/ecc.h rename to arch/mips/include/asm/dec/ecc.h diff --git a/include/asm-mips/dec/interrupts.h b/arch/mips/include/asm/dec/interrupts.h similarity index 100% rename from include/asm-mips/dec/interrupts.h rename to arch/mips/include/asm/dec/interrupts.h diff --git a/include/asm-mips/dec/ioasic.h b/arch/mips/include/asm/dec/ioasic.h similarity index 100% rename from include/asm-mips/dec/ioasic.h rename to arch/mips/include/asm/dec/ioasic.h diff --git a/include/asm-mips/dec/ioasic_addrs.h b/arch/mips/include/asm/dec/ioasic_addrs.h similarity index 100% rename from include/asm-mips/dec/ioasic_addrs.h rename to arch/mips/include/asm/dec/ioasic_addrs.h diff --git a/include/asm-mips/dec/ioasic_ints.h b/arch/mips/include/asm/dec/ioasic_ints.h similarity index 100% rename from include/asm-mips/dec/ioasic_ints.h rename to arch/mips/include/asm/dec/ioasic_ints.h diff --git a/include/asm-mips/dec/kn01.h b/arch/mips/include/asm/dec/kn01.h similarity index 100% rename from include/asm-mips/dec/kn01.h rename to arch/mips/include/asm/dec/kn01.h diff --git a/include/asm-mips/dec/kn02.h b/arch/mips/include/asm/dec/kn02.h similarity index 100% rename from include/asm-mips/dec/kn02.h rename to arch/mips/include/asm/dec/kn02.h diff --git a/include/asm-mips/dec/kn02ba.h b/arch/mips/include/asm/dec/kn02ba.h similarity index 100% rename from include/asm-mips/dec/kn02ba.h rename to arch/mips/include/asm/dec/kn02ba.h diff --git a/include/asm-mips/dec/kn02ca.h b/arch/mips/include/asm/dec/kn02ca.h similarity index 100% rename from include/asm-mips/dec/kn02ca.h rename to arch/mips/include/asm/dec/kn02ca.h diff --git a/include/asm-mips/dec/kn02xa.h b/arch/mips/include/asm/dec/kn02xa.h similarity index 100% rename from include/asm-mips/dec/kn02xa.h rename to arch/mips/include/asm/dec/kn02xa.h diff --git a/include/asm-mips/dec/kn03.h b/arch/mips/include/asm/dec/kn03.h similarity index 100% rename from include/asm-mips/dec/kn03.h rename to arch/mips/include/asm/dec/kn03.h diff --git a/include/asm-mips/dec/kn05.h b/arch/mips/include/asm/dec/kn05.h similarity index 100% rename from include/asm-mips/dec/kn05.h rename to arch/mips/include/asm/dec/kn05.h diff --git a/include/asm-mips/dec/kn230.h b/arch/mips/include/asm/dec/kn230.h similarity index 100% rename from include/asm-mips/dec/kn230.h rename to arch/mips/include/asm/dec/kn230.h diff --git a/include/asm-mips/dec/machtype.h b/arch/mips/include/asm/dec/machtype.h similarity index 100% rename from include/asm-mips/dec/machtype.h rename to arch/mips/include/asm/dec/machtype.h diff --git a/include/asm-mips/dec/prom.h b/arch/mips/include/asm/dec/prom.h similarity index 100% rename from include/asm-mips/dec/prom.h rename to arch/mips/include/asm/dec/prom.h diff --git a/include/asm-mips/dec/system.h b/arch/mips/include/asm/dec/system.h similarity index 100% rename from include/asm-mips/dec/system.h rename to arch/mips/include/asm/dec/system.h diff --git a/include/asm-mips/delay.h b/arch/mips/include/asm/delay.h similarity index 100% rename from include/asm-mips/delay.h rename to arch/mips/include/asm/delay.h diff --git a/include/asm-mips/device.h b/arch/mips/include/asm/device.h similarity index 100% rename from include/asm-mips/device.h rename to arch/mips/include/asm/device.h diff --git a/include/asm-mips/div64.h b/arch/mips/include/asm/div64.h similarity index 100% rename from include/asm-mips/div64.h rename to arch/mips/include/asm/div64.h diff --git a/include/asm-mips/dma-mapping.h b/arch/mips/include/asm/dma-mapping.h similarity index 100% rename from include/asm-mips/dma-mapping.h rename to arch/mips/include/asm/dma-mapping.h diff --git a/include/asm-mips/dma.h b/arch/mips/include/asm/dma.h similarity index 100% rename from include/asm-mips/dma.h rename to arch/mips/include/asm/dma.h diff --git a/include/asm-mips/ds1286.h b/arch/mips/include/asm/ds1286.h similarity index 100% rename from include/asm-mips/ds1286.h rename to arch/mips/include/asm/ds1286.h diff --git a/include/asm-mips/ds1287.h b/arch/mips/include/asm/ds1287.h similarity index 100% rename from include/asm-mips/ds1287.h rename to arch/mips/include/asm/ds1287.h diff --git a/include/asm-mips/dsp.h b/arch/mips/include/asm/dsp.h similarity index 100% rename from include/asm-mips/dsp.h rename to arch/mips/include/asm/dsp.h diff --git a/include/asm-mips/edac.h b/arch/mips/include/asm/edac.h similarity index 100% rename from include/asm-mips/edac.h rename to arch/mips/include/asm/edac.h diff --git a/include/asm-mips/elf.h b/arch/mips/include/asm/elf.h similarity index 100% rename from include/asm-mips/elf.h rename to arch/mips/include/asm/elf.h diff --git a/include/asm-mips/emergency-restart.h b/arch/mips/include/asm/emergency-restart.h similarity index 100% rename from include/asm-mips/emergency-restart.h rename to arch/mips/include/asm/emergency-restart.h diff --git a/include/asm-mips/emma2rh/emma2rh.h b/arch/mips/include/asm/emma2rh/emma2rh.h similarity index 100% rename from include/asm-mips/emma2rh/emma2rh.h rename to arch/mips/include/asm/emma2rh/emma2rh.h diff --git a/include/asm-mips/emma2rh/markeins.h b/arch/mips/include/asm/emma2rh/markeins.h similarity index 100% rename from include/asm-mips/emma2rh/markeins.h rename to arch/mips/include/asm/emma2rh/markeins.h diff --git a/include/asm-mips/errno.h b/arch/mips/include/asm/errno.h similarity index 100% rename from include/asm-mips/errno.h rename to arch/mips/include/asm/errno.h diff --git a/include/asm-mips/fb.h b/arch/mips/include/asm/fb.h similarity index 100% rename from include/asm-mips/fb.h rename to arch/mips/include/asm/fb.h diff --git a/include/asm-mips/fcntl.h b/arch/mips/include/asm/fcntl.h similarity index 100% rename from include/asm-mips/fcntl.h rename to arch/mips/include/asm/fcntl.h diff --git a/include/asm-mips/fixmap.h b/arch/mips/include/asm/fixmap.h similarity index 100% rename from include/asm-mips/fixmap.h rename to arch/mips/include/asm/fixmap.h diff --git a/include/asm-mips/floppy.h b/arch/mips/include/asm/floppy.h similarity index 100% rename from include/asm-mips/floppy.h rename to arch/mips/include/asm/floppy.h diff --git a/include/asm-mips/fpregdef.h b/arch/mips/include/asm/fpregdef.h similarity index 100% rename from include/asm-mips/fpregdef.h rename to arch/mips/include/asm/fpregdef.h diff --git a/include/asm-mips/fpu.h b/arch/mips/include/asm/fpu.h similarity index 100% rename from include/asm-mips/fpu.h rename to arch/mips/include/asm/fpu.h diff --git a/include/asm-mips/fpu_emulator.h b/arch/mips/include/asm/fpu_emulator.h similarity index 100% rename from include/asm-mips/fpu_emulator.h rename to arch/mips/include/asm/fpu_emulator.h diff --git a/include/asm-mips/futex.h b/arch/mips/include/asm/futex.h similarity index 100% rename from include/asm-mips/futex.h rename to arch/mips/include/asm/futex.h diff --git a/include/asm-mips/fw/arc/hinv.h b/arch/mips/include/asm/fw/arc/hinv.h similarity index 100% rename from include/asm-mips/fw/arc/hinv.h rename to arch/mips/include/asm/fw/arc/hinv.h diff --git a/include/asm-mips/fw/arc/types.h b/arch/mips/include/asm/fw/arc/types.h similarity index 100% rename from include/asm-mips/fw/arc/types.h rename to arch/mips/include/asm/fw/arc/types.h diff --git a/include/asm-mips/fw/cfe/cfe_api.h b/arch/mips/include/asm/fw/cfe/cfe_api.h similarity index 100% rename from include/asm-mips/fw/cfe/cfe_api.h rename to arch/mips/include/asm/fw/cfe/cfe_api.h diff --git a/include/asm-mips/fw/cfe/cfe_error.h b/arch/mips/include/asm/fw/cfe/cfe_error.h similarity index 100% rename from include/asm-mips/fw/cfe/cfe_error.h rename to arch/mips/include/asm/fw/cfe/cfe_error.h diff --git a/include/asm-mips/gcmpregs.h b/arch/mips/include/asm/gcmpregs.h similarity index 100% rename from include/asm-mips/gcmpregs.h rename to arch/mips/include/asm/gcmpregs.h diff --git a/include/asm-mips/gic.h b/arch/mips/include/asm/gic.h similarity index 100% rename from include/asm-mips/gic.h rename to arch/mips/include/asm/gic.h diff --git a/include/asm-mips/gpio.h b/arch/mips/include/asm/gpio.h similarity index 100% rename from include/asm-mips/gpio.h rename to arch/mips/include/asm/gpio.h diff --git a/include/asm-mips/gt64120.h b/arch/mips/include/asm/gt64120.h similarity index 100% rename from include/asm-mips/gt64120.h rename to arch/mips/include/asm/gt64120.h diff --git a/include/asm-mips/hardirq.h b/arch/mips/include/asm/hardirq.h similarity index 100% rename from include/asm-mips/hardirq.h rename to arch/mips/include/asm/hardirq.h diff --git a/include/asm-mips/hazards.h b/arch/mips/include/asm/hazards.h similarity index 100% rename from include/asm-mips/hazards.h rename to arch/mips/include/asm/hazards.h diff --git a/include/asm-mips/highmem.h b/arch/mips/include/asm/highmem.h similarity index 100% rename from include/asm-mips/highmem.h rename to arch/mips/include/asm/highmem.h diff --git a/include/asm-mips/hw_irq.h b/arch/mips/include/asm/hw_irq.h similarity index 100% rename from include/asm-mips/hw_irq.h rename to arch/mips/include/asm/hw_irq.h diff --git a/include/asm-mips/i8253.h b/arch/mips/include/asm/i8253.h similarity index 100% rename from include/asm-mips/i8253.h rename to arch/mips/include/asm/i8253.h diff --git a/include/asm-mips/i8259.h b/arch/mips/include/asm/i8259.h similarity index 100% rename from include/asm-mips/i8259.h rename to arch/mips/include/asm/i8259.h diff --git a/include/asm-mips/ide.h b/arch/mips/include/asm/ide.h similarity index 100% rename from include/asm-mips/ide.h rename to arch/mips/include/asm/ide.h diff --git a/include/asm-mips/inst.h b/arch/mips/include/asm/inst.h similarity index 100% rename from include/asm-mips/inst.h rename to arch/mips/include/asm/inst.h diff --git a/include/asm-mips/io.h b/arch/mips/include/asm/io.h similarity index 100% rename from include/asm-mips/io.h rename to arch/mips/include/asm/io.h diff --git a/include/asm-mips/ioctl.h b/arch/mips/include/asm/ioctl.h similarity index 100% rename from include/asm-mips/ioctl.h rename to arch/mips/include/asm/ioctl.h diff --git a/include/asm-mips/ioctls.h b/arch/mips/include/asm/ioctls.h similarity index 100% rename from include/asm-mips/ioctls.h rename to arch/mips/include/asm/ioctls.h diff --git a/include/asm-mips/ip32/crime.h b/arch/mips/include/asm/ip32/crime.h similarity index 100% rename from include/asm-mips/ip32/crime.h rename to arch/mips/include/asm/ip32/crime.h diff --git a/include/asm-mips/ip32/ip32_ints.h b/arch/mips/include/asm/ip32/ip32_ints.h similarity index 100% rename from include/asm-mips/ip32/ip32_ints.h rename to arch/mips/include/asm/ip32/ip32_ints.h diff --git a/include/asm-mips/ip32/mace.h b/arch/mips/include/asm/ip32/mace.h similarity index 100% rename from include/asm-mips/ip32/mace.h rename to arch/mips/include/asm/ip32/mace.h diff --git a/include/asm-mips/ipcbuf.h b/arch/mips/include/asm/ipcbuf.h similarity index 100% rename from include/asm-mips/ipcbuf.h rename to arch/mips/include/asm/ipcbuf.h diff --git a/include/asm-mips/irq.h b/arch/mips/include/asm/irq.h similarity index 100% rename from include/asm-mips/irq.h rename to arch/mips/include/asm/irq.h diff --git a/include/asm-mips/irq_cpu.h b/arch/mips/include/asm/irq_cpu.h similarity index 100% rename from include/asm-mips/irq_cpu.h rename to arch/mips/include/asm/irq_cpu.h diff --git a/include/asm-mips/irq_gt641xx.h b/arch/mips/include/asm/irq_gt641xx.h similarity index 100% rename from include/asm-mips/irq_gt641xx.h rename to arch/mips/include/asm/irq_gt641xx.h diff --git a/include/asm-mips/irq_regs.h b/arch/mips/include/asm/irq_regs.h similarity index 100% rename from include/asm-mips/irq_regs.h rename to arch/mips/include/asm/irq_regs.h diff --git a/include/asm-mips/irqflags.h b/arch/mips/include/asm/irqflags.h similarity index 100% rename from include/asm-mips/irqflags.h rename to arch/mips/include/asm/irqflags.h diff --git a/include/asm-mips/isadep.h b/arch/mips/include/asm/isadep.h similarity index 100% rename from include/asm-mips/isadep.h rename to arch/mips/include/asm/isadep.h diff --git a/include/asm-mips/jazz.h b/arch/mips/include/asm/jazz.h similarity index 100% rename from include/asm-mips/jazz.h rename to arch/mips/include/asm/jazz.h diff --git a/include/asm-mips/jazzdma.h b/arch/mips/include/asm/jazzdma.h similarity index 100% rename from include/asm-mips/jazzdma.h rename to arch/mips/include/asm/jazzdma.h diff --git a/include/asm-mips/kdebug.h b/arch/mips/include/asm/kdebug.h similarity index 100% rename from include/asm-mips/kdebug.h rename to arch/mips/include/asm/kdebug.h diff --git a/include/asm-mips/kexec.h b/arch/mips/include/asm/kexec.h similarity index 100% rename from include/asm-mips/kexec.h rename to arch/mips/include/asm/kexec.h diff --git a/include/asm-mips/kgdb.h b/arch/mips/include/asm/kgdb.h similarity index 100% rename from include/asm-mips/kgdb.h rename to arch/mips/include/asm/kgdb.h diff --git a/include/asm-mips/kmap_types.h b/arch/mips/include/asm/kmap_types.h similarity index 100% rename from include/asm-mips/kmap_types.h rename to arch/mips/include/asm/kmap_types.h diff --git a/include/asm-mips/kspd.h b/arch/mips/include/asm/kspd.h similarity index 100% rename from include/asm-mips/kspd.h rename to arch/mips/include/asm/kspd.h diff --git a/include/asm-mips/lasat/ds1603.h b/arch/mips/include/asm/lasat/ds1603.h similarity index 100% rename from include/asm-mips/lasat/ds1603.h rename to arch/mips/include/asm/lasat/ds1603.h diff --git a/include/asm-mips/lasat/eeprom.h b/arch/mips/include/asm/lasat/eeprom.h similarity index 100% rename from include/asm-mips/lasat/eeprom.h rename to arch/mips/include/asm/lasat/eeprom.h diff --git a/include/asm-mips/lasat/head.h b/arch/mips/include/asm/lasat/head.h similarity index 100% rename from include/asm-mips/lasat/head.h rename to arch/mips/include/asm/lasat/head.h diff --git a/include/asm-mips/lasat/lasat.h b/arch/mips/include/asm/lasat/lasat.h similarity index 100% rename from include/asm-mips/lasat/lasat.h rename to arch/mips/include/asm/lasat/lasat.h diff --git a/include/asm-mips/lasat/lasatint.h b/arch/mips/include/asm/lasat/lasatint.h similarity index 100% rename from include/asm-mips/lasat/lasatint.h rename to arch/mips/include/asm/lasat/lasatint.h diff --git a/include/asm-mips/lasat/picvue.h b/arch/mips/include/asm/lasat/picvue.h similarity index 100% rename from include/asm-mips/lasat/picvue.h rename to arch/mips/include/asm/lasat/picvue.h diff --git a/include/asm-mips/lasat/serial.h b/arch/mips/include/asm/lasat/serial.h similarity index 100% rename from include/asm-mips/lasat/serial.h rename to arch/mips/include/asm/lasat/serial.h diff --git a/include/asm-mips/linkage.h b/arch/mips/include/asm/linkage.h similarity index 100% rename from include/asm-mips/linkage.h rename to arch/mips/include/asm/linkage.h diff --git a/include/asm-mips/local.h b/arch/mips/include/asm/local.h similarity index 100% rename from include/asm-mips/local.h rename to arch/mips/include/asm/local.h diff --git a/include/asm-mips/m48t35.h b/arch/mips/include/asm/m48t35.h similarity index 100% rename from include/asm-mips/m48t35.h rename to arch/mips/include/asm/m48t35.h diff --git a/include/asm-mips/m48t37.h b/arch/mips/include/asm/m48t37.h similarity index 100% rename from include/asm-mips/m48t37.h rename to arch/mips/include/asm/m48t37.h diff --git a/include/asm-mips/mach-au1x00/au1000.h b/arch/mips/include/asm/mach-au1x00/au1000.h similarity index 100% rename from include/asm-mips/mach-au1x00/au1000.h rename to arch/mips/include/asm/mach-au1x00/au1000.h diff --git a/include/asm-mips/mach-au1x00/au1000_dma.h b/arch/mips/include/asm/mach-au1x00/au1000_dma.h similarity index 100% rename from include/asm-mips/mach-au1x00/au1000_dma.h rename to arch/mips/include/asm/mach-au1x00/au1000_dma.h diff --git a/include/asm-mips/mach-au1x00/au1000_gpio.h b/arch/mips/include/asm/mach-au1x00/au1000_gpio.h similarity index 100% rename from include/asm-mips/mach-au1x00/au1000_gpio.h rename to arch/mips/include/asm/mach-au1x00/au1000_gpio.h diff --git a/include/asm-mips/mach-au1x00/au1100_mmc.h b/arch/mips/include/asm/mach-au1x00/au1100_mmc.h similarity index 100% rename from include/asm-mips/mach-au1x00/au1100_mmc.h rename to arch/mips/include/asm/mach-au1x00/au1100_mmc.h diff --git a/include/asm-mips/mach-au1x00/au1550_spi.h b/arch/mips/include/asm/mach-au1x00/au1550_spi.h similarity index 100% rename from include/asm-mips/mach-au1x00/au1550_spi.h rename to arch/mips/include/asm/mach-au1x00/au1550_spi.h diff --git a/include/asm-mips/mach-au1x00/au1xxx.h b/arch/mips/include/asm/mach-au1x00/au1xxx.h similarity index 100% rename from include/asm-mips/mach-au1x00/au1xxx.h rename to arch/mips/include/asm/mach-au1x00/au1xxx.h diff --git a/include/asm-mips/mach-au1x00/au1xxx_dbdma.h b/arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h similarity index 100% rename from include/asm-mips/mach-au1x00/au1xxx_dbdma.h rename to arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h diff --git a/include/asm-mips/mach-au1x00/au1xxx_ide.h b/arch/mips/include/asm/mach-au1x00/au1xxx_ide.h similarity index 100% rename from include/asm-mips/mach-au1x00/au1xxx_ide.h rename to arch/mips/include/asm/mach-au1x00/au1xxx_ide.h diff --git a/include/asm-mips/mach-au1x00/au1xxx_psc.h b/arch/mips/include/asm/mach-au1x00/au1xxx_psc.h similarity index 100% rename from include/asm-mips/mach-au1x00/au1xxx_psc.h rename to arch/mips/include/asm/mach-au1x00/au1xxx_psc.h diff --git a/include/asm-mips/mach-au1x00/gpio.h b/arch/mips/include/asm/mach-au1x00/gpio.h similarity index 100% rename from include/asm-mips/mach-au1x00/gpio.h rename to arch/mips/include/asm/mach-au1x00/gpio.h diff --git a/include/asm-mips/mach-au1x00/ioremap.h b/arch/mips/include/asm/mach-au1x00/ioremap.h similarity index 100% rename from include/asm-mips/mach-au1x00/ioremap.h rename to arch/mips/include/asm/mach-au1x00/ioremap.h diff --git a/include/asm-mips/mach-au1x00/prom.h b/arch/mips/include/asm/mach-au1x00/prom.h similarity index 100% rename from include/asm-mips/mach-au1x00/prom.h rename to arch/mips/include/asm/mach-au1x00/prom.h diff --git a/include/asm-mips/mach-au1x00/war.h b/arch/mips/include/asm/mach-au1x00/war.h similarity index 100% rename from include/asm-mips/mach-au1x00/war.h rename to arch/mips/include/asm/mach-au1x00/war.h diff --git a/include/asm-mips/mach-bcm47xx/bcm47xx.h b/arch/mips/include/asm/mach-bcm47xx/bcm47xx.h similarity index 100% rename from include/asm-mips/mach-bcm47xx/bcm47xx.h rename to arch/mips/include/asm/mach-bcm47xx/bcm47xx.h diff --git a/include/asm-mips/mach-bcm47xx/gpio.h b/arch/mips/include/asm/mach-bcm47xx/gpio.h similarity index 100% rename from include/asm-mips/mach-bcm47xx/gpio.h rename to arch/mips/include/asm/mach-bcm47xx/gpio.h diff --git a/include/asm-mips/mach-bcm47xx/war.h b/arch/mips/include/asm/mach-bcm47xx/war.h similarity index 100% rename from include/asm-mips/mach-bcm47xx/war.h rename to arch/mips/include/asm/mach-bcm47xx/war.h diff --git a/include/asm-mips/mach-cobalt/cobalt.h b/arch/mips/include/asm/mach-cobalt/cobalt.h similarity index 100% rename from include/asm-mips/mach-cobalt/cobalt.h rename to arch/mips/include/asm/mach-cobalt/cobalt.h diff --git a/include/asm-mips/mach-cobalt/cpu-feature-overrides.h b/arch/mips/include/asm/mach-cobalt/cpu-feature-overrides.h similarity index 100% rename from include/asm-mips/mach-cobalt/cpu-feature-overrides.h rename to arch/mips/include/asm/mach-cobalt/cpu-feature-overrides.h diff --git a/include/asm-mips/mach-cobalt/irq.h b/arch/mips/include/asm/mach-cobalt/irq.h similarity index 100% rename from include/asm-mips/mach-cobalt/irq.h rename to arch/mips/include/asm/mach-cobalt/irq.h diff --git a/include/asm-mips/mach-cobalt/mach-gt64120.h b/arch/mips/include/asm/mach-cobalt/mach-gt64120.h similarity index 100% rename from include/asm-mips/mach-cobalt/mach-gt64120.h rename to arch/mips/include/asm/mach-cobalt/mach-gt64120.h diff --git a/include/asm-mips/mach-cobalt/war.h b/arch/mips/include/asm/mach-cobalt/war.h similarity index 100% rename from include/asm-mips/mach-cobalt/war.h rename to arch/mips/include/asm/mach-cobalt/war.h diff --git a/include/asm-mips/mach-db1x00/db1200.h b/arch/mips/include/asm/mach-db1x00/db1200.h similarity index 100% rename from include/asm-mips/mach-db1x00/db1200.h rename to arch/mips/include/asm/mach-db1x00/db1200.h diff --git a/include/asm-mips/mach-db1x00/db1x00.h b/arch/mips/include/asm/mach-db1x00/db1x00.h similarity index 100% rename from include/asm-mips/mach-db1x00/db1x00.h rename to arch/mips/include/asm/mach-db1x00/db1x00.h diff --git a/include/asm-mips/mach-dec/mc146818rtc.h b/arch/mips/include/asm/mach-dec/mc146818rtc.h similarity index 100% rename from include/asm-mips/mach-dec/mc146818rtc.h rename to arch/mips/include/asm/mach-dec/mc146818rtc.h diff --git a/include/asm-mips/mach-dec/war.h b/arch/mips/include/asm/mach-dec/war.h similarity index 100% rename from include/asm-mips/mach-dec/war.h rename to arch/mips/include/asm/mach-dec/war.h diff --git a/include/asm-mips/mach-emma2rh/irq.h b/arch/mips/include/asm/mach-emma2rh/irq.h similarity index 100% rename from include/asm-mips/mach-emma2rh/irq.h rename to arch/mips/include/asm/mach-emma2rh/irq.h diff --git a/include/asm-mips/mach-emma2rh/war.h b/arch/mips/include/asm/mach-emma2rh/war.h similarity index 100% rename from include/asm-mips/mach-emma2rh/war.h rename to arch/mips/include/asm/mach-emma2rh/war.h diff --git a/include/asm-mips/mach-excite/cpu-feature-overrides.h b/arch/mips/include/asm/mach-excite/cpu-feature-overrides.h similarity index 100% rename from include/asm-mips/mach-excite/cpu-feature-overrides.h rename to arch/mips/include/asm/mach-excite/cpu-feature-overrides.h diff --git a/include/asm-mips/mach-excite/excite.h b/arch/mips/include/asm/mach-excite/excite.h similarity index 100% rename from include/asm-mips/mach-excite/excite.h rename to arch/mips/include/asm/mach-excite/excite.h diff --git a/include/asm-mips/mach-excite/excite_fpga.h b/arch/mips/include/asm/mach-excite/excite_fpga.h similarity index 100% rename from include/asm-mips/mach-excite/excite_fpga.h rename to arch/mips/include/asm/mach-excite/excite_fpga.h diff --git a/include/asm-mips/mach-excite/excite_nandflash.h b/arch/mips/include/asm/mach-excite/excite_nandflash.h similarity index 100% rename from include/asm-mips/mach-excite/excite_nandflash.h rename to arch/mips/include/asm/mach-excite/excite_nandflash.h diff --git a/include/asm-mips/mach-excite/rm9k_eth.h b/arch/mips/include/asm/mach-excite/rm9k_eth.h similarity index 100% rename from include/asm-mips/mach-excite/rm9k_eth.h rename to arch/mips/include/asm/mach-excite/rm9k_eth.h diff --git a/include/asm-mips/mach-excite/rm9k_wdt.h b/arch/mips/include/asm/mach-excite/rm9k_wdt.h similarity index 100% rename from include/asm-mips/mach-excite/rm9k_wdt.h rename to arch/mips/include/asm/mach-excite/rm9k_wdt.h diff --git a/include/asm-mips/mach-excite/rm9k_xicap.h b/arch/mips/include/asm/mach-excite/rm9k_xicap.h similarity index 100% rename from include/asm-mips/mach-excite/rm9k_xicap.h rename to arch/mips/include/asm/mach-excite/rm9k_xicap.h diff --git a/include/asm-mips/mach-excite/war.h b/arch/mips/include/asm/mach-excite/war.h similarity index 100% rename from include/asm-mips/mach-excite/war.h rename to arch/mips/include/asm/mach-excite/war.h diff --git a/include/asm-mips/mach-generic/cpu-feature-overrides.h b/arch/mips/include/asm/mach-generic/cpu-feature-overrides.h similarity index 100% rename from include/asm-mips/mach-generic/cpu-feature-overrides.h rename to arch/mips/include/asm/mach-generic/cpu-feature-overrides.h diff --git a/include/asm-mips/mach-generic/dma-coherence.h b/arch/mips/include/asm/mach-generic/dma-coherence.h similarity index 100% rename from include/asm-mips/mach-generic/dma-coherence.h rename to arch/mips/include/asm/mach-generic/dma-coherence.h diff --git a/include/asm-mips/mach-generic/floppy.h b/arch/mips/include/asm/mach-generic/floppy.h similarity index 100% rename from include/asm-mips/mach-generic/floppy.h rename to arch/mips/include/asm/mach-generic/floppy.h diff --git a/include/asm-mips/mach-generic/gpio.h b/arch/mips/include/asm/mach-generic/gpio.h similarity index 100% rename from include/asm-mips/mach-generic/gpio.h rename to arch/mips/include/asm/mach-generic/gpio.h diff --git a/include/asm-mips/mach-generic/ide.h b/arch/mips/include/asm/mach-generic/ide.h similarity index 100% rename from include/asm-mips/mach-generic/ide.h rename to arch/mips/include/asm/mach-generic/ide.h diff --git a/include/asm-mips/mach-generic/ioremap.h b/arch/mips/include/asm/mach-generic/ioremap.h similarity index 100% rename from include/asm-mips/mach-generic/ioremap.h rename to arch/mips/include/asm/mach-generic/ioremap.h diff --git a/include/asm-mips/mach-generic/irq.h b/arch/mips/include/asm/mach-generic/irq.h similarity index 100% rename from include/asm-mips/mach-generic/irq.h rename to arch/mips/include/asm/mach-generic/irq.h diff --git a/include/asm-mips/mach-generic/kernel-entry-init.h b/arch/mips/include/asm/mach-generic/kernel-entry-init.h similarity index 100% rename from include/asm-mips/mach-generic/kernel-entry-init.h rename to arch/mips/include/asm/mach-generic/kernel-entry-init.h diff --git a/include/asm-mips/mach-generic/kmalloc.h b/arch/mips/include/asm/mach-generic/kmalloc.h similarity index 100% rename from include/asm-mips/mach-generic/kmalloc.h rename to arch/mips/include/asm/mach-generic/kmalloc.h diff --git a/include/asm-mips/mach-generic/mangle-port.h b/arch/mips/include/asm/mach-generic/mangle-port.h similarity index 100% rename from include/asm-mips/mach-generic/mangle-port.h rename to arch/mips/include/asm/mach-generic/mangle-port.h diff --git a/include/asm-mips/mach-generic/mc146818rtc.h b/arch/mips/include/asm/mach-generic/mc146818rtc.h similarity index 100% rename from include/asm-mips/mach-generic/mc146818rtc.h rename to arch/mips/include/asm/mach-generic/mc146818rtc.h diff --git a/include/asm-mips/mach-generic/spaces.h b/arch/mips/include/asm/mach-generic/spaces.h similarity index 100% rename from include/asm-mips/mach-generic/spaces.h rename to arch/mips/include/asm/mach-generic/spaces.h diff --git a/include/asm-mips/mach-generic/topology.h b/arch/mips/include/asm/mach-generic/topology.h similarity index 100% rename from include/asm-mips/mach-generic/topology.h rename to arch/mips/include/asm/mach-generic/topology.h diff --git a/include/asm-mips/mach-ip22/cpu-feature-overrides.h b/arch/mips/include/asm/mach-ip22/cpu-feature-overrides.h similarity index 100% rename from include/asm-mips/mach-ip22/cpu-feature-overrides.h rename to arch/mips/include/asm/mach-ip22/cpu-feature-overrides.h diff --git a/include/asm-mips/mach-ip22/ds1286.h b/arch/mips/include/asm/mach-ip22/ds1286.h similarity index 100% rename from include/asm-mips/mach-ip22/ds1286.h rename to arch/mips/include/asm/mach-ip22/ds1286.h diff --git a/include/asm-mips/mach-ip22/spaces.h b/arch/mips/include/asm/mach-ip22/spaces.h similarity index 100% rename from include/asm-mips/mach-ip22/spaces.h rename to arch/mips/include/asm/mach-ip22/spaces.h diff --git a/include/asm-mips/mach-ip22/war.h b/arch/mips/include/asm/mach-ip22/war.h similarity index 100% rename from include/asm-mips/mach-ip22/war.h rename to arch/mips/include/asm/mach-ip22/war.h diff --git a/include/asm-mips/mach-ip27/cpu-feature-overrides.h b/arch/mips/include/asm/mach-ip27/cpu-feature-overrides.h similarity index 100% rename from include/asm-mips/mach-ip27/cpu-feature-overrides.h rename to arch/mips/include/asm/mach-ip27/cpu-feature-overrides.h diff --git a/include/asm-mips/mach-ip27/dma-coherence.h b/arch/mips/include/asm/mach-ip27/dma-coherence.h similarity index 100% rename from include/asm-mips/mach-ip27/dma-coherence.h rename to arch/mips/include/asm/mach-ip27/dma-coherence.h diff --git a/include/asm-mips/mach-ip27/irq.h b/arch/mips/include/asm/mach-ip27/irq.h similarity index 100% rename from include/asm-mips/mach-ip27/irq.h rename to arch/mips/include/asm/mach-ip27/irq.h diff --git a/include/asm-mips/mach-ip27/kernel-entry-init.h b/arch/mips/include/asm/mach-ip27/kernel-entry-init.h similarity index 100% rename from include/asm-mips/mach-ip27/kernel-entry-init.h rename to arch/mips/include/asm/mach-ip27/kernel-entry-init.h diff --git a/include/asm-mips/mach-ip27/kmalloc.h b/arch/mips/include/asm/mach-ip27/kmalloc.h similarity index 100% rename from include/asm-mips/mach-ip27/kmalloc.h rename to arch/mips/include/asm/mach-ip27/kmalloc.h diff --git a/include/asm-mips/mach-ip27/mangle-port.h b/arch/mips/include/asm/mach-ip27/mangle-port.h similarity index 100% rename from include/asm-mips/mach-ip27/mangle-port.h rename to arch/mips/include/asm/mach-ip27/mangle-port.h diff --git a/include/asm-mips/mach-ip27/mmzone.h b/arch/mips/include/asm/mach-ip27/mmzone.h similarity index 100% rename from include/asm-mips/mach-ip27/mmzone.h rename to arch/mips/include/asm/mach-ip27/mmzone.h diff --git a/include/asm-mips/mach-ip27/spaces.h b/arch/mips/include/asm/mach-ip27/spaces.h similarity index 100% rename from include/asm-mips/mach-ip27/spaces.h rename to arch/mips/include/asm/mach-ip27/spaces.h diff --git a/include/asm-mips/mach-ip27/topology.h b/arch/mips/include/asm/mach-ip27/topology.h similarity index 100% rename from include/asm-mips/mach-ip27/topology.h rename to arch/mips/include/asm/mach-ip27/topology.h diff --git a/include/asm-mips/mach-ip27/war.h b/arch/mips/include/asm/mach-ip27/war.h similarity index 100% rename from include/asm-mips/mach-ip27/war.h rename to arch/mips/include/asm/mach-ip27/war.h diff --git a/include/asm-mips/mach-ip28/cpu-feature-overrides.h b/arch/mips/include/asm/mach-ip28/cpu-feature-overrides.h similarity index 100% rename from include/asm-mips/mach-ip28/cpu-feature-overrides.h rename to arch/mips/include/asm/mach-ip28/cpu-feature-overrides.h diff --git a/include/asm-mips/mach-ip28/ds1286.h b/arch/mips/include/asm/mach-ip28/ds1286.h similarity index 100% rename from include/asm-mips/mach-ip28/ds1286.h rename to arch/mips/include/asm/mach-ip28/ds1286.h diff --git a/include/asm-mips/mach-ip28/spaces.h b/arch/mips/include/asm/mach-ip28/spaces.h similarity index 100% rename from include/asm-mips/mach-ip28/spaces.h rename to arch/mips/include/asm/mach-ip28/spaces.h diff --git a/include/asm-mips/mach-ip28/war.h b/arch/mips/include/asm/mach-ip28/war.h similarity index 100% rename from include/asm-mips/mach-ip28/war.h rename to arch/mips/include/asm/mach-ip28/war.h diff --git a/include/asm-mips/mach-ip32/cpu-feature-overrides.h b/arch/mips/include/asm/mach-ip32/cpu-feature-overrides.h similarity index 100% rename from include/asm-mips/mach-ip32/cpu-feature-overrides.h rename to arch/mips/include/asm/mach-ip32/cpu-feature-overrides.h diff --git a/include/asm-mips/mach-ip32/dma-coherence.h b/arch/mips/include/asm/mach-ip32/dma-coherence.h similarity index 100% rename from include/asm-mips/mach-ip32/dma-coherence.h rename to arch/mips/include/asm/mach-ip32/dma-coherence.h diff --git a/include/asm-mips/mach-ip32/kmalloc.h b/arch/mips/include/asm/mach-ip32/kmalloc.h similarity index 100% rename from include/asm-mips/mach-ip32/kmalloc.h rename to arch/mips/include/asm/mach-ip32/kmalloc.h diff --git a/include/asm-mips/mach-ip32/mangle-port.h b/arch/mips/include/asm/mach-ip32/mangle-port.h similarity index 100% rename from include/asm-mips/mach-ip32/mangle-port.h rename to arch/mips/include/asm/mach-ip32/mangle-port.h diff --git a/include/asm-mips/mach-ip32/mc146818rtc.h b/arch/mips/include/asm/mach-ip32/mc146818rtc.h similarity index 100% rename from include/asm-mips/mach-ip32/mc146818rtc.h rename to arch/mips/include/asm/mach-ip32/mc146818rtc.h diff --git a/include/asm-mips/mach-ip32/war.h b/arch/mips/include/asm/mach-ip32/war.h similarity index 100% rename from include/asm-mips/mach-ip32/war.h rename to arch/mips/include/asm/mach-ip32/war.h diff --git a/include/asm-mips/mach-jazz/dma-coherence.h b/arch/mips/include/asm/mach-jazz/dma-coherence.h similarity index 100% rename from include/asm-mips/mach-jazz/dma-coherence.h rename to arch/mips/include/asm/mach-jazz/dma-coherence.h diff --git a/include/asm-mips/mach-jazz/floppy.h b/arch/mips/include/asm/mach-jazz/floppy.h similarity index 100% rename from include/asm-mips/mach-jazz/floppy.h rename to arch/mips/include/asm/mach-jazz/floppy.h diff --git a/include/asm-mips/mach-jazz/mc146818rtc.h b/arch/mips/include/asm/mach-jazz/mc146818rtc.h similarity index 100% rename from include/asm-mips/mach-jazz/mc146818rtc.h rename to arch/mips/include/asm/mach-jazz/mc146818rtc.h diff --git a/include/asm-mips/mach-jazz/war.h b/arch/mips/include/asm/mach-jazz/war.h similarity index 100% rename from include/asm-mips/mach-jazz/war.h rename to arch/mips/include/asm/mach-jazz/war.h diff --git a/include/asm-mips/mach-lasat/irq.h b/arch/mips/include/asm/mach-lasat/irq.h similarity index 100% rename from include/asm-mips/mach-lasat/irq.h rename to arch/mips/include/asm/mach-lasat/irq.h diff --git a/include/asm-mips/mach-lasat/mach-gt64120.h b/arch/mips/include/asm/mach-lasat/mach-gt64120.h similarity index 100% rename from include/asm-mips/mach-lasat/mach-gt64120.h rename to arch/mips/include/asm/mach-lasat/mach-gt64120.h diff --git a/include/asm-mips/mach-lasat/war.h b/arch/mips/include/asm/mach-lasat/war.h similarity index 100% rename from include/asm-mips/mach-lasat/war.h rename to arch/mips/include/asm/mach-lasat/war.h diff --git a/include/asm-mips/mach-lemote/dma-coherence.h b/arch/mips/include/asm/mach-lemote/dma-coherence.h similarity index 100% rename from include/asm-mips/mach-lemote/dma-coherence.h rename to arch/mips/include/asm/mach-lemote/dma-coherence.h diff --git a/include/asm-mips/mach-lemote/mc146818rtc.h b/arch/mips/include/asm/mach-lemote/mc146818rtc.h similarity index 100% rename from include/asm-mips/mach-lemote/mc146818rtc.h rename to arch/mips/include/asm/mach-lemote/mc146818rtc.h diff --git a/include/asm-mips/mach-lemote/war.h b/arch/mips/include/asm/mach-lemote/war.h similarity index 100% rename from include/asm-mips/mach-lemote/war.h rename to arch/mips/include/asm/mach-lemote/war.h diff --git a/include/asm-mips/mach-malta/cpu-feature-overrides.h b/arch/mips/include/asm/mach-malta/cpu-feature-overrides.h similarity index 100% rename from include/asm-mips/mach-malta/cpu-feature-overrides.h rename to arch/mips/include/asm/mach-malta/cpu-feature-overrides.h diff --git a/include/asm-mips/mach-malta/irq.h b/arch/mips/include/asm/mach-malta/irq.h similarity index 100% rename from include/asm-mips/mach-malta/irq.h rename to arch/mips/include/asm/mach-malta/irq.h diff --git a/include/asm-mips/mach-malta/kernel-entry-init.h b/arch/mips/include/asm/mach-malta/kernel-entry-init.h similarity index 100% rename from include/asm-mips/mach-malta/kernel-entry-init.h rename to arch/mips/include/asm/mach-malta/kernel-entry-init.h diff --git a/include/asm-mips/mach-malta/mach-gt64120.h b/arch/mips/include/asm/mach-malta/mach-gt64120.h similarity index 100% rename from include/asm-mips/mach-malta/mach-gt64120.h rename to arch/mips/include/asm/mach-malta/mach-gt64120.h diff --git a/include/asm-mips/mach-malta/mc146818rtc.h b/arch/mips/include/asm/mach-malta/mc146818rtc.h similarity index 100% rename from include/asm-mips/mach-malta/mc146818rtc.h rename to arch/mips/include/asm/mach-malta/mc146818rtc.h diff --git a/include/asm-mips/mach-malta/war.h b/arch/mips/include/asm/mach-malta/war.h similarity index 100% rename from include/asm-mips/mach-malta/war.h rename to arch/mips/include/asm/mach-malta/war.h diff --git a/include/asm-mips/mach-mipssim/cpu-feature-overrides.h b/arch/mips/include/asm/mach-mipssim/cpu-feature-overrides.h similarity index 100% rename from include/asm-mips/mach-mipssim/cpu-feature-overrides.h rename to arch/mips/include/asm/mach-mipssim/cpu-feature-overrides.h diff --git a/include/asm-mips/mach-mipssim/war.h b/arch/mips/include/asm/mach-mipssim/war.h similarity index 100% rename from include/asm-mips/mach-mipssim/war.h rename to arch/mips/include/asm/mach-mipssim/war.h diff --git a/include/asm-mips/mach-pb1x00/mc146818rtc.h b/arch/mips/include/asm/mach-pb1x00/mc146818rtc.h similarity index 100% rename from include/asm-mips/mach-pb1x00/mc146818rtc.h rename to arch/mips/include/asm/mach-pb1x00/mc146818rtc.h diff --git a/include/asm-mips/mach-pb1x00/pb1000.h b/arch/mips/include/asm/mach-pb1x00/pb1000.h similarity index 100% rename from include/asm-mips/mach-pb1x00/pb1000.h rename to arch/mips/include/asm/mach-pb1x00/pb1000.h diff --git a/include/asm-mips/mach-pb1x00/pb1100.h b/arch/mips/include/asm/mach-pb1x00/pb1100.h similarity index 100% rename from include/asm-mips/mach-pb1x00/pb1100.h rename to arch/mips/include/asm/mach-pb1x00/pb1100.h diff --git a/include/asm-mips/mach-pb1x00/pb1200.h b/arch/mips/include/asm/mach-pb1x00/pb1200.h similarity index 100% rename from include/asm-mips/mach-pb1x00/pb1200.h rename to arch/mips/include/asm/mach-pb1x00/pb1200.h diff --git a/include/asm-mips/mach-pb1x00/pb1500.h b/arch/mips/include/asm/mach-pb1x00/pb1500.h similarity index 100% rename from include/asm-mips/mach-pb1x00/pb1500.h rename to arch/mips/include/asm/mach-pb1x00/pb1500.h diff --git a/include/asm-mips/mach-pb1x00/pb1550.h b/arch/mips/include/asm/mach-pb1x00/pb1550.h similarity index 100% rename from include/asm-mips/mach-pb1x00/pb1550.h rename to arch/mips/include/asm/mach-pb1x00/pb1550.h diff --git a/include/asm-mips/mach-pnx8550/cm.h b/arch/mips/include/asm/mach-pnx8550/cm.h similarity index 100% rename from include/asm-mips/mach-pnx8550/cm.h rename to arch/mips/include/asm/mach-pnx8550/cm.h diff --git a/include/asm-mips/mach-pnx8550/glb.h b/arch/mips/include/asm/mach-pnx8550/glb.h similarity index 100% rename from include/asm-mips/mach-pnx8550/glb.h rename to arch/mips/include/asm/mach-pnx8550/glb.h diff --git a/include/asm-mips/mach-pnx8550/int.h b/arch/mips/include/asm/mach-pnx8550/int.h similarity index 100% rename from include/asm-mips/mach-pnx8550/int.h rename to arch/mips/include/asm/mach-pnx8550/int.h diff --git a/include/asm-mips/mach-pnx8550/kernel-entry-init.h b/arch/mips/include/asm/mach-pnx8550/kernel-entry-init.h similarity index 100% rename from include/asm-mips/mach-pnx8550/kernel-entry-init.h rename to arch/mips/include/asm/mach-pnx8550/kernel-entry-init.h diff --git a/include/asm-mips/mach-pnx8550/nand.h b/arch/mips/include/asm/mach-pnx8550/nand.h similarity index 100% rename from include/asm-mips/mach-pnx8550/nand.h rename to arch/mips/include/asm/mach-pnx8550/nand.h diff --git a/include/asm-mips/mach-pnx8550/pci.h b/arch/mips/include/asm/mach-pnx8550/pci.h similarity index 100% rename from include/asm-mips/mach-pnx8550/pci.h rename to arch/mips/include/asm/mach-pnx8550/pci.h diff --git a/include/asm-mips/mach-pnx8550/uart.h b/arch/mips/include/asm/mach-pnx8550/uart.h similarity index 100% rename from include/asm-mips/mach-pnx8550/uart.h rename to arch/mips/include/asm/mach-pnx8550/uart.h diff --git a/include/asm-mips/mach-pnx8550/usb.h b/arch/mips/include/asm/mach-pnx8550/usb.h similarity index 100% rename from include/asm-mips/mach-pnx8550/usb.h rename to arch/mips/include/asm/mach-pnx8550/usb.h diff --git a/include/asm-mips/mach-pnx8550/war.h b/arch/mips/include/asm/mach-pnx8550/war.h similarity index 100% rename from include/asm-mips/mach-pnx8550/war.h rename to arch/mips/include/asm/mach-pnx8550/war.h diff --git a/include/asm-mips/mach-rc32434/cpu-feature-overrides.h b/arch/mips/include/asm/mach-rc32434/cpu-feature-overrides.h similarity index 100% rename from include/asm-mips/mach-rc32434/cpu-feature-overrides.h rename to arch/mips/include/asm/mach-rc32434/cpu-feature-overrides.h diff --git a/include/asm-mips/mach-rc32434/ddr.h b/arch/mips/include/asm/mach-rc32434/ddr.h similarity index 100% rename from include/asm-mips/mach-rc32434/ddr.h rename to arch/mips/include/asm/mach-rc32434/ddr.h diff --git a/include/asm-mips/mach-rc32434/dma.h b/arch/mips/include/asm/mach-rc32434/dma.h similarity index 100% rename from include/asm-mips/mach-rc32434/dma.h rename to arch/mips/include/asm/mach-rc32434/dma.h diff --git a/include/asm-mips/mach-rc32434/dma_v.h b/arch/mips/include/asm/mach-rc32434/dma_v.h similarity index 100% rename from include/asm-mips/mach-rc32434/dma_v.h rename to arch/mips/include/asm/mach-rc32434/dma_v.h diff --git a/include/asm-mips/mach-rc32434/eth.h b/arch/mips/include/asm/mach-rc32434/eth.h similarity index 100% rename from include/asm-mips/mach-rc32434/eth.h rename to arch/mips/include/asm/mach-rc32434/eth.h diff --git a/include/asm-mips/mach-rc32434/gpio.h b/arch/mips/include/asm/mach-rc32434/gpio.h similarity index 100% rename from include/asm-mips/mach-rc32434/gpio.h rename to arch/mips/include/asm/mach-rc32434/gpio.h diff --git a/include/asm-mips/mach-rc32434/integ.h b/arch/mips/include/asm/mach-rc32434/integ.h similarity index 100% rename from include/asm-mips/mach-rc32434/integ.h rename to arch/mips/include/asm/mach-rc32434/integ.h diff --git a/include/asm-mips/mach-rc32434/irq.h b/arch/mips/include/asm/mach-rc32434/irq.h similarity index 100% rename from include/asm-mips/mach-rc32434/irq.h rename to arch/mips/include/asm/mach-rc32434/irq.h diff --git a/include/asm-mips/mach-rc32434/pci.h b/arch/mips/include/asm/mach-rc32434/pci.h similarity index 100% rename from include/asm-mips/mach-rc32434/pci.h rename to arch/mips/include/asm/mach-rc32434/pci.h diff --git a/include/asm-mips/mach-rc32434/prom.h b/arch/mips/include/asm/mach-rc32434/prom.h similarity index 100% rename from include/asm-mips/mach-rc32434/prom.h rename to arch/mips/include/asm/mach-rc32434/prom.h diff --git a/include/asm-mips/mach-rc32434/rb.h b/arch/mips/include/asm/mach-rc32434/rb.h similarity index 100% rename from include/asm-mips/mach-rc32434/rb.h rename to arch/mips/include/asm/mach-rc32434/rb.h diff --git a/include/asm-mips/mach-rc32434/rc32434.h b/arch/mips/include/asm/mach-rc32434/rc32434.h similarity index 100% rename from include/asm-mips/mach-rc32434/rc32434.h rename to arch/mips/include/asm/mach-rc32434/rc32434.h diff --git a/include/asm-mips/mach-rc32434/timer.h b/arch/mips/include/asm/mach-rc32434/timer.h similarity index 100% rename from include/asm-mips/mach-rc32434/timer.h rename to arch/mips/include/asm/mach-rc32434/timer.h diff --git a/include/asm-mips/mach-rc32434/war.h b/arch/mips/include/asm/mach-rc32434/war.h similarity index 100% rename from include/asm-mips/mach-rc32434/war.h rename to arch/mips/include/asm/mach-rc32434/war.h diff --git a/include/asm-mips/mach-rm/cpu-feature-overrides.h b/arch/mips/include/asm/mach-rm/cpu-feature-overrides.h similarity index 100% rename from include/asm-mips/mach-rm/cpu-feature-overrides.h rename to arch/mips/include/asm/mach-rm/cpu-feature-overrides.h diff --git a/include/asm-mips/mach-rm/mc146818rtc.h b/arch/mips/include/asm/mach-rm/mc146818rtc.h similarity index 100% rename from include/asm-mips/mach-rm/mc146818rtc.h rename to arch/mips/include/asm/mach-rm/mc146818rtc.h diff --git a/include/asm-mips/mach-rm/war.h b/arch/mips/include/asm/mach-rm/war.h similarity index 100% rename from include/asm-mips/mach-rm/war.h rename to arch/mips/include/asm/mach-rm/war.h diff --git a/include/asm-mips/mach-sibyte/cpu-feature-overrides.h b/arch/mips/include/asm/mach-sibyte/cpu-feature-overrides.h similarity index 100% rename from include/asm-mips/mach-sibyte/cpu-feature-overrides.h rename to arch/mips/include/asm/mach-sibyte/cpu-feature-overrides.h diff --git a/include/asm-mips/mach-sibyte/war.h b/arch/mips/include/asm/mach-sibyte/war.h similarity index 100% rename from include/asm-mips/mach-sibyte/war.h rename to arch/mips/include/asm/mach-sibyte/war.h diff --git a/include/asm-mips/mach-tx39xx/ioremap.h b/arch/mips/include/asm/mach-tx39xx/ioremap.h similarity index 100% rename from include/asm-mips/mach-tx39xx/ioremap.h rename to arch/mips/include/asm/mach-tx39xx/ioremap.h diff --git a/include/asm-mips/mach-tx39xx/mangle-port.h b/arch/mips/include/asm/mach-tx39xx/mangle-port.h similarity index 100% rename from include/asm-mips/mach-tx39xx/mangle-port.h rename to arch/mips/include/asm/mach-tx39xx/mangle-port.h diff --git a/include/asm-mips/mach-tx39xx/war.h b/arch/mips/include/asm/mach-tx39xx/war.h similarity index 100% rename from include/asm-mips/mach-tx39xx/war.h rename to arch/mips/include/asm/mach-tx39xx/war.h diff --git a/include/asm-mips/mach-tx49xx/cpu-feature-overrides.h b/arch/mips/include/asm/mach-tx49xx/cpu-feature-overrides.h similarity index 100% rename from include/asm-mips/mach-tx49xx/cpu-feature-overrides.h rename to arch/mips/include/asm/mach-tx49xx/cpu-feature-overrides.h diff --git a/include/asm-mips/mach-tx49xx/ioremap.h b/arch/mips/include/asm/mach-tx49xx/ioremap.h similarity index 100% rename from include/asm-mips/mach-tx49xx/ioremap.h rename to arch/mips/include/asm/mach-tx49xx/ioremap.h diff --git a/include/asm-mips/mach-tx49xx/kmalloc.h b/arch/mips/include/asm/mach-tx49xx/kmalloc.h similarity index 100% rename from include/asm-mips/mach-tx49xx/kmalloc.h rename to arch/mips/include/asm/mach-tx49xx/kmalloc.h diff --git a/include/asm-mips/mach-tx49xx/war.h b/arch/mips/include/asm/mach-tx49xx/war.h similarity index 100% rename from include/asm-mips/mach-tx49xx/war.h rename to arch/mips/include/asm/mach-tx49xx/war.h diff --git a/include/asm-mips/mach-vr41xx/irq.h b/arch/mips/include/asm/mach-vr41xx/irq.h similarity index 100% rename from include/asm-mips/mach-vr41xx/irq.h rename to arch/mips/include/asm/mach-vr41xx/irq.h diff --git a/include/asm-mips/mach-vr41xx/war.h b/arch/mips/include/asm/mach-vr41xx/war.h similarity index 100% rename from include/asm-mips/mach-vr41xx/war.h rename to arch/mips/include/asm/mach-vr41xx/war.h diff --git a/include/asm-mips/mach-wrppmc/mach-gt64120.h b/arch/mips/include/asm/mach-wrppmc/mach-gt64120.h similarity index 100% rename from include/asm-mips/mach-wrppmc/mach-gt64120.h rename to arch/mips/include/asm/mach-wrppmc/mach-gt64120.h diff --git a/include/asm-mips/mach-wrppmc/war.h b/arch/mips/include/asm/mach-wrppmc/war.h similarity index 100% rename from include/asm-mips/mach-wrppmc/war.h rename to arch/mips/include/asm/mach-wrppmc/war.h diff --git a/include/asm-mips/mach-yosemite/cpu-feature-overrides.h b/arch/mips/include/asm/mach-yosemite/cpu-feature-overrides.h similarity index 100% rename from include/asm-mips/mach-yosemite/cpu-feature-overrides.h rename to arch/mips/include/asm/mach-yosemite/cpu-feature-overrides.h diff --git a/include/asm-mips/mach-yosemite/war.h b/arch/mips/include/asm/mach-yosemite/war.h similarity index 100% rename from include/asm-mips/mach-yosemite/war.h rename to arch/mips/include/asm/mach-yosemite/war.h diff --git a/include/asm-mips/mc146818-time.h b/arch/mips/include/asm/mc146818-time.h similarity index 100% rename from include/asm-mips/mc146818-time.h rename to arch/mips/include/asm/mc146818-time.h diff --git a/include/asm-mips/mc146818rtc.h b/arch/mips/include/asm/mc146818rtc.h similarity index 100% rename from include/asm-mips/mc146818rtc.h rename to arch/mips/include/asm/mc146818rtc.h diff --git a/include/asm-mips/mips-boards/bonito64.h b/arch/mips/include/asm/mips-boards/bonito64.h similarity index 100% rename from include/asm-mips/mips-boards/bonito64.h rename to arch/mips/include/asm/mips-boards/bonito64.h diff --git a/include/asm-mips/mips-boards/generic.h b/arch/mips/include/asm/mips-boards/generic.h similarity index 100% rename from include/asm-mips/mips-boards/generic.h rename to arch/mips/include/asm/mips-boards/generic.h diff --git a/include/asm-mips/mips-boards/launch.h b/arch/mips/include/asm/mips-boards/launch.h similarity index 100% rename from include/asm-mips/mips-boards/launch.h rename to arch/mips/include/asm/mips-boards/launch.h diff --git a/include/asm-mips/mips-boards/malta.h b/arch/mips/include/asm/mips-boards/malta.h similarity index 100% rename from include/asm-mips/mips-boards/malta.h rename to arch/mips/include/asm/mips-boards/malta.h diff --git a/include/asm-mips/mips-boards/maltaint.h b/arch/mips/include/asm/mips-boards/maltaint.h similarity index 100% rename from include/asm-mips/mips-boards/maltaint.h rename to arch/mips/include/asm/mips-boards/maltaint.h diff --git a/include/asm-mips/mips-boards/msc01_pci.h b/arch/mips/include/asm/mips-boards/msc01_pci.h similarity index 100% rename from include/asm-mips/mips-boards/msc01_pci.h rename to arch/mips/include/asm/mips-boards/msc01_pci.h diff --git a/include/asm-mips/mips-boards/piix4.h b/arch/mips/include/asm/mips-boards/piix4.h similarity index 100% rename from include/asm-mips/mips-boards/piix4.h rename to arch/mips/include/asm/mips-boards/piix4.h diff --git a/include/asm-mips/mips-boards/prom.h b/arch/mips/include/asm/mips-boards/prom.h similarity index 100% rename from include/asm-mips/mips-boards/prom.h rename to arch/mips/include/asm/mips-boards/prom.h diff --git a/include/asm-mips/mips-boards/sim.h b/arch/mips/include/asm/mips-boards/sim.h similarity index 100% rename from include/asm-mips/mips-boards/sim.h rename to arch/mips/include/asm/mips-boards/sim.h diff --git a/include/asm-mips/mips-boards/simint.h b/arch/mips/include/asm/mips-boards/simint.h similarity index 100% rename from include/asm-mips/mips-boards/simint.h rename to arch/mips/include/asm/mips-boards/simint.h diff --git a/include/asm-mips/mips_mt.h b/arch/mips/include/asm/mips_mt.h similarity index 100% rename from include/asm-mips/mips_mt.h rename to arch/mips/include/asm/mips_mt.h diff --git a/include/asm-mips/mipsmtregs.h b/arch/mips/include/asm/mipsmtregs.h similarity index 100% rename from include/asm-mips/mipsmtregs.h rename to arch/mips/include/asm/mipsmtregs.h diff --git a/include/asm-mips/mipsprom.h b/arch/mips/include/asm/mipsprom.h similarity index 100% rename from include/asm-mips/mipsprom.h rename to arch/mips/include/asm/mipsprom.h diff --git a/include/asm-mips/mipsregs.h b/arch/mips/include/asm/mipsregs.h similarity index 100% rename from include/asm-mips/mipsregs.h rename to arch/mips/include/asm/mipsregs.h diff --git a/include/asm-mips/mman.h b/arch/mips/include/asm/mman.h similarity index 100% rename from include/asm-mips/mman.h rename to arch/mips/include/asm/mman.h diff --git a/include/asm-mips/mmu.h b/arch/mips/include/asm/mmu.h similarity index 100% rename from include/asm-mips/mmu.h rename to arch/mips/include/asm/mmu.h diff --git a/include/asm-mips/mmu_context.h b/arch/mips/include/asm/mmu_context.h similarity index 97% rename from include/asm-mips/mmu_context.h rename to arch/mips/include/asm/mmu_context.h index 0c4f245eaeb2..d7f3eb03ad12 100644 --- a/include/asm-mips/mmu_context.h +++ b/arch/mips/include/asm/mmu_context.h @@ -220,8 +220,8 @@ activate_mm(struct mm_struct *prev, struct mm_struct *next) oldasid = read_c0_entryhi() & ASID_MASK; if(smtc_live_asid[mytlb][oldasid]) { smtc_live_asid[mytlb][oldasid] &= ~(0x1 << cpu); - if(smtc_live_asid[mytlb][oldasid] == 0) - smtc_flush_tlb_asid(oldasid); + if(smtc_live_asid[mytlb][oldasid] == 0) + smtc_flush_tlb_asid(oldasid); } /* See comments for similar code above */ write_c0_entryhi((read_c0_entryhi() & ~HW_ASID_MASK) | @@ -285,8 +285,8 @@ drop_mmu_context(struct mm_struct *mm, unsigned cpu) /* SMTC shares the TLB (and ASIDs) across VPEs */ for_each_online_cpu(i) { - if((smtc_status & SMTC_TLB_SHARED) - || (cpu_data[i].vpe_id == cpu_data[cpu].vpe_id)) + if((smtc_status & SMTC_TLB_SHARED) + || (cpu_data[i].vpe_id == cpu_data[cpu].vpe_id)) cpu_context(i, mm) = 0; } #endif /* CONFIG_MIPS_MT_SMTC */ diff --git a/include/asm-mips/mmzone.h b/arch/mips/include/asm/mmzone.h similarity index 100% rename from include/asm-mips/mmzone.h rename to arch/mips/include/asm/mmzone.h diff --git a/include/asm-mips/module.h b/arch/mips/include/asm/module.h similarity index 100% rename from include/asm-mips/module.h rename to arch/mips/include/asm/module.h diff --git a/include/asm-mips/msc01_ic.h b/arch/mips/include/asm/msc01_ic.h similarity index 100% rename from include/asm-mips/msc01_ic.h rename to arch/mips/include/asm/msc01_ic.h diff --git a/include/asm-mips/msgbuf.h b/arch/mips/include/asm/msgbuf.h similarity index 100% rename from include/asm-mips/msgbuf.h rename to arch/mips/include/asm/msgbuf.h diff --git a/include/asm-mips/mutex.h b/arch/mips/include/asm/mutex.h similarity index 100% rename from include/asm-mips/mutex.h rename to arch/mips/include/asm/mutex.h diff --git a/include/asm-mips/nile4.h b/arch/mips/include/asm/nile4.h similarity index 100% rename from include/asm-mips/nile4.h rename to arch/mips/include/asm/nile4.h diff --git a/include/asm-mips/paccess.h b/arch/mips/include/asm/paccess.h similarity index 100% rename from include/asm-mips/paccess.h rename to arch/mips/include/asm/paccess.h diff --git a/include/asm-mips/page.h b/arch/mips/include/asm/page.h similarity index 100% rename from include/asm-mips/page.h rename to arch/mips/include/asm/page.h diff --git a/include/asm-mips/param.h b/arch/mips/include/asm/param.h similarity index 100% rename from include/asm-mips/param.h rename to arch/mips/include/asm/param.h diff --git a/include/asm-mips/parport.h b/arch/mips/include/asm/parport.h similarity index 100% rename from include/asm-mips/parport.h rename to arch/mips/include/asm/parport.h diff --git a/include/asm-mips/pci.h b/arch/mips/include/asm/pci.h similarity index 100% rename from include/asm-mips/pci.h rename to arch/mips/include/asm/pci.h diff --git a/include/asm-mips/pci/bridge.h b/arch/mips/include/asm/pci/bridge.h similarity index 100% rename from include/asm-mips/pci/bridge.h rename to arch/mips/include/asm/pci/bridge.h diff --git a/include/asm-mips/percpu.h b/arch/mips/include/asm/percpu.h similarity index 100% rename from include/asm-mips/percpu.h rename to arch/mips/include/asm/percpu.h diff --git a/include/asm-mips/pgalloc.h b/arch/mips/include/asm/pgalloc.h similarity index 100% rename from include/asm-mips/pgalloc.h rename to arch/mips/include/asm/pgalloc.h diff --git a/include/asm-mips/pgtable-32.h b/arch/mips/include/asm/pgtable-32.h similarity index 100% rename from include/asm-mips/pgtable-32.h rename to arch/mips/include/asm/pgtable-32.h diff --git a/include/asm-mips/pgtable-64.h b/arch/mips/include/asm/pgtable-64.h similarity index 100% rename from include/asm-mips/pgtable-64.h rename to arch/mips/include/asm/pgtable-64.h diff --git a/include/asm-mips/pgtable-bits.h b/arch/mips/include/asm/pgtable-bits.h similarity index 100% rename from include/asm-mips/pgtable-bits.h rename to arch/mips/include/asm/pgtable-bits.h diff --git a/include/asm-mips/pgtable.h b/arch/mips/include/asm/pgtable.h similarity index 100% rename from include/asm-mips/pgtable.h rename to arch/mips/include/asm/pgtable.h diff --git a/include/asm-mips/pmc-sierra/msp71xx/gpio.h b/arch/mips/include/asm/pmc-sierra/msp71xx/gpio.h similarity index 100% rename from include/asm-mips/pmc-sierra/msp71xx/gpio.h rename to arch/mips/include/asm/pmc-sierra/msp71xx/gpio.h diff --git a/include/asm-mips/pmc-sierra/msp71xx/msp_cic_int.h b/arch/mips/include/asm/pmc-sierra/msp71xx/msp_cic_int.h similarity index 100% rename from include/asm-mips/pmc-sierra/msp71xx/msp_cic_int.h rename to arch/mips/include/asm/pmc-sierra/msp71xx/msp_cic_int.h diff --git a/include/asm-mips/pmc-sierra/msp71xx/msp_int.h b/arch/mips/include/asm/pmc-sierra/msp71xx/msp_int.h similarity index 100% rename from include/asm-mips/pmc-sierra/msp71xx/msp_int.h rename to arch/mips/include/asm/pmc-sierra/msp71xx/msp_int.h diff --git a/include/asm-mips/pmc-sierra/msp71xx/msp_pci.h b/arch/mips/include/asm/pmc-sierra/msp71xx/msp_pci.h similarity index 100% rename from include/asm-mips/pmc-sierra/msp71xx/msp_pci.h rename to arch/mips/include/asm/pmc-sierra/msp71xx/msp_pci.h diff --git a/include/asm-mips/pmc-sierra/msp71xx/msp_prom.h b/arch/mips/include/asm/pmc-sierra/msp71xx/msp_prom.h similarity index 100% rename from include/asm-mips/pmc-sierra/msp71xx/msp_prom.h rename to arch/mips/include/asm/pmc-sierra/msp71xx/msp_prom.h diff --git a/include/asm-mips/pmc-sierra/msp71xx/msp_regops.h b/arch/mips/include/asm/pmc-sierra/msp71xx/msp_regops.h similarity index 100% rename from include/asm-mips/pmc-sierra/msp71xx/msp_regops.h rename to arch/mips/include/asm/pmc-sierra/msp71xx/msp_regops.h diff --git a/include/asm-mips/pmc-sierra/msp71xx/msp_regs.h b/arch/mips/include/asm/pmc-sierra/msp71xx/msp_regs.h similarity index 100% rename from include/asm-mips/pmc-sierra/msp71xx/msp_regs.h rename to arch/mips/include/asm/pmc-sierra/msp71xx/msp_regs.h diff --git a/include/asm-mips/pmc-sierra/msp71xx/msp_slp_int.h b/arch/mips/include/asm/pmc-sierra/msp71xx/msp_slp_int.h similarity index 100% rename from include/asm-mips/pmc-sierra/msp71xx/msp_slp_int.h rename to arch/mips/include/asm/pmc-sierra/msp71xx/msp_slp_int.h diff --git a/include/asm-mips/pmc-sierra/msp71xx/war.h b/arch/mips/include/asm/pmc-sierra/msp71xx/war.h similarity index 100% rename from include/asm-mips/pmc-sierra/msp71xx/war.h rename to arch/mips/include/asm/pmc-sierra/msp71xx/war.h diff --git a/include/asm-mips/pmon.h b/arch/mips/include/asm/pmon.h similarity index 100% rename from include/asm-mips/pmon.h rename to arch/mips/include/asm/pmon.h diff --git a/include/asm-mips/poll.h b/arch/mips/include/asm/poll.h similarity index 100% rename from include/asm-mips/poll.h rename to arch/mips/include/asm/poll.h diff --git a/include/asm-mips/posix_types.h b/arch/mips/include/asm/posix_types.h similarity index 100% rename from include/asm-mips/posix_types.h rename to arch/mips/include/asm/posix_types.h diff --git a/include/asm-mips/prefetch.h b/arch/mips/include/asm/prefetch.h similarity index 100% rename from include/asm-mips/prefetch.h rename to arch/mips/include/asm/prefetch.h diff --git a/include/asm-mips/processor.h b/arch/mips/include/asm/processor.h similarity index 100% rename from include/asm-mips/processor.h rename to arch/mips/include/asm/processor.h diff --git a/include/asm-mips/ptrace.h b/arch/mips/include/asm/ptrace.h similarity index 100% rename from include/asm-mips/ptrace.h rename to arch/mips/include/asm/ptrace.h diff --git a/include/asm-mips/r4k-timer.h b/arch/mips/include/asm/r4k-timer.h similarity index 100% rename from include/asm-mips/r4k-timer.h rename to arch/mips/include/asm/r4k-timer.h diff --git a/include/asm-mips/r4kcache.h b/arch/mips/include/asm/r4kcache.h similarity index 100% rename from include/asm-mips/r4kcache.h rename to arch/mips/include/asm/r4kcache.h diff --git a/include/asm-mips/reboot.h b/arch/mips/include/asm/reboot.h similarity index 100% rename from include/asm-mips/reboot.h rename to arch/mips/include/asm/reboot.h diff --git a/include/asm-mips/reg.h b/arch/mips/include/asm/reg.h similarity index 100% rename from include/asm-mips/reg.h rename to arch/mips/include/asm/reg.h diff --git a/include/asm-mips/regdef.h b/arch/mips/include/asm/regdef.h similarity index 100% rename from include/asm-mips/regdef.h rename to arch/mips/include/asm/regdef.h diff --git a/include/asm-mips/resource.h b/arch/mips/include/asm/resource.h similarity index 100% rename from include/asm-mips/resource.h rename to arch/mips/include/asm/resource.h diff --git a/include/asm-mips/rm9k-ocd.h b/arch/mips/include/asm/rm9k-ocd.h similarity index 100% rename from include/asm-mips/rm9k-ocd.h rename to arch/mips/include/asm/rm9k-ocd.h diff --git a/include/asm-mips/rtlx.h b/arch/mips/include/asm/rtlx.h similarity index 100% rename from include/asm-mips/rtlx.h rename to arch/mips/include/asm/rtlx.h diff --git a/include/asm-mips/scatterlist.h b/arch/mips/include/asm/scatterlist.h similarity index 100% rename from include/asm-mips/scatterlist.h rename to arch/mips/include/asm/scatterlist.h diff --git a/include/asm-mips/seccomp.h b/arch/mips/include/asm/seccomp.h similarity index 100% rename from include/asm-mips/seccomp.h rename to arch/mips/include/asm/seccomp.h diff --git a/include/asm-mips/sections.h b/arch/mips/include/asm/sections.h similarity index 100% rename from include/asm-mips/sections.h rename to arch/mips/include/asm/sections.h diff --git a/include/asm-mips/segment.h b/arch/mips/include/asm/segment.h similarity index 100% rename from include/asm-mips/segment.h rename to arch/mips/include/asm/segment.h diff --git a/include/asm-mips/sembuf.h b/arch/mips/include/asm/sembuf.h similarity index 100% rename from include/asm-mips/sembuf.h rename to arch/mips/include/asm/sembuf.h diff --git a/include/asm-mips/serial.h b/arch/mips/include/asm/serial.h similarity index 100% rename from include/asm-mips/serial.h rename to arch/mips/include/asm/serial.h diff --git a/include/asm-mips/setup.h b/arch/mips/include/asm/setup.h similarity index 100% rename from include/asm-mips/setup.h rename to arch/mips/include/asm/setup.h diff --git a/include/asm-mips/sgi/gio.h b/arch/mips/include/asm/sgi/gio.h similarity index 100% rename from include/asm-mips/sgi/gio.h rename to arch/mips/include/asm/sgi/gio.h diff --git a/include/asm-mips/sgi/hpc3.h b/arch/mips/include/asm/sgi/hpc3.h similarity index 100% rename from include/asm-mips/sgi/hpc3.h rename to arch/mips/include/asm/sgi/hpc3.h diff --git a/include/asm-mips/sgi/ioc.h b/arch/mips/include/asm/sgi/ioc.h similarity index 100% rename from include/asm-mips/sgi/ioc.h rename to arch/mips/include/asm/sgi/ioc.h diff --git a/include/asm-mips/sgi/ip22.h b/arch/mips/include/asm/sgi/ip22.h similarity index 100% rename from include/asm-mips/sgi/ip22.h rename to arch/mips/include/asm/sgi/ip22.h diff --git a/include/asm-mips/sgi/mc.h b/arch/mips/include/asm/sgi/mc.h similarity index 100% rename from include/asm-mips/sgi/mc.h rename to arch/mips/include/asm/sgi/mc.h diff --git a/include/asm-mips/sgi/pi1.h b/arch/mips/include/asm/sgi/pi1.h similarity index 100% rename from include/asm-mips/sgi/pi1.h rename to arch/mips/include/asm/sgi/pi1.h diff --git a/include/asm-mips/sgi/seeq.h b/arch/mips/include/asm/sgi/seeq.h similarity index 100% rename from include/asm-mips/sgi/seeq.h rename to arch/mips/include/asm/sgi/seeq.h diff --git a/include/asm-mips/sgi/sgi.h b/arch/mips/include/asm/sgi/sgi.h similarity index 100% rename from include/asm-mips/sgi/sgi.h rename to arch/mips/include/asm/sgi/sgi.h diff --git a/include/asm-mips/sgi/wd.h b/arch/mips/include/asm/sgi/wd.h similarity index 100% rename from include/asm-mips/sgi/wd.h rename to arch/mips/include/asm/sgi/wd.h diff --git a/include/asm-mips/sgialib.h b/arch/mips/include/asm/sgialib.h similarity index 100% rename from include/asm-mips/sgialib.h rename to arch/mips/include/asm/sgialib.h diff --git a/include/asm-mips/sgiarcs.h b/arch/mips/include/asm/sgiarcs.h similarity index 100% rename from include/asm-mips/sgiarcs.h rename to arch/mips/include/asm/sgiarcs.h diff --git a/include/asm-mips/sgidefs.h b/arch/mips/include/asm/sgidefs.h similarity index 100% rename from include/asm-mips/sgidefs.h rename to arch/mips/include/asm/sgidefs.h diff --git a/include/asm-mips/shmbuf.h b/arch/mips/include/asm/shmbuf.h similarity index 100% rename from include/asm-mips/shmbuf.h rename to arch/mips/include/asm/shmbuf.h diff --git a/include/asm-mips/shmparam.h b/arch/mips/include/asm/shmparam.h similarity index 100% rename from include/asm-mips/shmparam.h rename to arch/mips/include/asm/shmparam.h diff --git a/include/asm-mips/sibyte/bcm1480_int.h b/arch/mips/include/asm/sibyte/bcm1480_int.h similarity index 100% rename from include/asm-mips/sibyte/bcm1480_int.h rename to arch/mips/include/asm/sibyte/bcm1480_int.h diff --git a/include/asm-mips/sibyte/bcm1480_l2c.h b/arch/mips/include/asm/sibyte/bcm1480_l2c.h similarity index 100% rename from include/asm-mips/sibyte/bcm1480_l2c.h rename to arch/mips/include/asm/sibyte/bcm1480_l2c.h diff --git a/include/asm-mips/sibyte/bcm1480_mc.h b/arch/mips/include/asm/sibyte/bcm1480_mc.h similarity index 100% rename from include/asm-mips/sibyte/bcm1480_mc.h rename to arch/mips/include/asm/sibyte/bcm1480_mc.h diff --git a/include/asm-mips/sibyte/bcm1480_regs.h b/arch/mips/include/asm/sibyte/bcm1480_regs.h similarity index 100% rename from include/asm-mips/sibyte/bcm1480_regs.h rename to arch/mips/include/asm/sibyte/bcm1480_regs.h diff --git a/include/asm-mips/sibyte/bcm1480_scd.h b/arch/mips/include/asm/sibyte/bcm1480_scd.h similarity index 100% rename from include/asm-mips/sibyte/bcm1480_scd.h rename to arch/mips/include/asm/sibyte/bcm1480_scd.h diff --git a/include/asm-mips/sibyte/bigsur.h b/arch/mips/include/asm/sibyte/bigsur.h similarity index 100% rename from include/asm-mips/sibyte/bigsur.h rename to arch/mips/include/asm/sibyte/bigsur.h diff --git a/include/asm-mips/sibyte/board.h b/arch/mips/include/asm/sibyte/board.h similarity index 100% rename from include/asm-mips/sibyte/board.h rename to arch/mips/include/asm/sibyte/board.h diff --git a/include/asm-mips/sibyte/carmel.h b/arch/mips/include/asm/sibyte/carmel.h similarity index 100% rename from include/asm-mips/sibyte/carmel.h rename to arch/mips/include/asm/sibyte/carmel.h diff --git a/include/asm-mips/sibyte/sb1250.h b/arch/mips/include/asm/sibyte/sb1250.h similarity index 100% rename from include/asm-mips/sibyte/sb1250.h rename to arch/mips/include/asm/sibyte/sb1250.h diff --git a/include/asm-mips/sibyte/sb1250_defs.h b/arch/mips/include/asm/sibyte/sb1250_defs.h similarity index 100% rename from include/asm-mips/sibyte/sb1250_defs.h rename to arch/mips/include/asm/sibyte/sb1250_defs.h diff --git a/include/asm-mips/sibyte/sb1250_dma.h b/arch/mips/include/asm/sibyte/sb1250_dma.h similarity index 100% rename from include/asm-mips/sibyte/sb1250_dma.h rename to arch/mips/include/asm/sibyte/sb1250_dma.h diff --git a/include/asm-mips/sibyte/sb1250_genbus.h b/arch/mips/include/asm/sibyte/sb1250_genbus.h similarity index 100% rename from include/asm-mips/sibyte/sb1250_genbus.h rename to arch/mips/include/asm/sibyte/sb1250_genbus.h diff --git a/include/asm-mips/sibyte/sb1250_int.h b/arch/mips/include/asm/sibyte/sb1250_int.h similarity index 100% rename from include/asm-mips/sibyte/sb1250_int.h rename to arch/mips/include/asm/sibyte/sb1250_int.h diff --git a/include/asm-mips/sibyte/sb1250_l2c.h b/arch/mips/include/asm/sibyte/sb1250_l2c.h similarity index 100% rename from include/asm-mips/sibyte/sb1250_l2c.h rename to arch/mips/include/asm/sibyte/sb1250_l2c.h diff --git a/include/asm-mips/sibyte/sb1250_ldt.h b/arch/mips/include/asm/sibyte/sb1250_ldt.h similarity index 100% rename from include/asm-mips/sibyte/sb1250_ldt.h rename to arch/mips/include/asm/sibyte/sb1250_ldt.h diff --git a/include/asm-mips/sibyte/sb1250_mac.h b/arch/mips/include/asm/sibyte/sb1250_mac.h similarity index 100% rename from include/asm-mips/sibyte/sb1250_mac.h rename to arch/mips/include/asm/sibyte/sb1250_mac.h diff --git a/include/asm-mips/sibyte/sb1250_mc.h b/arch/mips/include/asm/sibyte/sb1250_mc.h similarity index 100% rename from include/asm-mips/sibyte/sb1250_mc.h rename to arch/mips/include/asm/sibyte/sb1250_mc.h diff --git a/include/asm-mips/sibyte/sb1250_regs.h b/arch/mips/include/asm/sibyte/sb1250_regs.h similarity index 100% rename from include/asm-mips/sibyte/sb1250_regs.h rename to arch/mips/include/asm/sibyte/sb1250_regs.h diff --git a/include/asm-mips/sibyte/sb1250_scd.h b/arch/mips/include/asm/sibyte/sb1250_scd.h similarity index 100% rename from include/asm-mips/sibyte/sb1250_scd.h rename to arch/mips/include/asm/sibyte/sb1250_scd.h diff --git a/include/asm-mips/sibyte/sb1250_smbus.h b/arch/mips/include/asm/sibyte/sb1250_smbus.h similarity index 100% rename from include/asm-mips/sibyte/sb1250_smbus.h rename to arch/mips/include/asm/sibyte/sb1250_smbus.h diff --git a/include/asm-mips/sibyte/sb1250_syncser.h b/arch/mips/include/asm/sibyte/sb1250_syncser.h similarity index 100% rename from include/asm-mips/sibyte/sb1250_syncser.h rename to arch/mips/include/asm/sibyte/sb1250_syncser.h diff --git a/include/asm-mips/sibyte/sb1250_uart.h b/arch/mips/include/asm/sibyte/sb1250_uart.h similarity index 100% rename from include/asm-mips/sibyte/sb1250_uart.h rename to arch/mips/include/asm/sibyte/sb1250_uart.h diff --git a/include/asm-mips/sibyte/sentosa.h b/arch/mips/include/asm/sibyte/sentosa.h similarity index 100% rename from include/asm-mips/sibyte/sentosa.h rename to arch/mips/include/asm/sibyte/sentosa.h diff --git a/include/asm-mips/sibyte/swarm.h b/arch/mips/include/asm/sibyte/swarm.h similarity index 100% rename from include/asm-mips/sibyte/swarm.h rename to arch/mips/include/asm/sibyte/swarm.h diff --git a/include/asm-mips/sigcontext.h b/arch/mips/include/asm/sigcontext.h similarity index 100% rename from include/asm-mips/sigcontext.h rename to arch/mips/include/asm/sigcontext.h diff --git a/include/asm-mips/siginfo.h b/arch/mips/include/asm/siginfo.h similarity index 100% rename from include/asm-mips/siginfo.h rename to arch/mips/include/asm/siginfo.h diff --git a/include/asm-mips/signal.h b/arch/mips/include/asm/signal.h similarity index 100% rename from include/asm-mips/signal.h rename to arch/mips/include/asm/signal.h diff --git a/include/asm-mips/sim.h b/arch/mips/include/asm/sim.h similarity index 100% rename from include/asm-mips/sim.h rename to arch/mips/include/asm/sim.h diff --git a/include/asm-mips/smp-ops.h b/arch/mips/include/asm/smp-ops.h similarity index 100% rename from include/asm-mips/smp-ops.h rename to arch/mips/include/asm/smp-ops.h diff --git a/include/asm-mips/smp.h b/arch/mips/include/asm/smp.h similarity index 100% rename from include/asm-mips/smp.h rename to arch/mips/include/asm/smp.h diff --git a/include/asm-mips/smtc.h b/arch/mips/include/asm/smtc.h similarity index 100% rename from include/asm-mips/smtc.h rename to arch/mips/include/asm/smtc.h diff --git a/include/asm-mips/smtc_ipi.h b/arch/mips/include/asm/smtc_ipi.h similarity index 100% rename from include/asm-mips/smtc_ipi.h rename to arch/mips/include/asm/smtc_ipi.h diff --git a/include/asm-mips/smtc_proc.h b/arch/mips/include/asm/smtc_proc.h similarity index 100% rename from include/asm-mips/smtc_proc.h rename to arch/mips/include/asm/smtc_proc.h diff --git a/include/asm-mips/smvp.h b/arch/mips/include/asm/smvp.h similarity index 100% rename from include/asm-mips/smvp.h rename to arch/mips/include/asm/smvp.h diff --git a/include/asm-mips/sn/addrs.h b/arch/mips/include/asm/sn/addrs.h similarity index 100% rename from include/asm-mips/sn/addrs.h rename to arch/mips/include/asm/sn/addrs.h diff --git a/include/asm-mips/sn/agent.h b/arch/mips/include/asm/sn/agent.h similarity index 100% rename from include/asm-mips/sn/agent.h rename to arch/mips/include/asm/sn/agent.h diff --git a/include/asm-mips/sn/arch.h b/arch/mips/include/asm/sn/arch.h similarity index 100% rename from include/asm-mips/sn/arch.h rename to arch/mips/include/asm/sn/arch.h diff --git a/include/asm-mips/sn/fru.h b/arch/mips/include/asm/sn/fru.h similarity index 100% rename from include/asm-mips/sn/fru.h rename to arch/mips/include/asm/sn/fru.h diff --git a/include/asm-mips/sn/gda.h b/arch/mips/include/asm/sn/gda.h similarity index 100% rename from include/asm-mips/sn/gda.h rename to arch/mips/include/asm/sn/gda.h diff --git a/include/asm-mips/sn/hub.h b/arch/mips/include/asm/sn/hub.h similarity index 100% rename from include/asm-mips/sn/hub.h rename to arch/mips/include/asm/sn/hub.h diff --git a/include/asm-mips/sn/intr.h b/arch/mips/include/asm/sn/intr.h similarity index 100% rename from include/asm-mips/sn/intr.h rename to arch/mips/include/asm/sn/intr.h diff --git a/include/asm-mips/sn/io.h b/arch/mips/include/asm/sn/io.h similarity index 100% rename from include/asm-mips/sn/io.h rename to arch/mips/include/asm/sn/io.h diff --git a/include/asm-mips/sn/ioc3.h b/arch/mips/include/asm/sn/ioc3.h similarity index 100% rename from include/asm-mips/sn/ioc3.h rename to arch/mips/include/asm/sn/ioc3.h diff --git a/include/asm-mips/sn/klconfig.h b/arch/mips/include/asm/sn/klconfig.h similarity index 96% rename from include/asm-mips/sn/klconfig.h rename to arch/mips/include/asm/sn/klconfig.h index 96cfd2ab1bcd..09e590daca17 100644 --- a/include/asm-mips/sn/klconfig.h +++ b/arch/mips/include/asm/sn/klconfig.h @@ -425,7 +425,7 @@ typedef struct lboard_s { unsigned char brd_sversion; /* version of this structure */ unsigned char brd_brevision; /* board revision */ unsigned char brd_promver; /* board prom version, if any */ - unsigned char brd_flags; /* Enabled, Disabled etc */ + unsigned char brd_flags; /* Enabled, Disabled etc */ unsigned char brd_slot; /* slot number */ unsigned short brd_debugsw; /* Debug switches */ moduleid_t brd_module; /* module to which it belongs */ @@ -595,9 +595,9 @@ typedef struct klcpu_s { /* CPU */ klinfo_t cpu_info; unsigned short cpu_prid; /* Processor PRID value */ unsigned short cpu_fpirr; /* FPU IRR value */ - unsigned short cpu_speed; /* Speed in MHZ */ - unsigned short cpu_scachesz; /* secondary cache size in MB */ - unsigned short cpu_scachespeed;/* secondary cache speed in MHz */ + unsigned short cpu_speed; /* Speed in MHZ */ + unsigned short cpu_scachesz; /* secondary cache size in MB */ + unsigned short cpu_scachespeed;/* secondary cache speed in MHz */ } klcpu_t ; #define CPU_STRUCT_VERSION 2 @@ -621,7 +621,7 @@ typedef struct klhub_uart_s { /* HUB */ typedef struct klmembnk_s { /* MEMORY BANK */ klinfo_t membnk_info; - short membnk_memsz; /* Total memory in megabytes */ + short membnk_memsz; /* Total memory in megabytes */ short membnk_dimm_select; /* bank to physical addr mapping*/ short membnk_bnksz[MD_MEM_BANKS]; /* Memory bank sizes */ short membnk_attr; @@ -657,7 +657,7 @@ typedef struct klmod_serial_num_s { typedef struct klxbow_s { /* XBOW */ klinfo_t xbow_info ; - klport_t xbow_port_info[MAX_XBOW_LINKS] ; /* Module number */ + klport_t xbow_port_info[MAX_XBOW_LINKS] ; /* Module number */ int xbow_master_hub_link; /* type of brd connected+component struct ptr+flags */ } klxbow_t ; @@ -673,9 +673,9 @@ typedef struct klpci_device_s { typedef struct klbri_s { /* BRIDGE */ klinfo_t bri_info ; - unsigned char bri_eprominfo ; /* IO6prom connected to bridge */ - unsigned char bri_bustype ; /* PCI/VME BUS bridge/GIO */ - pci_t pci_specific ; /* PCI Board config info */ + unsigned char bri_eprominfo ; /* IO6prom connected to bridge */ + unsigned char bri_bustype ; /* PCI/VME BUS bridge/GIO */ + pci_t pci_specific ; /* PCI Board config info */ klpci_device_t bri_devices[MAX_PCI_DEVS] ; /* PCI IDs */ klconf_off_t bri_mfg_nic ; } klbri_t ; @@ -684,9 +684,9 @@ typedef struct klbri_s { /* BRIDGE */ typedef struct klioc3_s { /* IOC3 */ klinfo_t ioc3_info ; - unsigned char ioc3_ssram ; /* Info about ssram */ - unsigned char ioc3_nvram ; /* Info about nvram */ - klinfo_t ioc3_superio ; /* Info about superio */ + unsigned char ioc3_ssram ; /* Info about ssram */ + unsigned char ioc3_nvram ; /* Info about nvram */ + klinfo_t ioc3_superio ; /* Info about superio */ klconf_off_t ioc3_tty_off ; klinfo_t ioc3_enet ; klconf_off_t ioc3_enet_off ; @@ -698,13 +698,13 @@ typedef struct klioc3_s { /* IOC3 */ typedef struct klvmeb_s { /* VME BRIDGE - PCI CTLR */ klinfo_t vmeb_info ; vmeb_t vmeb_specific ; - klconf_off_t vmeb_brdinfo[MAX_VME_SLOTS] ; /* VME Board config info */ + klconf_off_t vmeb_brdinfo[MAX_VME_SLOTS] ; /* VME Board config info */ } klvmeb_t ; typedef struct klvmed_s { /* VME DEVICE - VME BOARD */ klinfo_t vmed_info ; vmed_t vmed_specific ; - klconf_off_t vmed_brdinfo[MAX_VME_SLOTS] ; /* VME Board config info */ + klconf_off_t vmed_brdinfo[MAX_VME_SLOTS] ; /* VME Board config info */ } klvmed_t ; #define ROUTER_VECTOR_VERS 2 @@ -714,7 +714,7 @@ typedef struct klrou_s { /* ROUTER */ klinfo_t rou_info ; unsigned int rou_flags ; /* PCFG_ROUTER_xxx flags */ nic_t rou_box_nic ; /* nic of the containing module */ - klport_t rou_port[MAX_ROUTER_PORTS + 1] ; /* array index 1 to 6 */ + klport_t rou_port[MAX_ROUTER_PORTS + 1] ; /* array index 1 to 6 */ klconf_off_t rou_mfg_nic ; /* MFG NIC string */ u64 rou_vector; /* vector from master node */ } klrou_t ; @@ -769,7 +769,7 @@ typedef struct klgsn_s { /* GSN board */ typedef struct klscsi_s { /* SCSI Controller */ klinfo_t scsi_info ; - scsi_t scsi_specific ; + scsi_t scsi_specific ; unsigned char scsi_numdevs ; klconf_off_t scsi_devinfo[MAX_SCSI_DEVS] ; } klscsi_t ; @@ -803,13 +803,13 @@ typedef struct klmsdev_s { /* mouse device */ typedef struct klfddi_s { /* FDDI */ klinfo_t fddi_info ; - fddi_t fddi_specific ; + fddi_t fddi_specific ; klconf_off_t fddi_devinfo[MAX_FDDI_DEVS] ; } klfddi_t ; typedef struct klmio_s { /* MIO */ klinfo_t mio_info ; - mio_t mio_specific ; + mio_t mio_specific ; } klmio_t ; diff --git a/include/asm-mips/sn/kldir.h b/arch/mips/include/asm/sn/kldir.h similarity index 100% rename from include/asm-mips/sn/kldir.h rename to arch/mips/include/asm/sn/kldir.h diff --git a/include/asm-mips/sn/klkernvars.h b/arch/mips/include/asm/sn/klkernvars.h similarity index 100% rename from include/asm-mips/sn/klkernvars.h rename to arch/mips/include/asm/sn/klkernvars.h diff --git a/include/asm-mips/sn/launch.h b/arch/mips/include/asm/sn/launch.h similarity index 100% rename from include/asm-mips/sn/launch.h rename to arch/mips/include/asm/sn/launch.h diff --git a/include/asm-mips/sn/mapped_kernel.h b/arch/mips/include/asm/sn/mapped_kernel.h similarity index 100% rename from include/asm-mips/sn/mapped_kernel.h rename to arch/mips/include/asm/sn/mapped_kernel.h diff --git a/include/asm-mips/sn/nmi.h b/arch/mips/include/asm/sn/nmi.h similarity index 100% rename from include/asm-mips/sn/nmi.h rename to arch/mips/include/asm/sn/nmi.h diff --git a/include/asm-mips/sn/sn0/addrs.h b/arch/mips/include/asm/sn/sn0/addrs.h similarity index 100% rename from include/asm-mips/sn/sn0/addrs.h rename to arch/mips/include/asm/sn/sn0/addrs.h diff --git a/include/asm-mips/sn/sn0/arch.h b/arch/mips/include/asm/sn/sn0/arch.h similarity index 100% rename from include/asm-mips/sn/sn0/arch.h rename to arch/mips/include/asm/sn/sn0/arch.h diff --git a/include/asm-mips/sn/sn0/hub.h b/arch/mips/include/asm/sn/sn0/hub.h similarity index 100% rename from include/asm-mips/sn/sn0/hub.h rename to arch/mips/include/asm/sn/sn0/hub.h diff --git a/include/asm-mips/sn/sn0/hubio.h b/arch/mips/include/asm/sn/sn0/hubio.h similarity index 96% rename from include/asm-mips/sn/sn0/hubio.h rename to arch/mips/include/asm/sn/sn0/hubio.h index 0187895e556c..d0c29d4de084 100644 --- a/include/asm-mips/sn/sn0/hubio.h +++ b/arch/mips/include/asm/sn/sn0/hubio.h @@ -175,10 +175,10 @@ typedef union hubii_wid_u { u64 wid_reg_value; struct { u64 wid_rsvd: 32, /* unused */ - wid_rev_num: 4, /* revision number */ - wid_part_num: 16, /* the widget type: hub=c101 */ - wid_mfg_num: 11, /* Manufacturer id (IBM) */ - wid_rsvd1: 1; /* Reserved */ + wid_rev_num: 4, /* revision number */ + wid_part_num: 16, /* the widget type: hub=c101 */ + wid_mfg_num: 11, /* Manufacturer id (IBM) */ + wid_rsvd1: 1; /* Reserved */ } wid_fields_s; } hubii_wid_t; @@ -187,13 +187,13 @@ typedef union hubii_wcr_u { u64 wcr_reg_value; struct { u64 wcr_rsvd: 41, /* unused */ - wcr_e_thresh: 5, /* elasticity threshold */ + wcr_e_thresh: 5, /* elasticity threshold */ wcr_dir_con: 1, /* widget direct connect */ - wcr_f_bad_pkt: 1, /* Force bad llp pkt enable */ - wcr_xbar_crd: 3, /* LLP crossbar credit */ - wcr_rsvd1: 8, /* Reserved */ + wcr_f_bad_pkt: 1, /* Force bad llp pkt enable */ + wcr_xbar_crd: 3, /* LLP crossbar credit */ + wcr_rsvd1: 8, /* Reserved */ wcr_tag_mode: 1, /* Tag mode */ - wcr_widget_id: 4; /* LLP crossbar credit */ + wcr_widget_id: 4; /* LLP crossbar credit */ } wcr_fields_s; } hubii_wcr_t; @@ -220,14 +220,14 @@ typedef union hubii_ilcsr_u { u64 icsr_reg_value; struct { u64 icsr_rsvd: 22, /* unused */ - icsr_max_burst: 10, /* max burst */ + icsr_max_burst: 10, /* max burst */ icsr_rsvd4: 6, /* reserved */ - icsr_max_retry: 10, /* max retry */ + icsr_max_retry: 10, /* max retry */ icsr_rsvd3: 2, /* reserved */ icsr_lnk_stat: 2, /* link status */ icsr_bm8: 1, /* Bit mode 8 */ icsr_llp_en: 1, /* LLP enable bit */ - icsr_rsvd2: 1, /* reserver */ + icsr_rsvd2: 1, /* reserver */ icsr_wrm_reset: 1, /* Warm reset bit */ icsr_rsvd1: 2, /* Data ready offset */ icsr_null_to: 6; /* Null timeout */ @@ -240,9 +240,9 @@ typedef union hubii_iowa_u { u64 iowa_reg_value; struct { u64 iowa_rsvd: 48, /* unused */ - iowa_wxoac: 8, /* xtalk widget access bits */ - iowa_rsvd1: 7, /* xtalk widget access bits */ - iowa_w0oac: 1; /* xtalk widget access bits */ + iowa_wxoac: 8, /* xtalk widget access bits */ + iowa_rsvd1: 7, /* xtalk widget access bits */ + iowa_w0oac: 1; /* xtalk widget access bits */ } iowa_fields_s; } hubii_iowa_t; @@ -261,7 +261,7 @@ typedef union hubii_illr_u { struct { u64 illr_rsvd: 32, /* unused */ illr_cb_cnt: 16, /* checkbit error count */ - illr_sn_cnt: 16; /* sequence number count */ + illr_sn_cnt: 16; /* sequence number count */ } illr_fields_s; } hubii_illr_t; @@ -275,7 +275,7 @@ typedef union io_perf_sel { struct { u64 perf_rsvd : 48, perf_icct : 8, - perf_ippr1 : 4, + perf_ippr1 : 4, perf_ippr0 : 4; } perf_sel_bits; } io_perf_sel_t; @@ -733,7 +733,7 @@ typedef union hubii_ifdr_u { u64 ifdr_rsvd: 49, ifdr_maxrp: 7, ifdr_rsvd1: 1, - ifdr_maxrq: 7; + ifdr_maxrq: 7; } hi_ifdr_fields; } hubii_ifdr_t; diff --git a/include/asm-mips/sn/sn0/hubmd.h b/arch/mips/include/asm/sn/sn0/hubmd.h similarity index 100% rename from include/asm-mips/sn/sn0/hubmd.h rename to arch/mips/include/asm/sn/sn0/hubmd.h diff --git a/include/asm-mips/sn/sn0/hubni.h b/arch/mips/include/asm/sn/sn0/hubni.h similarity index 100% rename from include/asm-mips/sn/sn0/hubni.h rename to arch/mips/include/asm/sn/sn0/hubni.h diff --git a/include/asm-mips/sn/sn0/hubpi.h b/arch/mips/include/asm/sn/sn0/hubpi.h similarity index 100% rename from include/asm-mips/sn/sn0/hubpi.h rename to arch/mips/include/asm/sn/sn0/hubpi.h diff --git a/include/asm-mips/sn/sn0/ip27.h b/arch/mips/include/asm/sn/sn0/ip27.h similarity index 100% rename from include/asm-mips/sn/sn0/ip27.h rename to arch/mips/include/asm/sn/sn0/ip27.h diff --git a/include/asm-mips/sn/sn_private.h b/arch/mips/include/asm/sn/sn_private.h similarity index 100% rename from include/asm-mips/sn/sn_private.h rename to arch/mips/include/asm/sn/sn_private.h diff --git a/include/asm-mips/sn/types.h b/arch/mips/include/asm/sn/types.h similarity index 100% rename from include/asm-mips/sn/types.h rename to arch/mips/include/asm/sn/types.h diff --git a/include/asm-mips/sni.h b/arch/mips/include/asm/sni.h similarity index 100% rename from include/asm-mips/sni.h rename to arch/mips/include/asm/sni.h diff --git a/include/asm-mips/socket.h b/arch/mips/include/asm/socket.h similarity index 100% rename from include/asm-mips/socket.h rename to arch/mips/include/asm/socket.h diff --git a/include/asm-mips/sockios.h b/arch/mips/include/asm/sockios.h similarity index 100% rename from include/asm-mips/sockios.h rename to arch/mips/include/asm/sockios.h diff --git a/include/asm-mips/sparsemem.h b/arch/mips/include/asm/sparsemem.h similarity index 100% rename from include/asm-mips/sparsemem.h rename to arch/mips/include/asm/sparsemem.h diff --git a/include/asm-mips/spinlock.h b/arch/mips/include/asm/spinlock.h similarity index 100% rename from include/asm-mips/spinlock.h rename to arch/mips/include/asm/spinlock.h diff --git a/include/asm-mips/spinlock_types.h b/arch/mips/include/asm/spinlock_types.h similarity index 100% rename from include/asm-mips/spinlock_types.h rename to arch/mips/include/asm/spinlock_types.h diff --git a/include/asm-mips/stackframe.h b/arch/mips/include/asm/stackframe.h similarity index 100% rename from include/asm-mips/stackframe.h rename to arch/mips/include/asm/stackframe.h diff --git a/include/asm-mips/stacktrace.h b/arch/mips/include/asm/stacktrace.h similarity index 100% rename from include/asm-mips/stacktrace.h rename to arch/mips/include/asm/stacktrace.h diff --git a/include/asm-mips/stat.h b/arch/mips/include/asm/stat.h similarity index 100% rename from include/asm-mips/stat.h rename to arch/mips/include/asm/stat.h diff --git a/include/asm-mips/statfs.h b/arch/mips/include/asm/statfs.h similarity index 100% rename from include/asm-mips/statfs.h rename to arch/mips/include/asm/statfs.h diff --git a/include/asm-mips/string.h b/arch/mips/include/asm/string.h similarity index 100% rename from include/asm-mips/string.h rename to arch/mips/include/asm/string.h diff --git a/include/asm-mips/suspend.h b/arch/mips/include/asm/suspend.h similarity index 100% rename from include/asm-mips/suspend.h rename to arch/mips/include/asm/suspend.h diff --git a/include/asm-mips/sysmips.h b/arch/mips/include/asm/sysmips.h similarity index 100% rename from include/asm-mips/sysmips.h rename to arch/mips/include/asm/sysmips.h diff --git a/include/asm-mips/system.h b/arch/mips/include/asm/system.h similarity index 100% rename from include/asm-mips/system.h rename to arch/mips/include/asm/system.h diff --git a/include/asm-mips/termbits.h b/arch/mips/include/asm/termbits.h similarity index 100% rename from include/asm-mips/termbits.h rename to arch/mips/include/asm/termbits.h diff --git a/include/asm-mips/termios.h b/arch/mips/include/asm/termios.h similarity index 100% rename from include/asm-mips/termios.h rename to arch/mips/include/asm/termios.h diff --git a/include/asm-mips/thread_info.h b/arch/mips/include/asm/thread_info.h similarity index 100% rename from include/asm-mips/thread_info.h rename to arch/mips/include/asm/thread_info.h diff --git a/include/asm-mips/time.h b/arch/mips/include/asm/time.h similarity index 100% rename from include/asm-mips/time.h rename to arch/mips/include/asm/time.h diff --git a/include/asm-mips/timex.h b/arch/mips/include/asm/timex.h similarity index 100% rename from include/asm-mips/timex.h rename to arch/mips/include/asm/timex.h diff --git a/include/asm-mips/titan_dep.h b/arch/mips/include/asm/titan_dep.h similarity index 100% rename from include/asm-mips/titan_dep.h rename to arch/mips/include/asm/titan_dep.h diff --git a/include/asm-mips/tlb.h b/arch/mips/include/asm/tlb.h similarity index 100% rename from include/asm-mips/tlb.h rename to arch/mips/include/asm/tlb.h diff --git a/include/asm-mips/tlbdebug.h b/arch/mips/include/asm/tlbdebug.h similarity index 100% rename from include/asm-mips/tlbdebug.h rename to arch/mips/include/asm/tlbdebug.h diff --git a/include/asm-mips/tlbflush.h b/arch/mips/include/asm/tlbflush.h similarity index 100% rename from include/asm-mips/tlbflush.h rename to arch/mips/include/asm/tlbflush.h diff --git a/include/asm-mips/topology.h b/arch/mips/include/asm/topology.h similarity index 100% rename from include/asm-mips/topology.h rename to arch/mips/include/asm/topology.h diff --git a/include/asm-mips/traps.h b/arch/mips/include/asm/traps.h similarity index 100% rename from include/asm-mips/traps.h rename to arch/mips/include/asm/traps.h diff --git a/include/asm-mips/txx9/boards.h b/arch/mips/include/asm/txx9/boards.h similarity index 100% rename from include/asm-mips/txx9/boards.h rename to arch/mips/include/asm/txx9/boards.h diff --git a/include/asm-mips/txx9/generic.h b/arch/mips/include/asm/txx9/generic.h similarity index 100% rename from include/asm-mips/txx9/generic.h rename to arch/mips/include/asm/txx9/generic.h diff --git a/include/asm-mips/txx9/jmr3927.h b/arch/mips/include/asm/txx9/jmr3927.h similarity index 100% rename from include/asm-mips/txx9/jmr3927.h rename to arch/mips/include/asm/txx9/jmr3927.h diff --git a/include/asm-mips/txx9/pci.h b/arch/mips/include/asm/txx9/pci.h similarity index 100% rename from include/asm-mips/txx9/pci.h rename to arch/mips/include/asm/txx9/pci.h diff --git a/include/asm-mips/txx9/rbtx4927.h b/arch/mips/include/asm/txx9/rbtx4927.h similarity index 100% rename from include/asm-mips/txx9/rbtx4927.h rename to arch/mips/include/asm/txx9/rbtx4927.h diff --git a/include/asm-mips/txx9/rbtx4938.h b/arch/mips/include/asm/txx9/rbtx4938.h similarity index 100% rename from include/asm-mips/txx9/rbtx4938.h rename to arch/mips/include/asm/txx9/rbtx4938.h diff --git a/include/asm-mips/txx9/rbtx4939.h b/arch/mips/include/asm/txx9/rbtx4939.h similarity index 100% rename from include/asm-mips/txx9/rbtx4939.h rename to arch/mips/include/asm/txx9/rbtx4939.h diff --git a/include/asm-mips/txx9/smsc_fdc37m81x.h b/arch/mips/include/asm/txx9/smsc_fdc37m81x.h similarity index 100% rename from include/asm-mips/txx9/smsc_fdc37m81x.h rename to arch/mips/include/asm/txx9/smsc_fdc37m81x.h diff --git a/include/asm-mips/txx9/spi.h b/arch/mips/include/asm/txx9/spi.h similarity index 100% rename from include/asm-mips/txx9/spi.h rename to arch/mips/include/asm/txx9/spi.h diff --git a/include/asm-mips/txx9/tx3927.h b/arch/mips/include/asm/txx9/tx3927.h similarity index 100% rename from include/asm-mips/txx9/tx3927.h rename to arch/mips/include/asm/txx9/tx3927.h diff --git a/include/asm-mips/txx9/tx4927.h b/arch/mips/include/asm/txx9/tx4927.h similarity index 100% rename from include/asm-mips/txx9/tx4927.h rename to arch/mips/include/asm/txx9/tx4927.h diff --git a/include/asm-mips/txx9/tx4927pcic.h b/arch/mips/include/asm/txx9/tx4927pcic.h similarity index 100% rename from include/asm-mips/txx9/tx4927pcic.h rename to arch/mips/include/asm/txx9/tx4927pcic.h diff --git a/include/asm-mips/txx9/tx4938.h b/arch/mips/include/asm/txx9/tx4938.h similarity index 100% rename from include/asm-mips/txx9/tx4938.h rename to arch/mips/include/asm/txx9/tx4938.h diff --git a/include/asm-mips/txx9/tx4939.h b/arch/mips/include/asm/txx9/tx4939.h similarity index 100% rename from include/asm-mips/txx9/tx4939.h rename to arch/mips/include/asm/txx9/tx4939.h diff --git a/include/asm-mips/txx9irq.h b/arch/mips/include/asm/txx9irq.h similarity index 100% rename from include/asm-mips/txx9irq.h rename to arch/mips/include/asm/txx9irq.h diff --git a/include/asm-mips/txx9pio.h b/arch/mips/include/asm/txx9pio.h similarity index 100% rename from include/asm-mips/txx9pio.h rename to arch/mips/include/asm/txx9pio.h diff --git a/include/asm-mips/txx9tmr.h b/arch/mips/include/asm/txx9tmr.h similarity index 100% rename from include/asm-mips/txx9tmr.h rename to arch/mips/include/asm/txx9tmr.h diff --git a/include/asm-mips/types.h b/arch/mips/include/asm/types.h similarity index 100% rename from include/asm-mips/types.h rename to arch/mips/include/asm/types.h diff --git a/include/asm-mips/uaccess.h b/arch/mips/include/asm/uaccess.h similarity index 100% rename from include/asm-mips/uaccess.h rename to arch/mips/include/asm/uaccess.h diff --git a/include/asm-mips/ucontext.h b/arch/mips/include/asm/ucontext.h similarity index 100% rename from include/asm-mips/ucontext.h rename to arch/mips/include/asm/ucontext.h diff --git a/include/asm-mips/unaligned.h b/arch/mips/include/asm/unaligned.h similarity index 100% rename from include/asm-mips/unaligned.h rename to arch/mips/include/asm/unaligned.h diff --git a/include/asm-mips/unistd.h b/arch/mips/include/asm/unistd.h similarity index 100% rename from include/asm-mips/unistd.h rename to arch/mips/include/asm/unistd.h diff --git a/include/asm-mips/user.h b/arch/mips/include/asm/user.h similarity index 100% rename from include/asm-mips/user.h rename to arch/mips/include/asm/user.h diff --git a/include/asm-mips/vga.h b/arch/mips/include/asm/vga.h similarity index 100% rename from include/asm-mips/vga.h rename to arch/mips/include/asm/vga.h diff --git a/include/asm-mips/vpe.h b/arch/mips/include/asm/vpe.h similarity index 100% rename from include/asm-mips/vpe.h rename to arch/mips/include/asm/vpe.h diff --git a/include/asm-mips/vr41xx/capcella.h b/arch/mips/include/asm/vr41xx/capcella.h similarity index 100% rename from include/asm-mips/vr41xx/capcella.h rename to arch/mips/include/asm/vr41xx/capcella.h diff --git a/include/asm-mips/vr41xx/giu.h b/arch/mips/include/asm/vr41xx/giu.h similarity index 100% rename from include/asm-mips/vr41xx/giu.h rename to arch/mips/include/asm/vr41xx/giu.h diff --git a/include/asm-mips/vr41xx/irq.h b/arch/mips/include/asm/vr41xx/irq.h similarity index 100% rename from include/asm-mips/vr41xx/irq.h rename to arch/mips/include/asm/vr41xx/irq.h diff --git a/include/asm-mips/vr41xx/mpc30x.h b/arch/mips/include/asm/vr41xx/mpc30x.h similarity index 100% rename from include/asm-mips/vr41xx/mpc30x.h rename to arch/mips/include/asm/vr41xx/mpc30x.h diff --git a/include/asm-mips/vr41xx/pci.h b/arch/mips/include/asm/vr41xx/pci.h similarity index 100% rename from include/asm-mips/vr41xx/pci.h rename to arch/mips/include/asm/vr41xx/pci.h diff --git a/include/asm-mips/vr41xx/siu.h b/arch/mips/include/asm/vr41xx/siu.h similarity index 100% rename from include/asm-mips/vr41xx/siu.h rename to arch/mips/include/asm/vr41xx/siu.h diff --git a/include/asm-mips/vr41xx/tb0219.h b/arch/mips/include/asm/vr41xx/tb0219.h similarity index 100% rename from include/asm-mips/vr41xx/tb0219.h rename to arch/mips/include/asm/vr41xx/tb0219.h diff --git a/include/asm-mips/vr41xx/tb0226.h b/arch/mips/include/asm/vr41xx/tb0226.h similarity index 100% rename from include/asm-mips/vr41xx/tb0226.h rename to arch/mips/include/asm/vr41xx/tb0226.h diff --git a/include/asm-mips/vr41xx/tb0287.h b/arch/mips/include/asm/vr41xx/tb0287.h similarity index 100% rename from include/asm-mips/vr41xx/tb0287.h rename to arch/mips/include/asm/vr41xx/tb0287.h diff --git a/include/asm-mips/vr41xx/vr41xx.h b/arch/mips/include/asm/vr41xx/vr41xx.h similarity index 100% rename from include/asm-mips/vr41xx/vr41xx.h rename to arch/mips/include/asm/vr41xx/vr41xx.h diff --git a/include/asm-mips/war.h b/arch/mips/include/asm/war.h similarity index 100% rename from include/asm-mips/war.h rename to arch/mips/include/asm/war.h diff --git a/include/asm-mips/wbflush.h b/arch/mips/include/asm/wbflush.h similarity index 100% rename from include/asm-mips/wbflush.h rename to arch/mips/include/asm/wbflush.h diff --git a/include/asm-mips/xor.h b/arch/mips/include/asm/xor.h similarity index 100% rename from include/asm-mips/xor.h rename to arch/mips/include/asm/xor.h diff --git a/include/asm-mips/xtalk/xtalk.h b/arch/mips/include/asm/xtalk/xtalk.h similarity index 100% rename from include/asm-mips/xtalk/xtalk.h rename to arch/mips/include/asm/xtalk/xtalk.h diff --git a/include/asm-mips/xtalk/xwidget.h b/arch/mips/include/asm/xtalk/xwidget.h similarity index 100% rename from include/asm-mips/xtalk/xwidget.h rename to arch/mips/include/asm/xtalk/xwidget.h -- 2.20.1