diff options
Diffstat (limited to '')
-rw-r--r-- | arch/arm/mach-netx/fb.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-netx/generic.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-netx/include/mach/debug-macro.S (renamed from include/asm-arm/arch-netx/debug-macro.S) | 2 | ||||
-rw-r--r-- | arch/arm/mach-netx/include/mach/dma.h (renamed from include/asm-arm/arch-netx/dma.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-netx/include/mach/entry-macro.S (renamed from include/asm-arm/arch-netx/entry-macro.S) | 4 | ||||
-rw-r--r-- | arch/arm/mach-netx/include/mach/eth.h (renamed from include/asm-arm/arch-netx/eth.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-netx/include/mach/hardware.h (renamed from include/asm-arm/arch-netx/hardware.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-netx/include/mach/io.h (renamed from include/asm-arm/arch-netx/io.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-netx/include/mach/irqs.h (renamed from include/asm-arm/arch-netx/irqs.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-netx/include/mach/memory.h (renamed from include/asm-arm/arch-netx/memory.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-netx/include/mach/netx-regs.h (renamed from include/asm-arm/arch-netx/netx-regs.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-netx/include/mach/param.h (renamed from include/asm-arm/arch-netx/param.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-netx/include/mach/pfifo.h (renamed from include/asm-arm/arch-netx/pfifo.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-netx/include/mach/system.h (renamed from include/asm-arm/arch-netx/system.h) | 4 | ||||
-rw-r--r-- | arch/arm/mach-netx/include/mach/timex.h (renamed from include/asm-arm/arch-netx/timex.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-netx/include/mach/uncompress.h (renamed from include/asm-arm/arch-netx/uncompress.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-netx/include/mach/vmalloc.h (renamed from include/asm-arm/arch-netx/vmalloc.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-netx/include/mach/xc.h (renamed from include/asm-arm/arch-netx/xc.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-netx/nxdb500.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-netx/nxdkn.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-netx/nxeb500hmi.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-netx/pfifo.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-netx/time.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-netx/xc.c | 6 |
24 files changed, 39 insertions, 39 deletions
diff --git a/arch/arm/mach-netx/fb.c b/arch/arm/mach-netx/fb.c index e169b683e4de..24c79650f9f3 100644 --- a/arch/arm/mach-netx/fb.c +++ b/arch/arm/mach-netx/fb.c @@ -23,8 +23,8 @@ #include <linux/amba/bus.h> #include <linux/amba/clcd.h> -#include <asm/arch/netx-regs.h> -#include <asm/arch/hardware.h> +#include <mach/netx-regs.h> +#include <mach/hardware.h> struct clk {}; diff --git a/arch/arm/mach-netx/generic.c b/arch/arm/mach-netx/generic.c index 798ac6e120ff..1b40483ea753 100644 --- a/arch/arm/mach-netx/generic.c +++ b/arch/arm/mach-netx/generic.c @@ -22,11 +22,11 @@ #include <linux/kernel.h> #include <linux/module.h> #include <linux/platform_device.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/mach/map.h> #include <asm/hardware/vic.h> #include <asm/io.h> -#include <asm/arch/netx-regs.h> +#include <mach/netx-regs.h> #include <asm/mach/irq.h> static struct map_desc netx_io_desc[] __initdata = { diff --git a/include/asm-arm/arch-netx/debug-macro.S b/arch/arm/mach-netx/include/mach/debug-macro.S index a940d0e80cb2..11b9d5b46390 100644 --- a/include/asm-arm/arch-netx/debug-macro.S +++ b/arch/arm/mach-netx/include/mach/debug-macro.S @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-netx/debug-macro.S +/* arch/arm/mach-netx/include/mach/debug-macro.S * * Debugging macro include header * diff --git a/include/asm-arm/arch-netx/dma.h b/arch/arm/mach-netx/include/mach/dma.h index 4eda5feed81c..690b3ebc43ac 100644 --- a/include/asm-arm/arch-netx/dma.h +++ b/arch/arm/mach-netx/include/mach/dma.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-netx/dma.h + * arch/arm/mach-netx/include/mach/dma.h * * Copyright (C) 2005 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix * diff --git a/include/asm-arm/arch-netx/entry-macro.S b/arch/arm/mach-netx/include/mach/entry-macro.S index 4115bbdf97ae..a1952a0feda6 100644 --- a/include/asm-arm/arch-netx/entry-macro.S +++ b/arch/arm/mach-netx/include/mach/entry-macro.S @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-netx/entry-macro.S + * arch/arm/mach-netx/include/mach/entry-macro.S * * Low-level IRQ helper macros for Hilscher netX based platforms * @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <asm/arch/hardware.h> +#include <mach/hardware.h> .macro disable_fiq .endm diff --git a/include/asm-arm/arch-netx/eth.h b/arch/arm/mach-netx/include/mach/eth.h index 643c90ef8b72..88af1ac28ead 100644 --- a/include/asm-arm/arch-netx/eth.h +++ b/arch/arm/mach-netx/include/mach/eth.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-netx/eth.h + * arch/arm/mach-netx/include/mach/eth.h * * Copyright (c) 2005 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix * diff --git a/include/asm-arm/arch-netx/hardware.h b/arch/arm/mach-netx/include/mach/hardware.h index 7786c45455cd..517a2bd37842 100644 --- a/include/asm-arm/arch-netx/hardware.h +++ b/arch/arm/mach-netx/include/mach/hardware.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-netx/hardware.h + * arch/arm/mach-netx/include/mach/hardware.h * * Copyright (C) 2005 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix * diff --git a/include/asm-arm/arch-netx/io.h b/arch/arm/mach-netx/include/mach/io.h index a7a53f80165d..468b92a82585 100644 --- a/include/asm-arm/arch-netx/io.h +++ b/arch/arm/mach-netx/include/mach/io.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-netx/io.h + * arch/arm/mach-netx/include/mach/io.h * * Copyright (C) 2005 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix * diff --git a/include/asm-arm/arch-netx/irqs.h b/arch/arm/mach-netx/include/mach/irqs.h index a487dc6e2661..6ce914d54a30 100644 --- a/include/asm-arm/arch-netx/irqs.h +++ b/arch/arm/mach-netx/include/mach/irqs.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-netx/irqs.h + * arch/arm/mach-netx/include/mach/irqs.h * * Copyright (C) 2005 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix * diff --git a/include/asm-arm/arch-netx/memory.h b/arch/arm/mach-netx/include/mach/memory.h index 6d8d2df3e99d..53745a1378de 100644 --- a/include/asm-arm/arch-netx/memory.h +++ b/arch/arm/mach-netx/include/mach/memory.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-netx/memory.h + * arch/arm/mach-netx/include/mach/memory.h * * Copyright (C) 2005 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix * diff --git a/include/asm-arm/arch-netx/netx-regs.h b/arch/arm/mach-netx/include/mach/netx-regs.h index fc9aa21f360c..5104a00d40f4 100644 --- a/include/asm-arm/arch-netx/netx-regs.h +++ b/arch/arm/mach-netx/include/mach/netx-regs.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-netx/netx-regs.h + * arch/arm/mach-netx/include/mach/netx-regs.h * * Copyright (c) 2005 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix * diff --git a/include/asm-arm/arch-netx/param.h b/arch/arm/mach-netx/include/mach/param.h index 7a80c26178a8..a771459206aa 100644 --- a/include/asm-arm/arch-netx/param.h +++ b/arch/arm/mach-netx/include/mach/param.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-netx/param.h + * arch/arm/mach-netx/include/mach/param.h * * Copyright (C) 2005 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix * diff --git a/include/asm-arm/arch-netx/pfifo.h b/arch/arm/mach-netx/include/mach/pfifo.h index 4af2ee4a32c1..42c59068f8d8 100644 --- a/include/asm-arm/arch-netx/pfifo.h +++ b/arch/arm/mach-netx/include/mach/pfifo.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-netx/pfifo.h + * arch/arm/mach-netx/include/mach/pfifo.h * * Copyright (c) 2005 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix * diff --git a/include/asm-arm/arch-netx/system.h b/arch/arm/mach-netx/include/mach/system.h index 0624d87e1db8..27d8ef8e8e29 100644 --- a/include/asm-arm/arch-netx/system.h +++ b/arch/arm/mach-netx/include/mach/system.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-netx/system.h + * arch/arm/mach-netx/include/mach/system.h * * Copyright (C) 2005 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix * @@ -20,7 +20,7 @@ #define __ASM_ARCH_SYSTEM_H #include <asm/io.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include "netx-regs.h" static inline void arch_idle(void) diff --git a/include/asm-arm/arch-netx/timex.h b/arch/arm/mach-netx/include/mach/timex.h index 7fdb42da0b40..1120dd0ba393 100644 --- a/include/asm-arm/arch-netx/timex.h +++ b/arch/arm/mach-netx/include/mach/timex.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-netx/timex.h + * arch/arm/mach-netx/include/mach/timex.h * * Copyright (C) 2005 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix * diff --git a/include/asm-arm/arch-netx/uncompress.h b/arch/arm/mach-netx/include/mach/uncompress.h index f89434547102..84f91284f612 100644 --- a/include/asm-arm/arch-netx/uncompress.h +++ b/arch/arm/mach-netx/include/mach/uncompress.h @@ -1,5 +1,5 @@ /* - * include/asm-arm/arch-netx/uncompress.h + * arch/arm/mach-netx/include/mach/uncompress.h * * Copyright (C) 2005 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix * diff --git a/include/asm-arm/arch-netx/vmalloc.h b/arch/arm/mach-netx/include/mach/vmalloc.h index da2da5a595da..25d5cc676e0f 100644 --- a/include/asm-arm/arch-netx/vmalloc.h +++ b/arch/arm/mach-netx/include/mach/vmalloc.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-netx/vmalloc.h + * arch/arm/mach-netx/include/mach/vmalloc.h * * Copyright (C) 2005 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix * diff --git a/include/asm-arm/arch-netx/xc.h b/arch/arm/mach-netx/include/mach/xc.h index 659af19512a9..0c0011d4fc2d 100644 --- a/include/asm-arm/arch-netx/xc.h +++ b/arch/arm/mach-netx/include/mach/xc.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-netx/xc.h + * arch/arm/mach-netx/include/mach/xc.h * * Copyright (C) 2005 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix * diff --git a/arch/arm/mach-netx/nxdb500.c b/arch/arm/mach-netx/nxdb500.c index 0cb19450499b..c9b174bc8ccf 100644 --- a/arch/arm/mach-netx/nxdb500.c +++ b/arch/arm/mach-netx/nxdb500.c @@ -25,11 +25,11 @@ #include <linux/amba/bus.h> #include <linux/amba/clcd.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> -#include <asm/arch/netx-regs.h> -#include <asm/arch/eth.h> +#include <mach/netx-regs.h> +#include <mach/eth.h> #include "generic.h" #include "fb.h" diff --git a/arch/arm/mach-netx/nxdkn.c b/arch/arm/mach-netx/nxdkn.c index 848b2f172dd8..15b54c62d60f 100644 --- a/arch/arm/mach-netx/nxdkn.c +++ b/arch/arm/mach-netx/nxdkn.c @@ -25,11 +25,11 @@ #include <linux/amba/bus.h> #include <linux/amba/clcd.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> -#include <asm/arch/netx-regs.h> -#include <asm/arch/eth.h> +#include <mach/netx-regs.h> +#include <mach/eth.h> #include "generic.h" diff --git a/arch/arm/mach-netx/nxeb500hmi.c b/arch/arm/mach-netx/nxeb500hmi.c index cb361eadba5b..1061c01ff679 100644 --- a/arch/arm/mach-netx/nxeb500hmi.c +++ b/arch/arm/mach-netx/nxeb500hmi.c @@ -25,11 +25,11 @@ #include <linux/amba/bus.h> #include <linux/amba/clcd.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> -#include <asm/arch/netx-regs.h> -#include <asm/arch/eth.h> +#include <mach/netx-regs.h> +#include <mach/eth.h> #include "generic.h" #include "fb.h" diff --git a/arch/arm/mach-netx/pfifo.c b/arch/arm/mach-netx/pfifo.c index d0e6b43ff3a0..19ae0a72bea3 100644 --- a/arch/arm/mach-netx/pfifo.c +++ b/arch/arm/mach-netx/pfifo.c @@ -22,9 +22,9 @@ #include <linux/mutex.h> #include <asm/io.h> -#include <asm/arch/hardware.h> -#include <asm/arch/netx-regs.h> -#include <asm/arch/pfifo.h> +#include <mach/hardware.h> +#include <mach/netx-regs.h> +#include <mach/pfifo.h> static DEFINE_MUTEX(pfifo_lock); diff --git a/arch/arm/mach-netx/time.c b/arch/arm/mach-netx/time.c index 2c93fd3d03e5..ac8e5bfed691 100644 --- a/arch/arm/mach-netx/time.c +++ b/arch/arm/mach-netx/time.c @@ -22,10 +22,10 @@ #include <linux/irq.h> #include <linux/clocksource.h> -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/io.h> #include <asm/mach/time.h> -#include <asm/arch/netx-regs.h> +#include <mach/netx-regs.h> /* * IRQ handler for the timer diff --git a/arch/arm/mach-netx/xc.c b/arch/arm/mach-netx/xc.c index 0ea4d3baf7b1..04c34e82fe6d 100644 --- a/arch/arm/mach-netx/xc.c +++ b/arch/arm/mach-netx/xc.c @@ -23,10 +23,10 @@ #include <linux/mutex.h> #include <asm/io.h> -#include <asm/arch/hardware.h> -#include <asm/arch/netx-regs.h> +#include <mach/hardware.h> +#include <mach/netx-regs.h> -#include <asm/arch/xc.h> +#include <mach/xc.h> static DEFINE_MUTEX(xc_lock); |