Merge branch 'for-sascha' of git://uboot.jcrosoft.org/u-boot-v2 into from-jean

Conflicts:
	board/a9m2440/a9m2440.c
	board/pcm043/pcm043.c
	drivers/nand/nand_imx.c

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Makefile

@@ -168,6 +168,7 @@ CROSS_COMPILE   ?=
 
 # Architecture as present in compile.h
 UTS_MACHINE := $(ARCH)
+SRCARCH 	:= $(ARCH)
 
 KCONFIG_CONFIG	?= .config
 
@@ -287,6 +288,7 @@ export MODVERDIR := $(if $(KBUILD_EXTMOD),$(firstword $(KBUILD_EXTMOD))/).tmp_ve
 # Needed to be compatible with the O= option
 LINUXINCLUDE    := -Iinclude \
                    $(if $(KBUILD_SRC),-Iinclude2 -I$(srctree)/include) \
+		   -I$(srctree)/arch/$(ARCH)/include \
 		   -include include/linux/autoconf.h
 
 CPPFLAGS        := -D__KERNEL__ -D__U_BOOT__ $(LINUXINCLUDE) -fno-builtin -ffreestanding
@@ -749,7 +751,9 @@ ifneq ($(KBUILD_SRC),)
 		/bin/false; \
 	fi;
 	$(Q)if [ ! -d include2 ]; then mkdir -p include2; fi;
-	$(Q)ln -fsn $(srctree)/include/asm-$(ARCH) include2/asm
+	$(Q)if [ -e $(srctree)/include/asm-$(SRCARCH)/u-boot.h ]; then  \
+	    ln -fsn $(srctree)/include/asm-$(SRCARCH) include2/asm;     \
+	    fi
 endif
 
 # prepare2 creates a makefile if using a separate output directory
@@ -780,10 +784,34 @@ export CPPFLAGS_uboot.lds += -P -C -U$(ARCH)
 # hard to detect, but I suppose "make mrproper" is a good idea
 # before switching between archs anyway.
 
+define check-symlink
+	set -e;								\
+	if [ -L include/asm ]; then					\
+		asmlink=`readlink include/asm | cut -d '-' -f 2`;	\
+		if [ "$$asmlink" != "$(SRCARCH)" ]; then		\
+			echo "ERROR: the symlink $@ points to asm-$$asmlink but asm-$(SRCARCH) was expected";	\
+			echo "       set ARCH or save .config and run 'make mrproper' to fix it";		\
+			exit 1;						\
+		fi;							\
+	fi
+endef
+
+# We create the target directory of the symlink if it does
+# not exist so the test in chack-symlink works and we have a
+# directory for generated filesas used by some architectures.
+define create-symlink
+	if [ ! -L include/asm ]; then					\
+			echo '  SYMLINK $@ -> include/asm-$(SRCARCH)';	\
+			if [ ! -d include/asm-$(SRCARCH) ]; then	\
+				mkdir -p include/asm-$(SRCARCH);	\
+			fi;						\
+			ln -fsn asm-$(SRCARCH) $@;			\
+	fi
+endef
+
 include/asm:
-	@echo '  SYMLINK $@ -> include/asm-$(ARCH)'
-	$(Q)if [ ! -d include ]; then mkdir -p include; fi;
-	@ln -fsn asm-$(ARCH) $@
+	$(Q)$(check-symlink)
+	$(Q)$(create-symlink)
 
 include/config.h: include/config/auto.conf
 	@echo '  SYMLINK $@ -> board/$(board-y)/config.h'
@@ -1075,7 +1103,11 @@ define find-sources
 	       \( -name config -o -name 'asm-*' \) -prune \
 	       -o -name $1 -print; \
 	  for ARCH in $(ALLINCLUDE_ARCHS) ; do \
-	       find $(__srctree)include/asm-$${ARCH} $(RCS_FIND_IGNORE) \
+	       test -e $(__srctree)include/asm-$${arch} && \
+	         find $(__srctree)include/asm-$${arch} $(RCS_FIND_IGNORE) \
+	           -name $1 -print; \
+	      test -e $(__srctree)arch/$${arch}/include/asm && \
+	        find $(__srctree)arch/$${arch}/include/asm $(RCS_FIND_IGNORE) \
 	            -name $1 -print; \
 	  done ; \
 	  find $(__srctree)include/asm-generic $(RCS_FIND_IGNORE) \

