Merge branch 'master' into upstream

[deliverable/linux.git] / drivers / char / n_hdlc.c

diff --git a/drivers/char/n_hdlc.c b/drivers/char/n_hdlc.c
index 9f54733f16236e9e5618c91967d1d1434ef824ef..337a87f86a3bff05dc22eb296591ac1c5ae5e03d 100644 (file)
--- a/drivers/char/n_hdlc.c
+++ b/drivers/char/n_hdlc.c
@@ -81,7 +81,6 @@
 #define HDLC_MAGIC 0x239e
 #define HDLC_VERSION "$Revision: 4.8 $"
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/kernel.h>