Merge branch 'master' into upstream

[pandora-kernel.git] / include / net / icmp.h

diff --git a/include/net/icmp.h b/include/net/icmp.h
index e7c3f20..05f8ff7 100644 (file)
--- a/include/net/icmp.h
+++ b/include/net/icmp.h
@@ -18,7 +18,6 @@
 #ifndef _ICMP_H
 #define        _ICMP_H
 
-#include <linux/config.h>
 #include <linux/icmp.h>
 
 #include <net/inet_sock.h>