From: Jesper Juhl <jesper.juhl@gmail.com>
Date: Wed, 17 Oct 2007 06:26:22 +0000 (-0700)
Subject: Clean up duplicate includes in drivers/w1/
X-Git-Tag: Ubuntu-goldfish-3.4.0-4.27~22828
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=de4f800b498e04aceadb96107cdee2bbe1f9464a;p=mirror_ubuntu-zesty-kernel.git

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

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"