Merge branch 'master'

[linux-2.6-omap-h63xx.git] / net / ax25 / sysctl_net_ax25.c

diff --git a/net/ax25/sysctl_net_ax25.c b/net/ax25/sysctl_net_ax25.c
index bdb64c36df12dc1b45d51ec0fa79a60c826b2629..369a75b160f2d688a898fe43a1b2f7203658bbd1 100644 (file)
--- a/net/ax25/sysctl_net_ax25.c
+++ b/net/ax25/sysctl_net_ax25.c
@@ -6,7 +6,6 @@
  *
  * Copyright (C) 1996 Mike Shaver (shaver@zeroknowledge.com)
  */
-#include <linux/config.h>
 #include <linux/mm.h>
 #include <linux/sysctl.h>
 #include <linux/spinlock.h>