diff options
Diffstat (limited to '')
-rw-r--r-- | arch/arm/mach-imx/clock.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/cpufreq.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/dma.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-imx/generic.c | 10 | ||||
-rw-r--r-- | arch/arm/mach-imx/include/mach/debug-macro.S (renamed from include/asm-arm/arch-imx/debug-macro.S) | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/include/mach/dma.h (renamed from include/asm-arm/arch-imx/dma.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-imx/include/mach/entry-macro.S (renamed from include/asm-arm/arch-imx/entry-macro.S) | 4 | ||||
-rw-r--r-- | arch/arm/mach-imx/include/mach/gpio.h (renamed from include/asm-arm/arch-imx/gpio.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/include/mach/hardware.h (renamed from include/asm-arm/arch-imx/hardware.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/include/mach/imx-dma.h (renamed from include/asm-arm/arch-imx/imx-dma.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-imx/include/mach/imx-regs.h (renamed from include/asm-arm/arch-imx/imx-regs.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-imx/include/mach/imx-uart.h (renamed from include/asm-arm/arch-imx/imx-uart.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-imx/include/mach/imxfb.h (renamed from include/asm-arm/arch-imx/imxfb.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-imx/include/mach/io.h (renamed from include/asm-arm/arch-imx/io.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-imx/include/mach/irqs.h (renamed from include/asm-arm/arch-imx/irqs.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-imx/include/mach/memory.h (renamed from include/asm-arm/arch-imx/memory.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/include/mach/mmc.h (renamed from include/asm-arm/arch-imx/mmc.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-imx/include/mach/mx1ads.h (renamed from include/asm-arm/arch-imx/mx1ads.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/include/mach/spi_imx.h (renamed from include/asm-arm/arch-imx/spi_imx.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-imx/include/mach/system.h (renamed from include/asm-arm/arch-imx/system.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/include/mach/timex.h (renamed from include/asm-arm/arch-imx/timex.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-imx/include/mach/uncompress.h (renamed from include/asm-arm/arch-imx/uncompress.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/include/mach/vmalloc.h (renamed from include/asm-arm/arch-imx/vmalloc.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/irq.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/leds-mx1ads.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/mx1ads.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-imx/time.c | 2 |
27 files changed, 31 insertions, 31 deletions
diff --git a/arch/arm/mach-imx/clock.c b/arch/arm/mach-imx/clock.c index 8915a5fc63cd..4b4230db3765 100644 --- a/arch/arm/mach-imx/clock.c +++ b/arch/arm/mach-imx/clock.c @@ -23,7 +23,7 @@ #include <linux/err.h> #include <asm/io.h> -#include <asm/arch/imx-regs.h> +#include <mach/imx-regs.h> /* * Very simple approach: We can't disable clocks, so we do diff --git a/arch/arm/mach-imx/cpufreq.c b/arch/arm/mach-imx/cpufreq.c index 3fee1ac6fd8c..434b4ca0af67 100644 --- a/arch/arm/mach-imx/cpufreq.c +++ b/arch/arm/mach-imx/cpufreq.c @@ -36,7 +36,7 @@ #include <linux/err.h> #include <asm/system.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include "generic.h" diff --git a/arch/arm/mach-imx/dma.c b/arch/arm/mach-imx/dma.c index 17a43ba1696b..c10810c936b3 100644 --- a/arch/arm/mach-imx/dma.c +++ b/arch/arm/mach-imx/dma.c @@ -30,9 +30,9 @@ #include <asm/system.h> #include <asm/irq.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/dma.h> -#include <asm/arch/imx-dma.h> +#include <mach/imx-dma.h> struct imx_dma_channel imx_dma_channels[IMX_DMA_CHANNELS]; diff --git a/arch/arm/mach-imx/generic.c b/arch/arm/mach-imx/generic.c index df77665fadce..fa72174dd95c 100644 --- a/arch/arm/mach-imx/generic.c +++ b/arch/arm/mach-imx/generic.c @@ -29,13 +29,13 @@ #include <linux/string.h> #include <asm/errno.h> -#include <asm/arch/imxfb.h> -#include <asm/arch/hardware.h> -#include <asm/arch/imx-regs.h> +#include <mach/imxfb.h> +#include <mach/hardware.h> +#include <mach/imx-regs.h> #include <asm/mach/map.h> -#include <asm/arch/mmc.h> -#include <asm/arch/gpio.h> +#include <mach/mmc.h> +#include <mach/gpio.h> unsigned long imx_gpio_alloc_map[(GPIO_PORT_MAX + 1) * 32 / BITS_PER_LONG]; diff --git a/include/asm-arm/arch-imx/debug-macro.S b/arch/arm/mach-imx/include/mach/debug-macro.S index c611871643a2..87802bbfe633 100644 --- a/include/asm-arm/arch-imx/debug-macro.S +++ b/arch/arm/mach-imx/include/mach/debug-macro.S @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-imx/debug-macro.S +/* arch/arm/mach-imx/include/mach/debug-macro.S * * Debugging macro include header * diff --git a/include/asm-arm/arch-imx/dma.h b/arch/arm/mach-imx/include/mach/dma.h index 621ff2c730f2..621ff2c730f2 100644 --- a/include/asm-arm/arch-imx/dma.h +++ b/arch/arm/mach-imx/include/mach/dma.h diff --git a/include/asm-arm/arch-imx/entry-macro.S b/arch/arm/mach-imx/include/mach/entry-macro.S index 5dc0f307c1bb..e4db679f7766 100644 --- a/include/asm-arm/arch-imx/entry-macro.S +++ b/arch/arm/mach-imx/include/mach/entry-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-imx/entry-macro.S + * arch/arm/mach-imx/include/mach/entry-macro.S * * Low-level IRQ helper macros for iMX-based platforms * @@ -7,7 +7,7 @@ * License version 2. This program is licensed "as is" without any * warranty of any kind, whether express or implied. */ -#include <asm/arch/hardware.h> +#include <mach/hardware.h> .macro disable_fiq .endm diff --git a/include/asm-arm/arch-imx/gpio.h b/arch/arm/mach-imx/include/mach/gpio.h index 486023263f32..6e3d795f2264 100644 --- a/include/asm-arm/arch-imx/gpio.h +++ b/arch/arm/mach-imx/include/mach/gpio.h @@ -1,6 +1,6 @@ #ifndef _IMX_GPIO_H -#include <asm/arch/imx-regs.h> +#include <mach/imx-regs.h> #define IMX_GPIO_ALLOC_MODE_NORMAL 0 #define IMX_GPIO_ALLOC_MODE_NO_ALLOC 1 diff --git a/include/asm-arm/arch-imx/hardware.h b/arch/arm/mach-imx/include/mach/hardware.h index 6542ca5e8c33..c73e9e724c75 100644 --- a/include/asm-arm/arch-imx/hardware.h +++ b/arch/arm/mach-imx/include/mach/hardware.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-imx/hardware.h + * arch/arm/mach-imx/include/mach/hardware.h * * Copyright (C) 1999 ARM Limited. * diff --git a/include/asm-arm/arch-imx/imx-dma.h b/arch/arm/mach-imx/include/mach/imx-dma.h index 44d89c35539a..44d89c35539a 100644 --- a/include/asm-arm/arch-imx/imx-dma.h +++ b/arch/arm/mach-imx/include/mach/imx-dma.h diff --git a/include/asm-arm/arch-imx/imx-regs.h b/arch/arm/mach-imx/include/mach/imx-regs.h index fb9de2733879..fb9de2733879 100644 --- a/include/asm-arm/arch-imx/imx-regs.h +++ b/arch/arm/mach-imx/include/mach/imx-regs.h diff --git a/include/asm-arm/arch-imx/imx-uart.h b/arch/arm/mach-imx/include/mach/imx-uart.h index d54eb1d48026..d54eb1d48026 100644 --- a/include/asm-arm/arch-imx/imx-uart.h +++ b/arch/arm/mach-imx/include/mach/imx-uart.h diff --git a/include/asm-arm/arch-imx/imxfb.h b/arch/arm/mach-imx/include/mach/imxfb.h index 3ed9ec8b9f00..3ed9ec8b9f00 100644 --- a/include/asm-arm/arch-imx/imxfb.h +++ b/arch/arm/mach-imx/include/mach/imxfb.h diff --git a/include/asm-arm/arch-imx/io.h b/arch/arm/mach-imx/include/mach/io.h index 1a1d9bb88631..c50c5fa6fb81 100644 --- a/include/asm-arm/arch-imx/io.h +++ b/arch/arm/mach-imx/include/mach/io.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-imxads/io.h + * arch/arm/mach-imxads/include/mach/io.h * * Copyright (C) 1999 ARM Limited * @@ -20,7 +20,7 @@ #ifndef __ASM_ARM_ARCH_IO_H #define __ASM_ARM_ARCH_IO_H -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #define IO_SPACE_LIMIT 0xffffffff diff --git a/include/asm-arm/arch-imx/irqs.h b/arch/arm/mach-imx/include/mach/irqs.h index 238197cfb9d9..eb8d5bd05d56 100644 --- a/include/asm-arm/arch-imx/irqs.h +++ b/arch/arm/mach-imx/include/mach/irqs.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-imxads/irqs.h + * arch/arm/mach-imxads/include/mach/irqs.h * * Copyright (C) 1999 ARM Limited * Copyright (C) 2000 Deep Blue Solutions Ltd. @@ -23,7 +23,7 @@ #define __ARM_IRQS_H__ /* Use the imx definitions */ -#include <asm/arch/hardware.h> +#include <mach/hardware.h> /* * IMX Interrupt numbers diff --git a/include/asm-arm/arch-imx/memory.h b/arch/arm/mach-imx/include/mach/memory.h index 5ad90127915f..5c453063c0ed 100644 --- a/include/asm-arm/arch-imx/memory.h +++ b/arch/arm/mach-imx/include/mach/memory.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-imx/memory.h + * arch/arm/mach-imx/include/mach/memory.h * * Copyright (C) 1999 ARM Limited * Copyright (C) 2002 Shane Nay (shane@minirl.com) diff --git a/include/asm-arm/arch-imx/mmc.h b/arch/arm/mach-imx/include/mach/mmc.h index 4712f354dcca..4712f354dcca 100644 --- a/include/asm-arm/arch-imx/mmc.h +++ b/arch/arm/mach-imx/include/mach/mmc.h diff --git a/include/asm-arm/arch-imx/mx1ads.h b/arch/arm/mach-imx/include/mach/mx1ads.h index d90fa4b49ce1..def05d510eb3 100644 --- a/include/asm-arm/arch-imx/mx1ads.h +++ b/arch/arm/mach-imx/include/mach/mx1ads.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-imx/mx1ads.h + * arch/arm/mach-imx/include/mach/mx1ads.h * * Copyright (C) 2004 Robert Schwebel, Pengutronix * diff --git a/include/asm-arm/arch-imx/spi_imx.h b/arch/arm/mach-imx/include/mach/spi_imx.h index 2165449e976e..4186430feecf 100644 --- a/include/asm-arm/arch-imx/spi_imx.h +++ b/arch/arm/mach-imx/include/mach/spi_imx.h @@ -1,11 +1,11 @@ /* - * include/asm-arm/arch-imx/spi_imx.h + * arch/arm/mach-imx/include/mach/spi_imx.h * * Copyright (C) 2006 SWAPP * Andrea Paterniani <a.paterniani@swapp-eng.it> * * Initial version inspired by: - * linux-2.6.17-rc3-mm1/include/asm-arm/arch-pxa/pxa2xx_spi.h + * linux-2.6.17-rc3-mm1/arch/arm/mach-pxa/include/mach/pxa2xx_spi.h * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/include/asm-arm/arch-imx/system.h b/arch/arm/mach-imx/include/mach/system.h index c645fe9afb9d..adee7e51bab2 100644 --- a/include/asm-arm/arch-imx/system.h +++ b/arch/arm/mach-imx/include/mach/system.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-imxads/system.h + * arch/arm/mach-imxads/include/mach/system.h * * Copyright (C) 1999 ARM Limited * Copyright (C) 2000 Deep Blue Solutions Ltd diff --git a/include/asm-arm/arch-imx/timex.h b/arch/arm/mach-imx/include/mach/timex.h index e22ba789546c..e22ba789546c 100644 --- a/include/asm-arm/arch-imx/timex.h +++ b/arch/arm/mach-imx/include/mach/timex.h diff --git a/include/asm-arm/arch-imx/uncompress.h b/arch/arm/mach-imx/include/mach/uncompress.h index da333f69136f..70523e67a8f6 100644 --- a/include/asm-arm/arch-imx/uncompress.h +++ b/arch/arm/mach-imx/include/mach/uncompress.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-imxads/uncompress.h + * arch/arm/mach-imxads/include/mach/uncompress.h * * * diff --git a/include/asm-arm/arch-imx/vmalloc.h b/arch/arm/mach-imx/include/mach/vmalloc.h index cb6169127068..7d7cb0bde3e8 100644 --- a/include/asm-arm/arch-imx/vmalloc.h +++ b/arch/arm/mach-imx/include/mach/vmalloc.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-imx/vmalloc.h + * arch/arm/mach-imx/include/mach/vmalloc.h * * Copyright (C) 2000 Russell King. * diff --git a/arch/arm/mach-imx/irq.c b/arch/arm/mach-imx/irq.c index 167b7fcbed2f..798f221eb3b7 100644 --- a/arch/arm/mach-imx/irq.c +++ b/arch/arm/mach-imx/irq.c @@ -27,7 +27,7 @@ #include <linux/list.h> #include <linux/timer.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/irq.h> #include <asm/io.h> diff --git a/arch/arm/mach-imx/leds-mx1ads.c b/arch/arm/mach-imx/leds-mx1ads.c index 8757d37354f2..af81621f689b 100644 --- a/arch/arm/mach-imx/leds-mx1ads.c +++ b/arch/arm/mach-imx/leds-mx1ads.c @@ -13,7 +13,7 @@ #include <linux/kernel.h> #include <linux/init.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/system.h> #include <asm/io.h> #include <asm/leds.h> diff --git a/arch/arm/mach-imx/mx1ads.c b/arch/arm/mach-imx/mx1ads.c index baf5e2f711ee..87fa1ff43b0b 100644 --- a/arch/arm/mach-imx/mx1ads.c +++ b/arch/arm/mach-imx/mx1ads.c @@ -16,7 +16,7 @@ #include <linux/init.h> #include <linux/platform_device.h> #include <asm/system.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/irq.h> #include <asm/pgtable.h> #include <asm/page.h> @@ -25,8 +25,8 @@ #include <asm/mach-types.h> #include <asm/mach/arch.h> -#include <asm/arch/mmc.h> -#include <asm/arch/imx-uart.h> +#include <mach/mmc.h> +#include <mach/imx-uart.h> #include <linux/interrupt.h> #include "generic.h" diff --git a/arch/arm/mach-imx/time.c b/arch/arm/mach-imx/time.c index 7fc6d2cdfd99..08be3875c59e 100644 --- a/arch/arm/mach-imx/time.c +++ b/arch/arm/mach-imx/time.c @@ -19,7 +19,7 @@ #include <linux/clockchips.h> #include <linux/clk.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/io.h> #include <asm/leds.h> #include <asm/irq.h> |