diff options
| author | Jesper Juhl <jesper.juhl@gmail.com> | 2007-10-17 02:26:22 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 11:42:48 -0400 |
| commit | de4f800b498e04aceadb96107cdee2bbe1f9464a (patch) | |
| tree | 1e42369a9b075bfed27aa8ed3dcab5035e2e81db /drivers | |
| parent | 3f1a4373e7863c320878322e68a45aa2b100b692 (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.c | 1 |
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 @@ | |||
| 33 | #include <linux/slab.h> | 33 | #include <linux/slab.h> |
| 34 | #include <linux/pci_ids.h> | 34 | #include <linux/pci_ids.h> |
| 35 | #include <linux/pci.h> | 35 | #include <linux/pci.h> |
| 36 | #include <linux/timer.h> | ||
| 37 | 36 | ||
| 38 | #include "../w1.h" | 37 | #include "../w1.h" |
| 39 | #include "../w1_int.h" | 38 | #include "../w1_int.h" |