diff options
author | Pavel Machek <pavel@suse.cz> | 2008-05-21 05:47:24 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2008-05-24 10:44:26 -0400 |
commit | 15d613cb25efd978dd55592d011a6ffc487b3432 (patch) | |
tree | 9a6e48043d1dccd5cab48298deb2ed505037dfcb /arch/x86/kernel | |
parent | 21fd5132b223a10bdf17713dd0bf321cbd6471d2 (diff) |
x86: i8259.c: remove #ifdefs around includes
Remove #ifdefs around includes; including too much should be always
safe.
Signed-off-by: Pavel Machek <pavel@suse.cz>
Cc: macro@ds2.pg.gda.pl
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r-- | arch/x86/kernel/i8259.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/arch/x86/kernel/i8259.c b/arch/x86/kernel/i8259.c index 2decba6b0101..8b7eb0cb2e7e 100644 --- a/arch/x86/kernel/i8259.c +++ b/arch/x86/kernel/i8259.c | |||
@@ -1,14 +1,10 @@ | |||
1 | #ifdef CONFIG_X86_64 | ||
2 | #include <linux/linkage.h> | 1 | #include <linux/linkage.h> |
3 | #endif /* CONFIG_X86_64 */ | ||
4 | #include <linux/errno.h> | 2 | #include <linux/errno.h> |
5 | #include <linux/signal.h> | 3 | #include <linux/signal.h> |
6 | #include <linux/sched.h> | 4 | #include <linux/sched.h> |
7 | #include <linux/ioport.h> | 5 | #include <linux/ioport.h> |
8 | #include <linux/interrupt.h> | 6 | #include <linux/interrupt.h> |
9 | #ifdef CONFIG_X86_64 | ||
10 | #include <linux/timex.h> | 7 | #include <linux/timex.h> |
11 | #endif /* CONFIG_X86_64 */ | ||
12 | #include <linux/slab.h> | 8 | #include <linux/slab.h> |
13 | #include <linux/random.h> | 9 | #include <linux/random.h> |
14 | #include <linux/init.h> | 10 | #include <linux/init.h> |
@@ -16,24 +12,17 @@ | |||
16 | #include <linux/sysdev.h> | 12 | #include <linux/sysdev.h> |
17 | #include <linux/bitops.h> | 13 | #include <linux/bitops.h> |
18 | 14 | ||
19 | #ifdef CONFIG_X86_64 | ||
20 | #include <asm/acpi.h> | 15 | #include <asm/acpi.h> |
21 | #endif /* CONFIG_X86_64 */ | ||
22 | #include <asm/atomic.h> | 16 | #include <asm/atomic.h> |
23 | #include <asm/system.h> | 17 | #include <asm/system.h> |
24 | #include <asm/io.h> | 18 | #include <asm/io.h> |
25 | #ifndef CONFIG_X86_64 | ||
26 | #include <asm/timer.h> | 19 | #include <asm/timer.h> |
27 | #else /* CONFIG_X86_64 */ | ||
28 | #include <asm/hw_irq.h> | 20 | #include <asm/hw_irq.h> |
29 | #endif /* CONFIG_X86_64 */ | ||
30 | #include <asm/pgtable.h> | 21 | #include <asm/pgtable.h> |
31 | #include <asm/delay.h> | 22 | #include <asm/delay.h> |
32 | #include <asm/desc.h> | 23 | #include <asm/desc.h> |
33 | #include <asm/apic.h> | 24 | #include <asm/apic.h> |
34 | #ifndef CONFIG_X86_64 | ||
35 | #include <asm/arch_hooks.h> | 25 | #include <asm/arch_hooks.h> |
36 | #endif /* ! CONFIG_X86_64 */ | ||
37 | #include <asm/i8259.h> | 26 | #include <asm/i8259.h> |
38 | 27 | ||
39 | /* | 28 | /* |