arch/arm/Makefile

@@ -32,6 +32,14 @@ board-$(CONFIG_MACH_EUKREA_CPUIMX27) := eukrea_cpuimx27
 cpu-$(CONFIG_ARM920T)              := arm920t
 cpu-$(CONFIG_ARM926EJS)            := arm926ejs
 
+machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y))
+
+ifeq ($(KBUILD_SRC),)
+CPPFLAGS += $(patsubst %,-I%include,$(machdirs))
+else
+CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(machdirs))
+endif
+
 TEXT_BASE = $(CONFIG_TEXT_BASE)
 
 CPPFLAGS += -mabi=apcs-gnu -DTEXT_BASE=$(TEXT_BASE) -P
@@ -42,32 +50,6 @@ CPPFLAGS += -fdata-sections -ffunction-sections
 LDFLAGS_uboot += -static --gc-sections
 endif
 
-ifeq ($(incdir-y),)
-incdir-y := $(machine-y)
-endif
-INCDIR   := arch-$(incdir-y)
-
-#	Update machine arch and proc symlinks if something which affects
-#	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
-	@echo '  SYMLINK include/asm-arm/proc -> include/asm-arm/proc-armv'
-ifneq ($(KBUILD_SRC),)
-	$(Q)mkdir -p include/asm-arm
-	$(Q)ln -fsn $(srctree)/include/asm-arm/proc-armv include/asm-arm/proc
-else
-	$(Q)ln -fsn proc-armv include/asm-arm/proc
-endif
-	@touch $@
-
 uboot.netx: uboot.bin
 	$(Q)scripts/gen_netx_image -i uboot.bin -o uboot.netx		\
 		--sdramctrl=$(CONFIG_NETX_SDRAM_CTRL)			\
@@ -85,7 +67,6 @@ all: $(KBUILD_IMAGE)
 archprepare: maketools
 
 PHONY += maketools
-maketools: include/asm-arm/.arch
 
 # Add architecture specific flags
 ifeq ($(CONFIG_ARMCORTEXA8),y)
@@ -111,4 +92,3 @@ lds-$(CONFIG_GENERIC_LINKER_SCRIPT)   := arch/arm/lib/u-boot.lds
 lds-$(CONFIG_BOARD_LINKER_SCRIPT)     := $(BOARD)/u-boot.lds
 
 CLEAN_FILES    += arch/arm/lib/u-boot.lds
-MRPROPER_FILES += include/asm-arm/arch include/asm-arm/proc

arch/arm/include/asm/gpio.h

@@ -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 */

arch/arm/include/asm/hardware.h

@@ -13,6 +13,6 @@
 #ifndef __ASM_HARDWARE_H
 #define __ASM_HARDWARE_H
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 #endif

arch/arm/include/asm/ptrace.h

@@ -1,15 +1,28 @@
 /*
- *  linux/include/asm-arm/proc-armv/ptrace.h
+ *  arch/arm/include/asm/ptrace.h
  *
- *  Copyright (C) 1996-1999 Russell King
+ *  Copyright (C) 1996-2003 Russell King
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
-#ifndef __ASM_PROC_PTRACE_H
-#define __ASM_PROC_PTRACE_H
+#ifndef __ASM_ARM_PTRACE_H
+#define __ASM_ARM_PTRACE_H
 
+#define PTRACE_GETREGS		12
+#define PTRACE_SETREGS		13
+#define PTRACE_GETFPREGS	14
+#define PTRACE_SETFPREGS	15
+
+#define PTRACE_SETOPTIONS	21
+
+/* options set using PTRACE_SETOPTIONS */
+#define PTRACE_O_TRACESYSGOOD	0x00000001
+
+/*
+ * PSR bits
+ */
 #define USR26_MODE	0x00
 #define FIQ26_MODE	0x01
 #define IRQ26_MODE	0x02
