Merge branch 'master' of git://git.denx.de/u-boot-mmc

[karo-tx-uboot.git] / include / common.h

diff --git a/include/common.h b/include/common.h
index d49c51464dadb77a5296ef3705112229d75f24a0..221b7768c5bec16d5e090d4febf809826ece570b 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -8,9 +8,6 @@
 #ifndef __COMMON_H_
 #define __COMMON_H_    1
 
-#undef _LINUX_CONFIG_H
-#define _LINUX_CONFIG_H 1      /* avoid reading Linux autoconf.h file  */
-
 #ifndef __ASSEMBLY__           /* put C only stuff in this section */
 
 typedef unsigned char          uchar;
@@ -411,6 +408,9 @@ static inline int setenv_addr(const char *varname, const void *addr)
 #ifdef CONFIG_MIPS
 # include <asm/u-boot-mips.h>
 #endif /* CONFIG_MIPS */
+#ifdef CONFIG_ARC
+# include <asm/u-boot-arc.h>
+#endif /* CONFIG_ARC */
 
 #ifdef CONFIG_AUTO_COMPLETE
 int env_complete(char *var, int maxv, char *cmdv[], int maxsz, char *buf);