summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorJesper Juhl <jesper.juhl@gmail.com>2007-10-16 23:26:22 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-17 08:42:48 -0700
commitde4f800b498e04aceadb96107cdee2bbe1f9464a (patch)
tree1e42369a9b075bfed27aa8ed3dcab5035e2e81db /drivers
parent3f1a4373e7863c320878322e68a45aa2b100b692 (diff)
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/w1/masters/matrox_w1.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/w1/masters/matrox_w1.c b/drivers/w1/masters/matrox_w1.c
index d356da5709fc..1550431ccb6a 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"