merge linus into release branch

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

diff --git a/include/asm-v850/processor.h b/include/asm-v850/processor.h
index 2d31308935a00ab0263feab4b75ce8be482724be..6965b66ccaed89ff828bd331bece3a5a5c6ceefa 100644 (file)
--- a/include/asm-v850/processor.h
+++ b/include/asm-v850/processor.h
@@ -14,7 +14,6 @@
 #ifndef __V850_PROCESSOR_H__
 #define __V850_PROCESSOR_H__
 
-#include <linux/config.h>
 #ifndef __ASSEMBLY__ /* <linux/thread_info.h> is not asm-safe.  */
 #include <linux/thread_info.h>
 #endif