From: Russell King Date: Tue, 5 Aug 2008 15:14:15 +0000 (+0100) Subject: [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach X-Git-Tag: v2.6.27-rc3~63^2~7 X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=a09e64fbc0094e3073dbb09c3b4bfe4ab669244b;p=linux-2.6-omap-h63xx.git [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach This just leaves include/asm-arm/plat-* to deal with. Signed-off-by: Russell King --- diff --git a/Documentation/arm/IXP4xx b/Documentation/arm/IXP4xx index 43edb4ecf27..72fbcc4fcab 100644 --- a/Documentation/arm/IXP4xx +++ b/Documentation/arm/IXP4xx @@ -32,7 +32,7 @@ Linux currently supports the following features on the IXP4xx chips: - Flash access (MTD/JFFS) - I2C through GPIO on IXP42x - GPIO for input/output/interrupts - See include/asm-arm/arch-ixp4xx/platform.h for access functions. + See arch/arm/mach-ixp4xx/include/mach/platform.h for access functions. - Timers (watchdog, OS) The following components of the chips are not supported by Linux and diff --git a/Documentation/arm/Interrupts b/Documentation/arm/Interrupts index c202ed35d7d..f09ab1b90ef 100644 --- a/Documentation/arm/Interrupts +++ b/Documentation/arm/Interrupts @@ -158,7 +158,7 @@ So, what's changed? be re-checked for pending events. (see the Neponset IRQ handler for details). -7. fixup_irq() is gone, as is include/asm-arm/arch-*/irq.h +7. fixup_irq() is gone, as is arch/arm/mach-*/include/mach/irq.h Please note that this will not solve all problems - some of them are hardware based. Mixing level-based and edge-based IRQs on the same diff --git a/Documentation/arm/README b/Documentation/arm/README index 9b9c8226fdc..d98783fbe0c 100644 --- a/Documentation/arm/README +++ b/Documentation/arm/README @@ -79,7 +79,7 @@ Machine/Platform support To this end, we now have arch/arm/mach-$(MACHINE) directories which are designed to house the non-driver files for a particular machine (eg, PCI, memory management, architecture definitions etc). For all future - machines, there should be a corresponding include/asm-arm/arch-$(MACHINE) + machines, there should be a corresponding arch/arm/mach-$(MACHINE)/include/mach directory. @@ -176,7 +176,7 @@ Kernel entry (head.S) class typically based around one or more system on a chip devices, and acts as a natural container around the actual implementations. These classes are given directories - arch/arm/mach- and - include/asm-arm/arch- - which contain the source files to + arch/arm/mach- - which contain the source files to/include/mach support the machine class. This directories also contain any machine specific supporting code. diff --git a/Documentation/arm/Samsung-S3C24XX/GPIO.txt b/Documentation/arm/Samsung-S3C24XX/GPIO.txt index 8caea8c237e..b5d20c0b2ab 100644 --- a/Documentation/arm/Samsung-S3C24XX/GPIO.txt +++ b/Documentation/arm/Samsung-S3C24XX/GPIO.txt @@ -16,13 +16,13 @@ Introduction Headers ------- - See include/asm-arm/arch-s3c2410/regs-gpio.h for the list + See arch/arm/mach-s3c2410/include/mach/regs-gpio.h for the list of GPIO pins, and the configuration values for them. This - is included by using #include + is included by using #include The GPIO management functions are defined in the hardware - header include/asm-arm/arch-s3c2410/hardware.h which can be - included by #include + header arch/arm/mach-s3c2410/include/mach/hardware.h which can be + included by #include A useful amount of documentation can be found in the hardware header on how the GPIO functions (and others) work. diff --git a/Documentation/arm/Samsung-S3C24XX/Overview.txt b/Documentation/arm/Samsung-S3C24XX/Overview.txt index d04e1e30c47..014a8ec4877 100644 --- a/Documentation/arm/Samsung-S3C24XX/Overview.txt +++ b/Documentation/arm/Samsung-S3C24XX/Overview.txt @@ -36,7 +36,7 @@ Layout in arch/arm/mach-s3c2410 and S3C2440 in arch/arm/mach-s3c2440 Register, kernel and platform data definitions are held in the - include/asm-arm/arch-s3c2410 directory. + arch/arm/mach-s3c2410 directory./include/mach Machines diff --git a/Documentation/arm/Samsung-S3C24XX/USB-Host.txt b/Documentation/arm/Samsung-S3C24XX/USB-Host.txt index b93b68e2b14..67671eba423 100644 --- a/Documentation/arm/Samsung-S3C24XX/USB-Host.txt +++ b/Documentation/arm/Samsung-S3C24XX/USB-Host.txt @@ -49,7 +49,7 @@ Board Support Platform Data ------------- - See linux/include/asm-arm/arch-s3c2410/usb-control.h for the + See arch/arm/mach-s3c2410/include/mach/usb-control.h for the descriptions of the platform device data. An implementation can be found in linux/arch/arm/mach-s3c2410/usb-simtec.c . diff --git a/Documentation/spi/pxa2xx b/Documentation/spi/pxa2xx index f3853cc37bd..bbe8dee681a 100644 --- a/Documentation/spi/pxa2xx +++ b/Documentation/spi/pxa2xx @@ -19,7 +19,7 @@ Declaring PXA2xx Master Controllers ----------------------------------- Typically a SPI master is defined in the arch/.../mach-*/board-*.c as a "platform device". The master configuration is passed to the driver via a table -found in include/asm-arm/arch-pxa/pxa2xx_spi.h: +found in arch/arm/mach-pxa/include/mach/pxa2xx_spi.h: struct pxa2xx_spi_master { enum pxa_ssp_type ssp_type; @@ -94,7 +94,7 @@ using the "spi_board_info" structure found in "linux/spi/spi.h". See Each slave device attached to the PXA must provide slave specific configuration information via the structure "pxa2xx_spi_chip" found in -"include/asm-arm/arch-pxa/pxa2xx_spi.h". The pxa2xx_spi master controller driver +"arch/arm/mach-pxa/include/mach/pxa2xx_spi.h". The pxa2xx_spi master controller driver will uses the configuration whenever the driver communicates with the slave device. diff --git a/Documentation/spi/spi-summary b/Documentation/spi/spi-summary index 6d5f18143c5..8bae2f018d3 100644 --- a/Documentation/spi/spi-summary +++ b/Documentation/spi/spi-summary @@ -210,7 +210,7 @@ board should normally be set up and registered. So for example arch/.../mach-*/board-*.c files might have code like: - #include /* for mysoc_spi_data */ + #include /* for mysoc_spi_data */ /* if your mach-* infrastructure doesn't support kernels that can * run on multiple boards, pdata wouldn't benefit from "__init". @@ -227,7 +227,7 @@ So for example arch/.../mach-*/board-*.c files might have code like: And SOC-specific utility code might look something like: - #include + #include static struct platform_device spi2 = { ... }; diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 359d224c8c3..703a44fa0f9 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -97,9 +97,7 @@ textofs-y := 0x00008000 machine-$(CONFIG_ARCH_RPC) := rpc machine-$(CONFIG_ARCH_EBSA110) := ebsa110 machine-$(CONFIG_ARCH_CLPS7500) := clps7500 - incdir-$(CONFIG_ARCH_CLPS7500) := cl7500 machine-$(CONFIG_FOOTBRIDGE) := footbridge - incdir-$(CONFIG_FOOTBRIDGE) := ebsa285 machine-$(CONFIG_ARCH_SHARK) := shark machine-$(CONFIG_ARCH_SA1100) := sa1100 ifeq ($(CONFIG_ARCH_SA1100),y) @@ -120,7 +118,6 @@ endif machine-$(CONFIG_ARCH_IXP23XX) := ixp23xx machine-$(CONFIG_ARCH_OMAP1) := omap1 machine-$(CONFIG_ARCH_OMAP2) := omap2 - incdir-$(CONFIG_ARCH_OMAP) := omap plat-$(CONFIG_ARCH_OMAP) := omap machine-$(CONFIG_ARCH_S3C2410) := s3c2410 s3c2400 s3c2412 s3c2440 s3c2442 s3c2443 plat-$(CONFIG_PLAT_S3C24XX) := s3c24xx @@ -138,7 +135,6 @@ endif machine-$(CONFIG_ARCH_DAVINCI) := davinci machine-$(CONFIG_ARCH_KIRKWOOD) := kirkwood machine-$(CONFIG_ARCH_KS8695) := ks8695 - incdir-$(CONFIG_ARCH_MXC) := mxc plat-$(CONFIG_ARCH_MXC) := mxc machine-$(CONFIG_ARCH_MX2) := mx2 machine-$(CONFIG_ARCH_MX3) := mx3 @@ -158,11 +154,6 @@ endif # The byte offset of the kernel image in RAM from the start of RAM. TEXT_OFFSET := $(textofs-y) -ifeq ($(incdir-y),) -incdir-y := $(word 1,$(machine-y)) -endif -INCDIR := arch-$(incdir-y) - # The first directory contains additional information for the boot setup code ifneq ($(machine-y),) MACHINE := arch/arm/mach-$(word 1,$(machine-y))/ @@ -213,20 +204,10 @@ boot := arch/arm/boot # them changed. We use .arch to indicate when they were updated # last, otherwise make uses the target directory mtime. -include/asm-arm/.arch: $(wildcard include/config/arch/*.h) include/config/auto.conf - @echo ' SYMLINK include/asm-arm/arch -> include/asm-arm/$(INCDIR)' -ifneq ($(KBUILD_SRC),) - $(Q)mkdir -p include/asm-arm - $(Q)ln -fsn $(srctree)/include/asm-arm/$(INCDIR) include/asm-arm/arch -else - $(Q)ln -fsn $(INCDIR) include/asm-arm/arch -endif - @touch $@ - archprepare: maketools PHONY += maketools FORCE -maketools: include/linux/version.h include/asm-arm/.arch FORCE +maketools: include/linux/version.h FORCE $(Q)$(MAKE) $(build)=arch/arm/tools include/asm-arm/mach-types.h # Convert bzImage to zImage diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S index de41daeab5e..d42f89b7760 100644 --- a/arch/arm/boot/compressed/head.S +++ b/arch/arm/boot/compressed/head.S @@ -37,7 +37,7 @@ #else -#include +#include .macro writeb, ch, rb senduart \ch, \rb diff --git a/arch/arm/boot/compressed/misc.c b/arch/arm/boot/compressed/misc.c index 7145cc7c04f..65ce8fff29d 100644 --- a/arch/arm/boot/compressed/misc.c +++ b/arch/arm/boot/compressed/misc.c @@ -27,7 +27,7 @@ unsigned int __machine_arch_type; static void putstr(const char *ptr); #include -#include +#include #ifdef CONFIG_DEBUG_ICEDCC diff --git a/arch/arm/common/locomo.c b/arch/arm/common/locomo.c index 1f0f0adeafb..283051eaf93 100644 --- a/arch/arm/common/locomo.c +++ b/arch/arm/common/locomo.c @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c index 64c328d1627..ec8a5471bf0 100644 --- a/arch/arm/common/sa1111.c +++ b/arch/arm/common/sa1111.c @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include diff --git a/arch/arm/common/sharpsl_pm.c b/arch/arm/common/sharpsl_pm.c index a0d15400688..db830916140 100644 --- a/arch/arm/common/sharpsl_pm.c +++ b/arch/arm/common/sharpsl_pm.c @@ -26,12 +26,12 @@ #include #include -#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include #include /* diff --git a/arch/arm/common/time-acorn.c b/arch/arm/common/time-acorn.c index af37bfd74f9..df0983aafe6 100644 --- a/arch/arm/common/time-acorn.c +++ b/arch/arm/common/time-acorn.c @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include diff --git a/arch/arm/common/uengine.c b/arch/arm/common/uengine.c index 3e19985ddec..7ecd3c0ab01 100644 --- a/arch/arm/common/uengine.c +++ b/arch/arm/common/uengine.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include diff --git a/arch/arm/include/asm/dma.h b/arch/arm/include/asm/dma.h index 9f2c5305c26..75154b19311 100644 --- a/arch/arm/include/asm/dma.h +++ b/arch/arm/include/asm/dma.h @@ -6,7 +6,7 @@ typedef unsigned int dmach_t; #include #include #include -#include +#include /* * This is the maximum virtual address which can be DMA'd from. diff --git a/arch/arm/include/asm/floppy.h b/arch/arm/include/asm/floppy.h index dce20c25ab1..c9f03eccc9d 100644 --- a/arch/arm/include/asm/floppy.h +++ b/arch/arm/include/asm/floppy.h @@ -12,7 +12,7 @@ #ifndef __ASM_ARM_FLOPPY_H #define __ASM_ARM_FLOPPY_H #if 0 -#include +#include #endif #define fd_outb(val,port) \ diff --git a/arch/arm/include/asm/gpio.h b/arch/arm/include/asm/gpio.h index fff4f800ee4..166a7a3e284 100644 --- a/arch/arm/include/asm/gpio.h +++ b/arch/arm/include/asm/gpio.h @@ -2,6 +2,6 @@ #define _ARCH_ARM_GPIO_H /* not all ARM platforms necessarily support this API ... */ -#include +#include #endif /* _ARCH_ARM_GPIO_H */ diff --git a/arch/arm/include/asm/hardware/dec21285.h b/arch/arm/include/asm/hardware/dec21285.h index cf2578ffd54..0d7552751aa 100644 --- a/arch/arm/include/asm/hardware/dec21285.h +++ b/arch/arm/include/asm/hardware/dec21285.h @@ -19,7 +19,7 @@ #define DC21285_PCI_MEM 0x80000000 #ifndef __ASSEMBLY__ -#include +#include #define DC21285_IO(x) ((volatile unsigned long *)(ARMCSR_BASE+(x))) #else #define DC21285_IO(x) (x) diff --git a/arch/arm/include/asm/hardware/iop3xx-adma.h b/arch/arm/include/asm/hardware/iop3xx-adma.h index df31b15cf6e..87bff09633a 100644 --- a/arch/arm/include/asm/hardware/iop3xx-adma.h +++ b/arch/arm/include/asm/hardware/iop3xx-adma.h @@ -19,7 +19,7 @@ #define _ADMA_H #include #include -#include +#include #include /* Memory copy units */ diff --git a/arch/arm/include/asm/hardware/iop3xx-gpio.h b/arch/arm/include/asm/hardware/iop3xx-gpio.h index 0ebc91cb42f..b69d972b1f7 100644 --- a/arch/arm/include/asm/hardware/iop3xx-gpio.h +++ b/arch/arm/include/asm/hardware/iop3xx-gpio.h @@ -25,7 +25,7 @@ #ifndef __ASM_ARM_HARDWARE_IOP3XX_GPIO_H #define __ASM_ARM_HARDWARE_IOP3XX_GPIO_H -#include +#include #include #define IOP3XX_N_GPIOS 8 diff --git a/arch/arm/include/asm/hardware/sa1111.h b/arch/arm/include/asm/hardware/sa1111.h index 6cf98d4f7dc..5da2595759e 100644 --- a/arch/arm/include/asm/hardware/sa1111.h +++ b/arch/arm/include/asm/hardware/sa1111.h @@ -12,7 +12,7 @@ #ifndef _ASM_ARCH_SA1111 #define _ASM_ARCH_SA1111 -#include +#include /* * The SA1111 is always located at virtual 0xf4000000, and is always diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h index ffe07c0f46d..94a95d7fafd 100644 --- a/arch/arm/include/asm/io.h +++ b/arch/arm/include/asm/io.h @@ -82,7 +82,7 @@ extern void __readwrite_bug(const char *fn); /* * Now, pick up the machine-defined IO definitions */ -#include +#include /* * IO port access primitives diff --git a/arch/arm/include/asm/irq.h b/arch/arm/include/asm/irq.h index 9cb01907e43..d6786090d02 100644 --- a/arch/arm/include/asm/irq.h +++ b/arch/arm/include/asm/irq.h @@ -1,7 +1,7 @@ #ifndef __ASM_ARM_IRQ_H #define __ASM_ARM_IRQ_H -#include +#include #ifndef irq_canonicalize #define irq_canonicalize(i) (i) diff --git a/arch/arm/include/asm/mc146818rtc.h b/arch/arm/include/asm/mc146818rtc.h index 7b81e0c4254..e1ca48a9e97 100644 --- a/arch/arm/include/asm/mc146818rtc.h +++ b/arch/arm/include/asm/mc146818rtc.h @@ -4,7 +4,7 @@ #ifndef _ASM_MC146818RTC_H #define _ASM_MC146818RTC_H -#include +#include #include #ifndef RTC_PORT diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h index 92069221dca..1e070a2b561 100644 --- a/arch/arm/include/asm/memory.h +++ b/arch/arm/include/asm/memory.h @@ -24,7 +24,7 @@ #endif #include -#include +#include #include #ifdef CONFIG_MMU diff --git a/arch/arm/include/asm/mmzone.h b/arch/arm/include/asm/mmzone.h index f2fbb508490..ae63a4fd28c 100644 --- a/arch/arm/include/asm/mmzone.h +++ b/arch/arm/include/asm/mmzone.h @@ -25,6 +25,6 @@ extern pg_data_t discontig_node_data[]; */ #define NODE_MEM_MAP(nid) (NODE_DATA(nid)->node_mem_map) -#include +#include #endif diff --git a/arch/arm/include/asm/mtd-xip.h b/arch/arm/include/asm/mtd-xip.h index 4bc50f9abe3..4225372a26f 100644 --- a/arch/arm/include/asm/mtd-xip.h +++ b/arch/arm/include/asm/mtd-xip.h @@ -17,8 +17,8 @@ #ifndef __ARM_MTD_XIP_H__ #define __ARM_MTD_XIP_H__ -#include -#include +#include +#include /* fill instruction prefetch */ #define xip_iprefetch() do { asm volatile (".rep 8; nop; .endr"); } while (0) diff --git a/arch/arm/include/asm/pci.h b/arch/arm/include/asm/pci.h index 968b833f3bb..721c03d53f4 100644 --- a/arch/arm/include/asm/pci.h +++ b/arch/arm/include/asm/pci.h @@ -4,7 +4,7 @@ #ifdef __KERNEL__ #include -#include /* for PCIBIOS_MIN_* */ +#include /* for PCIBIOS_MIN_* */ #define pcibios_scan_all_fns(a, b) 0 diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h index 8ab060a53ab..8e21ef15bd7 100644 --- a/arch/arm/include/asm/pgtable.h +++ b/arch/arm/include/asm/pgtable.h @@ -20,7 +20,7 @@ #else #include -#include +#include #include /* diff --git a/arch/arm/include/asm/smp.h b/arch/arm/include/asm/smp.h index cc12a525a06..727b5c042e5 100644 --- a/arch/arm/include/asm/smp.h +++ b/arch/arm/include/asm/smp.h @@ -14,7 +14,7 @@ #include #include -#include +#include #ifndef CONFIG_SMP # error " included in non-SMP build" diff --git a/arch/arm/include/asm/timex.h b/arch/arm/include/asm/timex.h index e50e2926cd6..3be8de3adab 100644 --- a/arch/arm/include/asm/timex.h +++ b/arch/arm/include/asm/timex.h @@ -12,7 +12,7 @@ #ifndef _ASMARM_TIMEX_H #define _ASMARM_TIMEX_H -#include +#include typedef unsigned long cycles_t; diff --git a/arch/arm/include/asm/vga.h b/arch/arm/include/asm/vga.h index 4f767ad3a0b..6a3cd2a2f67 100644 --- a/arch/arm/include/asm/vga.h +++ b/arch/arm/include/asm/vga.h @@ -1,7 +1,7 @@ #ifndef ASMARM_VGA_H #define ASMARM_VGA_H -#include +#include #include #define VGA_MAP_MEM(x,s) (PCIMEM_BASE + (x)) diff --git a/arch/arm/kernel/crunch-bits.S b/arch/arm/kernel/crunch-bits.S index a26886758c6..0ec9bb48fab 100644 --- a/arch/arm/kernel/crunch-bits.S +++ b/arch/arm/kernel/crunch-bits.S @@ -16,7 +16,7 @@ #include #include #include -#include +#include /* * We can't use hex constants here due to a bug in gas. diff --git a/arch/arm/kernel/crunch.c b/arch/arm/kernel/crunch.c index 627d79414c9..3b6a1c293ee 100644 --- a/arch/arm/kernel/crunch.c +++ b/arch/arm/kernel/crunch.c @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include diff --git a/arch/arm/kernel/debug.S b/arch/arm/kernel/debug.S index 5617566477b..9550ff0ddde 100644 --- a/arch/arm/kernel/debug.S +++ b/arch/arm/kernel/debug.S @@ -80,7 +80,7 @@ #endif /* CONFIG_CPU_V6 */ #else -#include +#include #endif /* CONFIG_DEBUG_ICEDCC */ /* diff --git a/arch/arm/kernel/ecard.c b/arch/arm/kernel/ecard.c index 8192fe8409d..7a50575a8d4 100644 --- a/arch/arm/kernel/ecard.c +++ b/arch/arm/kernel/ecard.c @@ -46,7 +46,7 @@ #include #include -#include +#include #include #include #include diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index 7dca225752c..617e509d60d 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include "entry-header.S" diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index 84694e88b42..060d7e2e9f6 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S @@ -10,7 +10,7 @@ #include #include -#include +#include #include "entry-header.S" diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c index 89bfded70a1..3fd88233706 100644 --- a/arch/arm/kernel/process.c +++ b/arch/arm/kernel/process.c @@ -51,7 +51,7 @@ extern void setup_mm_for_reboot(char mode); static volatile int hlt_counter; -#include +#include void disable_hlt(void) { diff --git a/arch/arm/lib/ecard.S b/arch/arm/lib/ecard.S index 79cf247ad52..8678eb2b7a6 100644 --- a/arch/arm/lib/ecard.S +++ b/arch/arm/lib/ecard.S @@ -12,7 +12,7 @@ */ #include #include -#include +#include #define CPSR2SPSR(rt) \ mrs rt, cpsr; \ diff --git a/arch/arm/lib/io-readsw-armv3.S b/arch/arm/lib/io-readsw-armv3.S index 4cc4411595f..9aaf7c72065 100644 --- a/arch/arm/lib/io-readsw-armv3.S +++ b/arch/arm/lib/io-readsw-armv3.S @@ -9,7 +9,7 @@ */ #include #include -#include +#include .Linsw_bad_alignment: adr r0, .Linsw_bad_align_msg diff --git a/arch/arm/lib/io-writesw-armv3.S b/arch/arm/lib/io-writesw-armv3.S index 0a34752bc44..cd34503e424 100644 --- a/arch/arm/lib/io-writesw-armv3.S +++ b/arch/arm/lib/io-writesw-armv3.S @@ -9,7 +9,7 @@ */ #include #include -#include +#include .Loutsw_bad_alignment: adr r0, .Loutsw_bad_align_msg diff --git a/arch/arm/mach-aaec2000/aaed2000.c b/arch/arm/mach-aaec2000/aaed2000.c index 08f030d506b..81a3ecc0d10 100644 --- a/arch/arm/mach-aaec2000/aaed2000.c +++ b/arch/arm/mach-aaec2000/aaed2000.c @@ -20,14 +20,14 @@ #include #include #include -#include +#include #include #include #include #include -#include +#include #include "core.h" diff --git a/arch/arm/mach-aaec2000/core.c b/arch/arm/mach-aaec2000/core.c index 2e0cec2dc99..dfb26bc23d1 100644 --- a/arch/arm/mach-aaec2000/core.c +++ b/arch/arm/mach-aaec2000/core.c @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include diff --git a/include/asm-arm/arch-aaec2000/aaec2000.h b/arch/arm/mach-aaec2000/include/mach/aaec2000.h similarity index 99% rename from include/asm-arm/arch-aaec2000/aaec2000.h rename to arch/arm/mach-aaec2000/include/mach/aaec2000.h index a6d1ee0980f..bc729c42f84 100644 --- a/include/asm-arm/arch-aaec2000/aaec2000.h +++ b/arch/arm/mach-aaec2000/include/mach/aaec2000.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-aaec2000/aaec2000.h + * arch/arm/mach-aaec2000/include/mach/aaec2000.h * * AAEC-2000 registers definition * diff --git a/include/asm-arm/arch-aaec2000/aaed2000.h b/arch/arm/mach-aaec2000/include/mach/aaed2000.h similarity index 96% rename from include/asm-arm/arch-aaec2000/aaed2000.h rename to arch/arm/mach-aaec2000/include/mach/aaed2000.h index bc76d2badb9..f821295ca71 100644 --- a/include/asm-arm/arch-aaec2000/aaed2000.h +++ b/arch/arm/mach-aaec2000/include/mach/aaed2000.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-aaec2000/aaed2000.h + * arch/arm/mach-aaec2000/include/mach/aaed2000.h * * AAED-2000 specific bits definition * diff --git a/include/asm-arm/arch-aaec2000/debug-macro.S b/arch/arm/mach-aaec2000/include/mach/debug-macro.S similarity index 93% rename from include/asm-arm/arch-aaec2000/debug-macro.S rename to arch/arm/mach-aaec2000/include/mach/debug-macro.S index 7b1fce021d8..0b6351d7c38 100644 --- a/include/asm-arm/arch-aaec2000/debug-macro.S +++ b/arch/arm/mach-aaec2000/include/mach/debug-macro.S @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-aaec2000/debug-macro.S +/* arch/arm/mach-aaec2000/include/mach/debug-macro.S * * Debugging macro include header * diff --git a/include/asm-arm/arch-aaec2000/dma.h b/arch/arm/mach-aaec2000/include/mach/dma.h similarity index 84% rename from include/asm-arm/arch-aaec2000/dma.h rename to arch/arm/mach-aaec2000/include/mach/dma.h index e100b1e526f..2da846c72fe 100644 --- a/include/asm-arm/arch-aaec2000/dma.h +++ b/arch/arm/mach-aaec2000/include/mach/dma.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-aaec2000/dma.h + * arch/arm/mach-aaec2000/include/mach/dma.h * * Copyright (c) 2005 Nicolas Bellido Y Ortega * diff --git a/include/asm-arm/arch-aaec2000/entry-macro.S b/arch/arm/mach-aaec2000/include/mach/entry-macro.S similarity index 91% rename from include/asm-arm/arch-aaec2000/entry-macro.S rename to arch/arm/mach-aaec2000/include/mach/entry-macro.S index 83fdf68f6b7..c8fb3446900 100644 --- a/include/asm-arm/arch-aaec2000/entry-macro.S +++ b/arch/arm/mach-aaec2000/include/mach/entry-macro.S @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-aaec2000/entry-macro.S + * arch/arm/mach-aaec2000/include/mach/entry-macro.S * * Low-level IRQ helper for aaec-2000 based platforms * @@ -10,7 +10,7 @@ * published by the Free Software Foundation. * */ -#include +#include .macro disable_fiq .endm diff --git a/include/asm-arm/arch-aaec2000/hardware.h b/arch/arm/mach-aaec2000/include/mach/hardware.h similarity index 93% rename from include/asm-arm/arch-aaec2000/hardware.h rename to arch/arm/mach-aaec2000/include/mach/hardware.h index 153506fd06e..965a6f6672d 100644 --- a/include/asm-arm/arch-aaec2000/hardware.h +++ b/arch/arm/mach-aaec2000/include/mach/hardware.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-aaec2000/hardware.h + * arch/arm/mach-aaec2000/include/mach/hardware.h * * Copyright (c) 2005 Nicolas Bellido Y Ortega * @@ -12,7 +12,7 @@ #define __ASM_ARCH_HARDWARE_H #include -#include +#include /* The kernel is loaded at physical address 0xf8000000. * We map the IO space a bit after diff --git a/include/asm-arm/arch-aaec2000/io.h b/arch/arm/mach-aaec2000/include/mach/io.h similarity index 82% rename from include/asm-arm/arch-aaec2000/io.h rename to arch/arm/mach-aaec2000/include/mach/io.h index bc2364ab875..c87c24de111 100644 --- a/include/asm-arm/arch-aaec2000/io.h +++ b/arch/arm/mach-aaec2000/include/mach/io.h @@ -1,12 +1,12 @@ /* - * linux/include/asm-arm/arch-aaec2000/io.h + * arch/arm/mach-aaec2000/include/mach/io.h * * Copied from asm/arch/sa1100/io.h */ #ifndef __ASM_ARM_ARCH_IO_H #define __ASM_ARM_ARCH_IO_H -#include +#include #define IO_SPACE_LIMIT 0xffffffff diff --git a/include/asm-arm/arch-aaec2000/irqs.h b/arch/arm/mach-aaec2000/include/mach/irqs.h similarity index 97% rename from include/asm-arm/arch-aaec2000/irqs.h rename to arch/arm/mach-aaec2000/include/mach/irqs.h index de252220e80..bf45c6d2f29 100644 --- a/include/asm-arm/arch-aaec2000/irqs.h +++ b/arch/arm/mach-aaec2000/include/mach/irqs.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-aaec2000/irqs.h + * arch/arm/mach-aaec2000/include/mach/irqs.h * * Copyright (c) 2005 Nicolas Bellido Y Ortega * diff --git a/include/asm-arm/arch-aaec2000/memory.h b/arch/arm/mach-aaec2000/include/mach/memory.h similarity index 93% rename from include/asm-arm/arch-aaec2000/memory.h rename to arch/arm/mach-aaec2000/include/mach/memory.h index 9eceb414892..56ae900a482 100644 --- a/include/asm-arm/arch-aaec2000/memory.h +++ b/arch/arm/mach-aaec2000/include/mach/memory.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-aaec2000/memory.h + * arch/arm/mach-aaec2000/include/mach/memory.h * * Copyright (c) 2005 Nicolas Bellido Y Ortega * diff --git a/include/asm-arm/arch-aaec2000/system.h b/arch/arm/mach-aaec2000/include/mach/system.h similarity index 90% rename from include/asm-arm/arch-aaec2000/system.h rename to arch/arm/mach-aaec2000/include/mach/system.h index 08de97b407a..8f4115d734c 100644 --- a/include/asm-arm/arch-aaec2000/system.h +++ b/arch/arm/mach-aaec2000/include/mach/system.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-aaed2000/system.h + * arch/arm/mach-aaed2000/include/mach/system.h * * Copyright (c) 2005 Nicolas Bellido Y Ortega * diff --git a/include/asm-arm/arch-aaec2000/timex.h b/arch/arm/mach-aaec2000/include/mach/timex.h similarity index 89% rename from include/asm-arm/arch-aaec2000/timex.h rename to arch/arm/mach-aaec2000/include/mach/timex.h index f5708b38fb7..6c8edf4a882 100644 --- a/include/asm-arm/arch-aaec2000/timex.h +++ b/arch/arm/mach-aaec2000/include/mach/timex.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-aaec2000/timex.h + * arch/arm/mach-aaec2000/include/mach/timex.h * * AAEC-2000 Architecture timex specification * diff --git a/include/asm-arm/arch-aaec2000/uncompress.h b/arch/arm/mach-aaec2000/include/mach/uncompress.h similarity index 94% rename from include/asm-arm/arch-aaec2000/uncompress.h rename to arch/arm/mach-aaec2000/include/mach/uncompress.h index 300f4bf3bc7..381ecad1a1b 100644 --- a/include/asm-arm/arch-aaec2000/uncompress.h +++ b/arch/arm/mach-aaec2000/include/mach/uncompress.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-aaec2000/uncompress.h + * arch/arm/mach-aaec2000/include/mach/uncompress.h * * Copyright (c) 2005 Nicolas Bellido Y Ortega * diff --git a/include/asm-arm/arch-aaec2000/vmalloc.h b/arch/arm/mach-aaec2000/include/mach/vmalloc.h similarity index 88% rename from include/asm-arm/arch-aaec2000/vmalloc.h rename to arch/arm/mach-aaec2000/include/mach/vmalloc.h index ecb991e2e4f..551f68f666b 100644 --- a/include/asm-arm/arch-aaec2000/vmalloc.h +++ b/arch/arm/mach-aaec2000/include/mach/vmalloc.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-aaec2000/vmalloc.h + * arch/arm/mach-aaec2000/include/mach/vmalloc.h * * Copyright (c) 2005 Nicolas Bellido Y Ortega * diff --git a/arch/arm/mach-at91/at91cap9.c b/arch/arm/mach-at91/at91cap9.c index 933fa8f55cb..638948c1677 100644 --- a/arch/arm/mach-at91/at91cap9.c +++ b/arch/arm/mach-at91/at91cap9.c @@ -17,10 +17,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "generic.h" #include "clock.h" diff --git a/arch/arm/mach-at91/at91cap9_devices.c b/arch/arm/mach-at91/at91cap9_devices.c index 25765f1afca..abb4aac8fa9 100644 --- a/arch/arm/mach-at91/at91cap9_devices.c +++ b/arch/arm/mach-at91/at91cap9_devices.c @@ -20,11 +20,11 @@ #include