From: Jesper Juhl <jesper.juhl@gmail.com>

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>
---

 drivers/w1/masters/matrox_w1.c |    1 -
 1 files changed, 1 deletion(-)

diff -puN drivers/w1/masters/matrox_w1.c~clean-up-duplicate-includes-in-drivers-w1 drivers/w1/masters/matrox_w1.c
--- a/drivers/w1/masters/matrox_w1.c~clean-up-duplicate-includes-in-drivers-w1
+++ a/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"
_