Merge branch 'linus' into sched/urgent

[linux-2.6-omap-h63xx.git] / drivers / w1 / masters / matrox_w1.c

diff --git a/drivers/w1/masters/matrox_w1.c b/drivers/w1/masters/matrox_w1.c
index d356da5709fce3b1dc81f5644ff49e0592fec494..1550431ccb6ade0b3b1ee556d3ea809f1c125132 100644 (file)
--- a/drivers/w1/masters/matrox_w1.c
+++ b/drivers/w1/masters/matrox_w1.c
@@ -33,7 +33,6 @@
 #include <linux/slab.h>
 #include <linux/pci_ids.h>
 #include <linux/pci.h>
-#include <linux/timer.h>
 
 #include "../w1.h"
 #include "../w1_int.h"