[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 <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King
committed by
Russell King
Russell King
parent
a1b81a84ff
commit
a09e64fbc0
@@ -6,7 +6,7 @@ typedef unsigned int dmach_t;
|
||||
#include <linux/spinlock.h>
|
||||
#include <asm/system.h>
|
||||
#include <asm/scatterlist.h>
|
||||
#include <asm/arch/dma.h>
|
||||
#include <mach/dma.h>
|
||||
|
||||
/*
|
||||
* This is the maximum virtual address which can be DMA'd from.
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
#ifndef __ASM_ARM_FLOPPY_H
|
||||
#define __ASM_ARM_FLOPPY_H
|
||||
#if 0
|
||||
#include <asm/arch/floppy.h>
|
||||
#include <mach/floppy.h>
|
||||
#endif
|
||||
|
||||
#define fd_outb(val,port) \
|
||||
|
||||
@@ -2,6 +2,6 @@
|
||||
#define _ARCH_ARM_GPIO_H
|
||||
|
||||
/* not all ARM platforms necessarily support this API ... */
|
||||
#include <asm/arch/gpio.h>
|
||||
#include <mach/gpio.h>
|
||||
|
||||
#endif /* _ARCH_ARM_GPIO_H */
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
#define DC21285_PCI_MEM 0x80000000
|
||||
|
||||
#ifndef __ASSEMBLY__
|
||||
#include <asm/arch/hardware.h>
|
||||
#include <mach/hardware.h>
|
||||
#define DC21285_IO(x) ((volatile unsigned long *)(ARMCSR_BASE+(x)))
|
||||
#else
|
||||
#define DC21285_IO(x) (x)
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
#define _ADMA_H
|
||||
#include <linux/types.h>
|
||||
#include <linux/io.h>
|
||||
#include <asm/arch/hardware.h>
|
||||
#include <mach/hardware.h>
|
||||
#include <asm/hardware/iop_adma.h>
|
||||
|
||||
/* Memory copy units */
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
#ifndef __ASM_ARM_HARDWARE_IOP3XX_GPIO_H
|
||||
#define __ASM_ARM_HARDWARE_IOP3XX_GPIO_H
|
||||
|
||||
#include <asm/arch/hardware.h>
|
||||
#include <mach/hardware.h>
|
||||
#include <asm-generic/gpio.h>
|
||||
|
||||
#define IOP3XX_N_GPIOS 8
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
#ifndef _ASM_ARCH_SA1111
|
||||
#define _ASM_ARCH_SA1111
|
||||
|
||||
#include <asm/arch/bitfield.h>
|
||||
#include <mach/bitfield.h>
|
||||
|
||||
/*
|
||||
* The SA1111 is always located at virtual 0xf4000000, and is always
|
||||
|
||||
@@ -82,7 +82,7 @@ extern void __readwrite_bug(const char *fn);
|
||||
/*
|
||||
* Now, pick up the machine-defined IO definitions
|
||||
*/
|
||||
#include <asm/arch/io.h>
|
||||
#include <mach/io.h>
|
||||
|
||||
/*
|
||||
* IO port access primitives
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#ifndef __ASM_ARM_IRQ_H
|
||||
#define __ASM_ARM_IRQ_H
|
||||
|
||||
#include <asm/arch/irqs.h>
|
||||
#include <mach/irqs.h>
|
||||
|
||||
#ifndef irq_canonicalize
|
||||
#define irq_canonicalize(i) (i)
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#ifndef _ASM_MC146818RTC_H
|
||||
#define _ASM_MC146818RTC_H
|
||||
|
||||
#include <asm/arch/irqs.h>
|
||||
#include <mach/irqs.h>
|
||||
#include <asm/io.h>
|
||||
|
||||
#ifndef RTC_PORT
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
#endif
|
||||
|
||||
#include <linux/compiler.h>
|
||||
#include <asm/arch/memory.h>
|
||||
#include <mach/memory.h>
|
||||
#include <asm/sizes.h>
|
||||
|
||||
#ifdef CONFIG_MMU
|
||||
|
||||
@@ -25,6 +25,6 @@ extern pg_data_t discontig_node_data[];
|
||||
*/
|
||||
#define NODE_MEM_MAP(nid) (NODE_DATA(nid)->node_mem_map)
|
||||
|
||||
#include <asm/arch/memory.h>
|
||||
#include <mach/memory.h>
|
||||
|
||||
#endif
|
||||
|
||||
@@ -17,8 +17,8 @@
|
||||
#ifndef __ARM_MTD_XIP_H__
|
||||
#define __ARM_MTD_XIP_H__
|
||||
|
||||
#include <asm/arch/hardware.h>
|
||||
#include <asm/arch/mtd-xip.h>
|
||||
#include <mach/hardware.h>
|
||||
#include <mach/mtd-xip.h>
|
||||
|
||||
/* fill instruction prefetch */
|
||||
#define xip_iprefetch() do { asm volatile (".rep 8; nop; .endr"); } while (0)
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#ifdef __KERNEL__
|
||||
#include <asm-generic/pci-dma-compat.h>
|
||||
|
||||
#include <asm/arch/hardware.h> /* for PCIBIOS_MIN_* */
|
||||
#include <mach/hardware.h> /* for PCIBIOS_MIN_* */
|
||||
|
||||
#define pcibios_scan_all_fns(a, b) 0
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
#else
|
||||
|
||||
#include <asm/memory.h>
|
||||
#include <asm/arch/vmalloc.h>
|
||||
#include <mach/vmalloc.h>
|
||||
#include <asm/pgtable-hwdef.h>
|
||||
|
||||
/*
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
#include <linux/cpumask.h>
|
||||
#include <linux/thread_info.h>
|
||||
|
||||
#include <asm/arch/smp.h>
|
||||
#include <mach/smp.h>
|
||||
|
||||
#ifndef CONFIG_SMP
|
||||
# error "<asm/smp.h> included in non-SMP build"
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
#ifndef _ASMARM_TIMEX_H
|
||||
#define _ASMARM_TIMEX_H
|
||||
|
||||
#include <asm/arch/timex.h>
|
||||
#include <mach/timex.h>
|
||||
|
||||
typedef unsigned long cycles_t;
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#ifndef ASMARM_VGA_H
|
||||
#define ASMARM_VGA_H
|
||||
|
||||
#include <asm/arch/hardware.h>
|
||||
#include <mach/hardware.h>
|
||||
#include <asm/io.h>
|
||||
|
||||
#define VGA_MAP_MEM(x,s) (PCIMEM_BASE + (x))
|
||||
|
||||
Reference in New Issue
Block a user