aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/i8259.c
diff options
context:
space:
mode:
authorPavel Machek <pavel@suse.cz>2008-05-21 11:47:24 +0200
committerThomas Gleixner <tglx@linutronix.de>2008-05-24 16:44:26 +0200
commit15d613cb25efd978dd55592d011a6ffc487b3432 (patch)
tree9a6e48043d1dccd5cab48298deb2ed505037dfcb /arch/x86/kernel/i8259.c
parentx86: automatical unification of i8259.c (diff)
downloadlinux-dev-15d613cb25efd978dd55592d011a6ffc487b3432.tar.xz
linux-dev-15d613cb25efd978dd55592d011a6ffc487b3432.zip
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/i8259.c')
-rw-r--r--arch/x86/kernel/i8259.c11
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 @@
-#ifdef CONFIG_X86_64
#include <linux/linkage.h>
-#endif /* CONFIG_X86_64 */
#include <linux/errno.h>
#include <linux/signal.h>
#include <linux/sched.h>
#include <linux/ioport.h>
#include <linux/interrupt.h>
-#ifdef CONFIG_X86_64
#include <linux/timex.h>
-#endif /* CONFIG_X86_64 */
#include <linux/slab.h>
#include <linux/random.h>
#include <linux/init.h>
@@ -16,24 +12,17 @@
#include <linux/sysdev.h>
#include <linux/bitops.h>
-#ifdef CONFIG_X86_64
#include <asm/acpi.h>
-#endif /* CONFIG_X86_64 */
#include <asm/atomic.h>
#include <asm/system.h>
#include <asm/io.h>
-#ifndef CONFIG_X86_64
#include <asm/timer.h>
-#else /* CONFIG_X86_64 */
#include <asm/hw_irq.h>
-#endif /* CONFIG_X86_64 */
#include <asm/pgtable.h>
#include <asm/delay.h>
#include <asm/desc.h>
#include <asm/apic.h>
-#ifndef CONFIG_X86_64
#include <asm/arch_hooks.h>
-#endif /* ! CONFIG_X86_64 */
#include <asm/i8259.h>
/*