diff options
author | Lucas Woods <woodzy@gmail.com> | 2008-01-30 07:30:32 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:30:32 -0500 |
commit | 201c19948b879ed95ac986bc994af29d7cf4859f (patch) | |
tree | 3471fcedf78013b706a6572994b3215972ceefad | |
parent | 2d2ee8de5f6d26ef2942e0b449aa68d9236d5777 (diff) |
x86: remove duplicate includes
Signed-off-by: Lucas Woods <woodzy@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r-- | arch/x86/kernel/hpet.c | 1 | ||||
-rw-r--r-- | arch/x86/kernel/pci-calgary_64.c | 1 | ||||
-rw-r--r-- | arch/x86/vdso/vclock_gettime.c | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c index a3c56c9b8a02..5c1702789be4 100644 --- a/arch/x86/kernel/hpet.c +++ b/arch/x86/kernel/hpet.c | |||
@@ -6,7 +6,6 @@ | |||
6 | #include <linux/init.h> | 6 | #include <linux/init.h> |
7 | #include <linux/sysdev.h> | 7 | #include <linux/sysdev.h> |
8 | #include <linux/pm.h> | 8 | #include <linux/pm.h> |
9 | #include <linux/delay.h> | ||
10 | 9 | ||
11 | #include <asm/fixmap.h> | 10 | #include <asm/fixmap.h> |
12 | #include <asm/hpet.h> | 11 | #include <asm/hpet.h> |
diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c index 21d7e0f8610c..21f34db2c03c 100644 --- a/arch/x86/kernel/pci-calgary_64.c +++ b/arch/x86/kernel/pci-calgary_64.c | |||
@@ -30,7 +30,6 @@ | |||
30 | #include <linux/spinlock.h> | 30 | #include <linux/spinlock.h> |
31 | #include <linux/string.h> | 31 | #include <linux/string.h> |
32 | #include <linux/dma-mapping.h> | 32 | #include <linux/dma-mapping.h> |
33 | #include <linux/init.h> | ||
34 | #include <linux/bitops.h> | 33 | #include <linux/bitops.h> |
35 | #include <linux/pci_ids.h> | 34 | #include <linux/pci_ids.h> |
36 | #include <linux/pci.h> | 35 | #include <linux/pci.h> |
diff --git a/arch/x86/vdso/vclock_gettime.c b/arch/x86/vdso/vclock_gettime.c index 5b54cdfb2b07..23476c2ebfc4 100644 --- a/arch/x86/vdso/vclock_gettime.c +++ b/arch/x86/vdso/vclock_gettime.c | |||
@@ -19,7 +19,6 @@ | |||
19 | #include <asm/hpet.h> | 19 | #include <asm/hpet.h> |
20 | #include <asm/unistd.h> | 20 | #include <asm/unistd.h> |
21 | #include <asm/io.h> | 21 | #include <asm/io.h> |
22 | #include <asm/vgtod.h> | ||
23 | #include "vextern.h" | 22 | #include "vextern.h" |
24 | 23 | ||
25 | #define gtod vdso_vsyscall_gtod_data | 24 | #define gtod vdso_vsyscall_gtod_data |