diff options
Diffstat (limited to '')
-rw-r--r-- | arch/arm/mach-davinci/board-evm.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-davinci/clock.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-davinci/gpio.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-davinci/include/mach/clock.h (renamed from include/asm-arm/arch-davinci/clock.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-davinci/include/mach/common.h (renamed from include/asm-arm/arch-davinci/common.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-davinci/include/mach/debug-macro.S (renamed from include/asm-arm/arch-davinci/debug-macro.S) | 0 | ||||
-rw-r--r-- | arch/arm/mach-davinci/include/mach/dma.h (renamed from include/asm-arm/arch-davinci/dma.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-davinci/include/mach/entry-macro.S (renamed from include/asm-arm/arch-davinci/entry-macro.S) | 4 | ||||
-rw-r--r-- | arch/arm/mach-davinci/include/mach/gpio.h (renamed from include/asm-arm/arch-davinci/gpio.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-davinci/include/mach/hardware.h (renamed from include/asm-arm/arch-davinci/hardware.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-davinci/include/mach/i2c.h (renamed from include/asm-arm/arch-davinci/i2c.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-davinci/include/mach/io.h (renamed from include/asm-arm/arch-davinci/io.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-davinci/include/mach/irqs.h (renamed from include/asm-arm/arch-davinci/irqs.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-davinci/include/mach/memory.h (renamed from include/asm-arm/arch-davinci/memory.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-davinci/include/mach/mux.h (renamed from include/asm-arm/arch-davinci/mux.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-davinci/include/mach/psc.h (renamed from include/asm-arm/arch-davinci/psc.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-davinci/include/mach/serial.h (renamed from include/asm-arm/arch-davinci/serial.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-davinci/include/mach/system.h (renamed from include/asm-arm/arch-davinci/system.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-davinci/include/mach/timex.h (renamed from include/asm-arm/arch-davinci/timex.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-davinci/include/mach/uncompress.h (renamed from include/asm-arm/arch-davinci/uncompress.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-davinci/include/mach/vmalloc.h (renamed from include/asm-arm/arch-davinci/vmalloc.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-davinci/io.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-davinci/irq.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-davinci/mux.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-davinci/psc.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-davinci/serial.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-davinci/time.c | 4 |
27 files changed, 27 insertions, 27 deletions
diff --git a/arch/arm/mach-davinci/board-evm.c b/arch/arm/mach-davinci/board-evm.c index 7497619e4a8a..134355787814 100644 --- a/arch/arm/mach-davinci/board-evm.c +++ b/arch/arm/mach-davinci/board-evm.c @@ -20,13 +20,13 @@ #include <asm/setup.h> #include <asm/io.h> #include <asm/mach-types.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> #include <asm/mach/flash.h> -#include <asm/arch/common.h> +#include <mach/common.h> /* other misc. init functions */ void __init davinci_psc_init(void); diff --git a/arch/arm/mach-davinci/clock.c b/arch/arm/mach-davinci/clock.c index 0014fb1c6eba..d46c69b55aaa 100644 --- a/arch/arm/mach-davinci/clock.c +++ b/arch/arm/mach-davinci/clock.c @@ -17,10 +17,10 @@ #include <linux/mutex.h> #include <linux/platform_device.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/io.h> -#include <asm/arch/psc.h> +#include <mach/psc.h> #include "clock.h" /* PLL/Reset register offsets */ diff --git a/arch/arm/mach-davinci/gpio.c b/arch/arm/mach-davinci/gpio.c index 9c67886e7189..c9cb4f09b18f 100644 --- a/arch/arm/mach-davinci/gpio.c +++ b/arch/arm/mach-davinci/gpio.c @@ -20,9 +20,9 @@ #include <linux/irq.h> #include <linux/bitops.h> -#include <asm/arch/irqs.h> -#include <asm/arch/hardware.h> -#include <asm/arch/gpio.h> +#include <mach/irqs.h> +#include <mach/hardware.h> +#include <mach/gpio.h> #include <asm/mach/irq.h> diff --git a/include/asm-arm/arch-davinci/clock.h b/arch/arm/mach-davinci/include/mach/clock.h index cc168b7a14f2..38bdd49bc181 100644 --- a/include/asm-arm/arch-davinci/clock.h +++ b/arch/arm/mach-davinci/include/mach/clock.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-davinci/clock.h + * arch/arm/mach-davinci/include/mach/clock.h * * Clock control driver for DaVinci - header file * diff --git a/include/asm-arm/arch-davinci/common.h b/arch/arm/mach-davinci/include/mach/common.h index a97dfbb15e57..a97dfbb15e57 100644 --- a/include/asm-arm/arch-davinci/common.h +++ b/arch/arm/mach-davinci/include/mach/common.h diff --git a/include/asm-arm/arch-davinci/debug-macro.S b/arch/arm/mach-davinci/include/mach/debug-macro.S index e6c0f0d5d062..e6c0f0d5d062 100644 --- a/include/asm-arm/arch-davinci/debug-macro.S +++ b/arch/arm/mach-davinci/include/mach/debug-macro.S diff --git a/include/asm-arm/arch-davinci/dma.h b/arch/arm/mach-davinci/include/mach/dma.h index 8e2f2d0ba667..8e2f2d0ba667 100644 --- a/include/asm-arm/arch-davinci/dma.h +++ b/arch/arm/mach-davinci/include/mach/dma.h diff --git a/include/asm-arm/arch-davinci/entry-macro.S b/arch/arm/mach-davinci/include/mach/entry-macro.S index 3ebfcc5cb58e..039b84f933b3 100644 --- a/include/asm-arm/arch-davinci/entry-macro.S +++ b/arch/arm/mach-davinci/include/mach/entry-macro.S @@ -8,8 +8,8 @@ * is licensed "as is" without any warranty of any kind, whether express * or implied. */ -#include <asm/arch/io.h> -#include <asm/arch/irqs.h> +#include <mach/io.h> +#include <mach/irqs.h> .macro disable_fiq .endm diff --git a/include/asm-arm/arch-davinci/gpio.h b/arch/arm/mach-davinci/include/mach/gpio.h index 54fda734649f..ec151ccf1e8f 100644 --- a/include/asm-arm/arch-davinci/gpio.h +++ b/arch/arm/mach-davinci/include/mach/gpio.h @@ -14,7 +14,7 @@ #define __DAVINCI_GPIO_H #include <linux/io.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> /* * basic gpio routines diff --git a/include/asm-arm/arch-davinci/hardware.h b/arch/arm/mach-davinci/include/mach/hardware.h index a2e8969afaca..a2e8969afaca 100644 --- a/include/asm-arm/arch-davinci/hardware.h +++ b/arch/arm/mach-davinci/include/mach/hardware.h diff --git a/include/asm-arm/arch-davinci/i2c.h b/arch/arm/mach-davinci/include/mach/i2c.h index e2f54168abd1..e2f54168abd1 100644 --- a/include/asm-arm/arch-davinci/i2c.h +++ b/arch/arm/mach-davinci/include/mach/i2c.h diff --git a/include/asm-arm/arch-davinci/io.h b/arch/arm/mach-davinci/include/mach/io.h index e7accb910864..e7accb910864 100644 --- a/include/asm-arm/arch-davinci/io.h +++ b/arch/arm/mach-davinci/include/mach/io.h diff --git a/include/asm-arm/arch-davinci/irqs.h b/arch/arm/mach-davinci/include/mach/irqs.h index f4c5ca6da9f4..f4c5ca6da9f4 100644 --- a/include/asm-arm/arch-davinci/irqs.h +++ b/arch/arm/mach-davinci/include/mach/irqs.h diff --git a/include/asm-arm/arch-davinci/memory.h b/arch/arm/mach-davinci/include/mach/memory.h index dd1625c23cf4..dd1625c23cf4 100644 --- a/include/asm-arm/arch-davinci/memory.h +++ b/arch/arm/mach-davinci/include/mach/memory.h diff --git a/include/asm-arm/arch-davinci/mux.h b/arch/arm/mach-davinci/include/mach/mux.h index c24b6782804d..c24b6782804d 100644 --- a/include/asm-arm/arch-davinci/mux.h +++ b/arch/arm/mach-davinci/include/mach/mux.h diff --git a/include/asm-arm/arch-davinci/psc.h b/arch/arm/mach-davinci/include/mach/psc.h index 4977aa071e1e..4977aa071e1e 100644 --- a/include/asm-arm/arch-davinci/psc.h +++ b/arch/arm/mach-davinci/include/mach/psc.h diff --git a/include/asm-arm/arch-davinci/serial.h b/arch/arm/mach-davinci/include/mach/serial.h index ed418ef76805..fb8cb229bfd2 100644 --- a/include/asm-arm/arch-davinci/serial.h +++ b/arch/arm/mach-davinci/include/mach/serial.h @@ -11,7 +11,7 @@ #ifndef __ASM_ARCH_SERIAL_H #define __ASM_ARCH_SERIAL_H -#include <asm/arch/io.h> +#include <mach/io.h> #define DAVINCI_UART0_BASE (IO_PHYS + 0x20000) #define DAVINCI_UART1_BASE (IO_PHYS + 0x20400) diff --git a/include/asm-arm/arch-davinci/system.h b/arch/arm/mach-davinci/include/mach/system.h index 6713e4a44ee8..84ff77aeb738 100644 --- a/include/asm-arm/arch-davinci/system.h +++ b/arch/arm/mach-davinci/include/mach/system.h @@ -12,7 +12,7 @@ #define __ASM_ARCH_SYSTEM_H #include <asm/io.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> extern void davinci_watchdog_reset(void); diff --git a/include/asm-arm/arch-davinci/timex.h b/arch/arm/mach-davinci/include/mach/timex.h index 52827567841d..52827567841d 100644 --- a/include/asm-arm/arch-davinci/timex.h +++ b/arch/arm/mach-davinci/include/mach/timex.h diff --git a/include/asm-arm/arch-davinci/uncompress.h b/arch/arm/mach-davinci/include/mach/uncompress.h index f6d1570f7206..8c165def37b6 100644 --- a/include/asm-arm/arch-davinci/uncompress.h +++ b/arch/arm/mach-davinci/include/mach/uncompress.h @@ -11,7 +11,7 @@ #include <linux/types.h> #include <linux/serial_reg.h> -#include <asm/arch/serial.h> +#include <mach/serial.h> /* PORT_16C550A, in polled non-fifo mode */ diff --git a/include/asm-arm/arch-davinci/vmalloc.h b/arch/arm/mach-davinci/include/mach/vmalloc.h index 9b47fa89b333..b98bd9e92fd6 100644 --- a/include/asm-arm/arch-davinci/vmalloc.h +++ b/arch/arm/mach-davinci/include/mach/vmalloc.h @@ -9,7 +9,7 @@ * or implied. */ #include <asm/memory.h> -#include <asm/arch/io.h> +#include <mach/io.h> /* Allow vmalloc range until the IO virtual range minus a 2M "hole" */ #define VMALLOC_END (IO_VIRT - (2<<20)) diff --git a/arch/arm/mach-davinci/io.c b/arch/arm/mach-davinci/io.c index 47787ff84a6a..5bb66b61c1a3 100644 --- a/arch/arm/mach-davinci/io.c +++ b/arch/arm/mach-davinci/io.c @@ -17,7 +17,7 @@ #include <asm/memory.h> #include <asm/mach/map.h> -#include <asm/arch/clock.h> +#include <mach/clock.h> extern void davinci_check_revision(void); diff --git a/arch/arm/mach-davinci/irq.c b/arch/arm/mach-davinci/irq.c index 090580ed88ef..12ca9f29f847 100644 --- a/arch/arm/mach-davinci/irq.c +++ b/arch/arm/mach-davinci/irq.c @@ -23,7 +23,7 @@ #include <linux/interrupt.h> #include <linux/irq.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/io.h> #include <asm/mach/irq.h> diff --git a/arch/arm/mach-davinci/mux.c b/arch/arm/mach-davinci/mux.c index 439bf94bdc4e..8ff9d8aca60b 100644 --- a/arch/arm/mach-davinci/mux.c +++ b/arch/arm/mach-davinci/mux.c @@ -11,9 +11,9 @@ #include <linux/io.h> #include <linux/spinlock.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> -#include <asm/arch/mux.h> +#include <mach/mux.h> /* System control register offsets */ #define PINMUX0 0x00 diff --git a/arch/arm/mach-davinci/psc.c b/arch/arm/mach-davinci/psc.c index 753f0ba81a44..720c48b9ee04 100644 --- a/arch/arm/mach-davinci/psc.c +++ b/arch/arm/mach-davinci/psc.c @@ -23,9 +23,9 @@ #include <linux/init.h> #include <asm/io.h> -#include <asm/arch/hardware.h> -#include <asm/arch/psc.h> -#include <asm/arch/mux.h> +#include <mach/hardware.h> +#include <mach/psc.h> +#include <mach/mux.h> /* PSC register offsets */ #define EPCPR 0x070 diff --git a/arch/arm/mach-davinci/serial.c b/arch/arm/mach-davinci/serial.c index c2b812f3391c..caf101e2cc62 100644 --- a/arch/arm/mach-davinci/serial.c +++ b/arch/arm/mach-davinci/serial.c @@ -29,9 +29,9 @@ #include <asm/io.h> #include <asm/irq.h> -#include <asm/arch/hardware.h> -#include <asm/arch/serial.h> -#include <asm/arch/irqs.h> +#include <mach/hardware.h> +#include <mach/serial.h> +#include <mach/irqs.h> #define UART_DAVINCI_PWREMU 0x0c diff --git a/arch/arm/mach-davinci/time.c b/arch/arm/mach-davinci/time.c index 50c3b54c4ccd..206e80d41717 100644 --- a/arch/arm/mach-davinci/time.c +++ b/arch/arm/mach-davinci/time.c @@ -17,13 +17,13 @@ #include <linux/spinlock.h> #include <asm/io.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/system.h> #include <asm/irq.h> #include <asm/mach/irq.h> #include <asm/mach/time.h> #include <asm/errno.h> -#include <asm/arch/io.h> +#include <mach/io.h> static struct clock_event_device clockevent_davinci; |