Merge branch 'master' of /home/sam/kernel/linux-2.6/

[mv-sheeva.git] / net / irda / timer.c

diff --git a/net/irda/timer.c b/net/irda/timer.c
index 0e17f976add69990b8ad346312b9f30133b257bb..3871a2b911f93722e78791203eccb048d7b95a13 100644 (file)
--- a/net/irda/timer.c
+++ b/net/irda/timer.c
@@ -25,7 +25,6 @@
  ********************************************************************/
 
 #include <asm/system.h>
-#include <linux/config.h>
 #include <linux/delay.h>
 
 #include <net/irda/timer.h>