Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6-omap-h63xx.git] / net / atm / resources.h

diff --git a/net/atm/resources.h b/net/atm/resources.h
index 644989980c37f9b173cde5ca1ad3a5988922ff2a..1d004aaaeec1ac69d48b0b8deddb51737de668c2 100644 (file)
--- a/net/atm/resources.h
+++ b/net/atm/resources.h
@@ -6,7 +6,6 @@
 #ifndef NET_ATM_RESOURCES_H
 #define NET_ATM_RESOURCES_H
 
-#include <linux/config.h>
 #include <linux/atmdev.h>
 #include <linux/mutex.h>