Merge branch 'master' into upstream

[~andy/linux] / include / asm-v850 / serial.h

diff --git a/include/asm-v850/serial.h b/include/asm-v850/serial.h
index 8c2a609ba2b0487f81583660ec34f9b799699f04..36d8f4cbbf39a03bb3d83f83cf8c50c7c5553448 100644 (file)
--- a/include/asm-v850/serial.h
+++ b/include/asm-v850/serial.h
@@ -6,7 +6,6 @@
  * Copyright (C) 1999 by Ralf Baechle
  * Copyright (C) 1999, 2000 Silicon Graphics, Inc.
  */ 
-#include <linux/config.h>
 
 #ifdef CONFIG_RTE_CB_ME2