commit de4f800b498e04aceadb96107cdee2bbe1f9464a
author Jesper Juhl <jesper.juhl@gmail.com> Tue Oct 16 23:26:22 2007 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Wed Oct 17 08:42:48 2007 -0700
tree 1e42369a9b075bfed27aa8ed3dcab5035e2e81db
parent 3f1a4373e7863c320878322e68a45aa2b100b692

Clean up duplicate includes in drivers/w1/

This patch cleans up duplicate includes in
	drivers/w1/

Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Acked-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

drivers/w1/masters/matrox_w1.c

diff --git a/drivers/w1/masters/matrox_w1.c b/drivers/w1/masters/matrox_w1.c
index d356da5..1550431 100644
--- 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"