Merge branch 'origin'

[sfrench/cifs-2.6.git] / include / asm-m68k / serial.h

diff --git a/include/asm-m68k/serial.h b/include/asm-m68k/serial.h
index 3fe29f8b01948aa5493906175914a14aef6d6e3e..2b90d6e690700ba66e85370268b0aa2284794043 100644 (file)
--- a/include/asm-m68k/serial.h
+++ b/include/asm-m68k/serial.h
@@ -6,7 +6,6 @@
  *
  */
 
-#include <linux/config.h>
 
 /*
  * This assumes you have a 1.8432 MHz clock for your UART.