merge linus into release branch

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / include / asm-v850 / machdep.h

diff --git a/include/asm-v850/machdep.h b/include/asm-v850/machdep.h
index 98d8bf63970eda99d669ae7497a0ab3b1994150c..f1e3b8b91508d55f2a59659acc1de2aac773bb04 100644 (file)
--- a/include/asm-v850/machdep.h
+++ b/include/asm-v850/machdep.h
@@ -14,7 +14,6 @@
 #ifndef __V850_MACHDEP_H__
 #define __V850_MACHDEP_H__
 
-#include <linux/config.h>
 
 /* chips */
 #ifdef CONFIG_V850E_MA1