@@ -104,4 +117,21 @@ static inline int valid_user_regs(struct pt_regs *regs)
 
 #endif	/* __ASSEMBLY__ */
 
+#ifndef __ASSEMBLY__
+#define pc_pointer(v) \
+	((v) & ~PCMASK)
+
+#define instruction_pointer(regs) \
+	(pc_pointer((regs)->ARM_pc))
+
+#ifdef __KERNEL__
+extern void show_regs(struct pt_regs *);
+
+#define predicate(x)	(x & 0xf0000000)
+#define PREDICATE_ALWAYS	0xe0000000
+
+#endif
+
+#endif /* __ASSEMBLY__ */
+
 #endif

arch/arm/mach-at91/at91sam9260_devices.c

@@ -12,11 +12,11 @@
 #include <common.h>
 #include <asm/armlinux.h>
 #include <asm/hardware.h>
-#include <asm/arch/board.h>
-#include <asm/arch/at91_pmc.h>
-#include <asm/arch/at91sam9260_matrix.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/io.h>
+#include <mach/board.h>
+#include <mach/at91_pmc.h>
+#include <mach/at91sam9260_matrix.h>
+#include <mach/gpio.h>
+#include <mach/io.h>
 
 static struct memory_platform_data sram_pdata = {
 	.name = "sram0",

arch/arm/mach-at91/at91sam9263_devices.c

@@ -12,11 +12,11 @@
 #include <common.h>
 #include <asm/armlinux.h>
 #include <asm/hardware.h>
-#include <asm/arch/at91_pmc.h>
-#include <asm/arch/at91sam9263_matrix.h>
-#include <asm/arch/board.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/io.h>
+#include <mach/at91_pmc.h>
+#include <mach/at91sam9263_matrix.h>
+#include <mach/board.h>
+#include <mach/gpio.h>
+#include <mach/io.h>
 
 static struct memory_platform_data ram_pdata = {
 	.name = "ram0",

arch/arm/mach-at91/clocksource.c

@@ -33,10 +33,10 @@
 #include <init.h>
 #include <clock.h>
 #include <asm/hardware.h>
-#include <asm/arch/at91_pit.h>
-#include <asm/arch/at91_pmc.h>
-#include <asm/arch/at91_rstc.h>
-#include <asm/arch/io.h>
+#include <mach/at91_pit.h>
+#include <mach/at91_pmc.h>
+#include <mach/at91_rstc.h>
+#include <mach/io.h>
 #include <asm/io.h>
 
 uint64_t at91sam9_clocksource_read(void)

arch/arm/mach-at91/gpio.c

@@ -24,7 +24,7 @@
 #include <common.h>
 #include <errno.h>
 #include <asm/io.h>
-#include <asm/arch/gpio.h>
+#include <mach/gpio.h>
 #include <gpio.h>
 
 static int gpio_banks;

arch/arm/mach-at91/include/mach/at91sam9_matrix.h

@@ -12,17 +12,17 @@
 #define __ASM_ARCH_AT91SAM9_MATRIX_H
 
 #if defined(CONFIG_ARCH_AT91SAM9260) || defined(CONFIG_ARCH_AT91SAM9G20)
-#include <asm/arch/at91sam9260_matrix.h>
+#include <mach/at91sam9260_matrix.h>
 #elif defined(CONFIG_ARCH_AT91SAM9261)
-#include <asm/arch/at91sam9261_matrix.h>
+#include <mach/at91sam9261_matrix.h>
 #elif defined(CONFIG_ARCH_AT91SAM9263)
-#include <asm/arch/at91sam9263_matrix.h>
+#include <mach/at91sam9263_matrix.h>
 #elif defined(CONFIG_ARCH_AT91SAM9RL)
-#include <asm/arch/at91sam9rl_matrix.h>
+#include <mach/at91sam9rl_matrix.h>
 #elif defined(CONFIG_ARCH_AT91CAP9)
-#include <asm/arch/at91cap9_matrix.h>
+#include <mach/at91cap9_matrix.h>
 #elif defined(CONFIG_ARCH_AT91SAM9G45) || defined(CONFIG_ARCH_AT91SAM9M10G45)
-#include <asm/arch/at91sam9g45_matrix.h>
+#include <mach/at91sam9g45_matrix.h>
 #else
 #error "Unsupported AT91SAM9/CAP9 processor"
 #endif

arch/arm/mach-at91/include/mach/clk.h

@@ -24,7 +24,7 @@
 #ifndef __ASM_ARM_ARCH_CLK_H__
 #define __ASM_ARM_ARCH_CLK_H__
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 static inline unsigned long get_macb_pclk_rate(unsigned int dev_id)
 {

arch/arm/mach-at91/include/mach/gpio.h

@@ -15,8 +15,8 @@
 
 #include <asm/io.h>
 #include <asm-generic/errno.h>
-#include <asm/arch/at91_pio.h>
-#include <asm/arch/hardware.h>
+#include <mach/at91_pio.h>
+#include <mach/hardware.h>
 
 #define PIN_BASE		32
 

arch/arm/mach-at91/include/mach/hardware.h

@@ -15,21 +15,21 @@
 #define __ASM_ARCH_HARDWARE_H
 
 #if defined(CONFIG_ARCH_AT91RM9200)
-#include <asm/arch/at91rm9200.h>
+#include <mach/at91rm9200.h>
 #elif defined(CONFIG_ARCH_AT91SAM9260) || defined(CONFIG_ARCH_AT91SAM9G20)
-#include <asm/arch/at91sam9260.h>
+#include <mach/at91sam9260.h>
 #elif defined(CONFIG_ARCH_AT91SAM9261) || defined(CONFIG_ARCH_AT91SAM9G10)
-#include <asm/arch/at91sam9261.h>
+#include <mach/at91sam9261.h>
 #elif defined(CONFIG_ARCH_AT91SAM9263)
-#include <asm/arch/at91sam9263.h>
+#include <mach/at91sam9263.h>
 #elif defined(CONFIG_ARCH_AT91SAM9RL)
-#include <asm/arch/at91sam9rl.h>
+#include <mach/at91sam9rl.h>
 #elif defined(CONFIG_ARCH_AT91SAM9G45) || defined(CONFIG_ARCH_AT91SAM9M10G45)
-#include <asm/arch/at91sam9g45.h>
+#include <mach/at91sam9g45.h>
 #elif defined(CONFIG_ARCH_AT91CAP9)
-#include <asm/arch/at91cap9.h>
+#include <mach/at91cap9.h>
 #elif defined(CONFIG_ARCH_AT91X40)
-#include <asm/arch/at91x40.h>
+#include <mach/at91x40.h>
 #else
 #error "Unsupported AT91 processor"
 #endif

arch/arm/mach-at91/lowlevel_init.S

@@ -28,14 +28,14 @@
 
 #include <linux/autoconf.h>
 #include <config.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/at91_pmc.h>
-#include <asm/arch/at91_pio.h>
-#include <asm/arch/at91_rstc.h>
-#include <asm/arch/at91_wdt.h>
-#include <asm/arch/at91sam9_matrix.h>
-#include <asm/arch/at91sam9_sdramc.h>
-#include <asm/arch/at91sam9_smc.h>
+#include <mach/hardware.h>
+#include <mach/at91_pmc.h>
+#include <mach/at91_pio.h>
+#include <mach/at91_rstc.h>
+#include <mach/at91_wdt.h>
+#include <mach/at91sam9_matrix.h>
+#include <mach/at91sam9_sdramc.h>
+#include <mach/at91sam9_smc.h>
 
 _TEXT_BASE:
 	.word	TEXT_BASE

arch/arm/mach-at91/sam9_smc.c

@@ -10,11 +10,11 @@
 
 #include <common.h>
 #include <asm/io.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/io.h>
+#include <mach/hardware.h>
+#include <mach/io.h>
 
-#include <asm/arch/at91sam9_smc.h>
-#include <asm/arch/sam9_smc.h>
+#include <mach/at91sam9_smc.h>
+#include <mach/sam9_smc.h>
 
 void sam9_smc_configure(int cs, struct sam9_smc_config* config)
 {

arch/arm/mach-imx/clko.c

@@ -1,8 +1,8 @@
 #include <common.h>
 #include <command.h>
 #include <getopt.h>
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/clock.h>
+#include <mach/imx-regs.h>
+#include <mach/clock.h>
 
 static int do_clko (cmd_tbl_t *cmdtp, int argc, char *argv[])
 {

arch/arm/mach-imx/clocksource.c

@@ -33,8 +33,8 @@
 #include <init.h>
 #include <clock.h>
 #include <notifier.h>
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/clock.h>
+#include <mach/imx-regs.h>
+#include <mach/clock.h>
 
 #define GPT(x) __REG(IMX_TIM1_BASE + (x))
 

arch/arm/mach-imx/gpio.c

@@ -24,7 +24,7 @@
  */
 
 #include <common.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-regs.h>
 
 void imx_gpio_mode(int gpio_mode)
 {

arch/arm/mach-imx/imx21.c

@@ -16,7 +16,7 @@
  */
 
 #include <common.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-regs.h>
 
 int imx_silicon_revision(void)
 {

arch/arm/mach-imx/imx27.c

@@ -16,7 +16,7 @@
  */
 
 #include <common.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-regs.h>
 
 int imx_silicon_revision(void)
 {

arch/arm/mach-imx/include/mach/imx-regs.h

@@ -40,17 +40,17 @@
 #endif
 
 #ifdef CONFIG_ARCH_IMX1
-# include <asm/arch/imx1-regs.h>
+# include <mach/imx1-regs.h>
 #elif defined CONFIG_ARCH_IMX21
-# include <asm/arch/imx21-regs.h>
+# include <mach/imx21-regs.h>
 #elif defined CONFIG_ARCH_IMX27
-# include <asm/arch/imx27-regs.h>
+# include <mach/imx27-regs.h>
 #elif defined CONFIG_ARCH_IMX31
-# include <asm/arch/imx31-regs.h>
+# include <mach/imx31-regs.h>
 #elif defined CONFIG_ARCH_IMX35
-# include <asm/arch/imx35-regs.h>
+# include <mach/imx35-regs.h>
 #elif defined CONFIG_ARCH_IMX25
-# include <asm/arch/imx25-regs.h>
+# include <mach/imx25-regs.h>
 #else
 # error "unknown i.MX soc type"
 #endif

arch/arm/mach-imx/include/mach/iomux-mx25.h

@@ -1,7 +1,7 @@
 #ifndef __MACH_IOMUX_MX25_H__
 #define __MACH_IOMUX_MX25_H__
 
-#include <asm/arch/iomux-v3.h>
+#include <mach/iomux-v3.h>
 
 #define SRE		(1 << 0)
 #define DSE_STD		(0 << 1)

arch/arm/mach-imx/include/mach/iomux-mx35.h

@@ -19,7 +19,7 @@
 #ifndef __MACH_IOMUX_MX35_H__
 #define __MACH_IOMUX_MX35_H__
 
-#include <asm/arch/iomux-v3.h>
+#include <mach/iomux-v3.h>
 
 /*
  * The naming convention for the pad modes is MX35_PAD_<padname>__<padmode>

arch/arm/mach-imx/iomux-v2.c

@@ -19,8 +19,8 @@
 
 #include <common.h>
 #include <asm/io.h>
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/iomux-mx31.h>
+#include <mach/imx-regs.h>
+#include <mach/iomux-mx31.h>
 
 /*
  * IOMUX register (base) addresses

arch/arm/mach-imx/iomux-v3.c

@@ -20,8 +20,8 @@
  */
 #include <common.h>
 #include <asm/io.h>
-#include <asm/arch/iomux-v3.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/iomux-v3.h>
+#include <mach/imx-regs.h>
 
 /*
  * setups a single pin:

arch/arm/mach-imx/speed-imx1.c

@@ -23,8 +23,8 @@
 
 
 #include <common.h>
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/clock.h>
+#include <mach/imx-regs.h>
+#include <mach/clock.h>
 #include <init.h>
 #include <driver.h>
 

arch/arm/mach-imx/speed-imx21.c

@@ -16,9 +16,9 @@
  */
 
 #include <common.h>
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/generic.h>
-#include <asm/arch/clock.h>
+#include <mach/imx-regs.h>
+#include <mach/generic.h>
+#include <mach/clock.h>
 #include <init.h>
 
 #ifndef CLK32

arch/arm/mach-imx/speed-imx25.c

@@ -1,7 +1,7 @@
 #include <common.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-regs.h>
 #include <asm/io.h>
-#include <asm/arch/clock.h>
+#include <mach/clock.h>
 #include <init.h>
 
 unsigned long imx_get_mpllclk(void)

arch/arm/mach-imx/speed-imx27.c

@@ -16,9 +16,9 @@
  */
 
 #include <common.h>
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/generic.h>
-#include <asm/arch/clock.h>
+#include <mach/imx-regs.h>
+#include <mach/generic.h>
+#include <mach/clock.h>
 #include <init.h>
 
 #ifndef CLK32

arch/arm/mach-imx/speed-imx31.c

@@ -17,8 +17,8 @@
 
 #include <common.h>
 #include <asm/io.h>
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/clock.h>
+#include <mach/imx-regs.h>
+#include <mach/clock.h>
 #include <init.h>
 
 ulong imx_get_mpl_dpdgck_clk(void)

arch/arm/mach-imx/speed-imx35.c

@@ -16,9 +16,9 @@
  */
 
 #include <common.h>
-#include <asm/arch/imx-regs.h>
+#include <mach/imx-regs.h>
 #include <asm/io.h>
-#include <asm/arch/clock.h>
+#include <mach/clock.h>
 #include <init.h>
 
 unsigned long imx_get_mpllclk(void)

arch/arm/mach-netx/clocksource.c

@@ -25,7 +25,7 @@
 #include <common.h>
 #include <init.h>
 #include <clock.h>
-#include <asm/arch/netx-regs.h>
+#include <mach/netx-regs.h>
 
 uint64_t netx_clocksource_read(void)
 {

arch/arm/mach-netx/generic.c

@@ -20,7 +20,7 @@
 
 #include <common.h>
 #include <command.h>
-#include <asm/arch/netx-regs.h>
+#include <mach/netx-regs.h>
 #include "eth_firmware.h"
 
 struct fw_header {

arch/arm/mach-netx/interrupts.c

@@ -1,6 +1,6 @@
 #include <common.h>
 
-#include <asm/arch/netx-regs.h>
+#include <mach/netx-regs.h>
 
 int timer_init (void)
 {

arch/arm/mach-netx/netx-cm.c

@@ -1,6 +1,6 @@
 #include <common.h>
-#include <asm/arch/netx-regs.h>
-#include <asm/arch/netx-cm.h>
+#include <mach/netx-regs.h>
+#include <mach/netx-cm.h>
 
 #define I2C_CTRL_ENABLE		(1<<0)
 #define I2C_CTRL_SPEED_25	(0<<1)

arch/arm/mach-omap/gpmc.c

@@ -30,10 +30,10 @@
 #include <common.h>
 #include <init.h>
 #include <asm/io.h>
-#include <asm/arch/silicon.h>
-#include <asm/arch/gpmc.h>
-#include <asm/arch/sys_info.h>
-#include <asm/arch/syslib.h>
+#include <mach/silicon.h>
+#include <mach/gpmc.h>
+#include <mach/sys_info.h>
+#include <mach/syslib.h>
 
 /**
  * @brief Do a Generic initialization of GPMC. if you choose otherwise,

arch/arm/mach-omap/include/mach/clocks.h

@@ -42,7 +42,7 @@
 #define S38_4M		38400000
 
 #ifdef CONFIG_ARCH_OMAP3
-#include <asm/arch/omap3-clock.h>
+#include <mach/omap3-clock.h>
 #endif
 
 #endif /* __OMAP_CLOCKS_H_ */

arch/arm/mach-omap/include/mach/control.h

@@ -91,7 +91,7 @@
 
 /**
  * macro for Padconfig Registers @see
- * include/asm/arch-arm/arch-omap/omap3-mux.h
+ * include/mach-arm/arch-omap/omap3-mux.h
  */
 #define	CP(X) (CONTROL_PADCONF_##X)