i8259.c: remove #ifdefs around includes

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Pavel Machek
Date: Wednesday, May 21, 2008 - 2:47 am

Remove #ifdefs around includes; including too much should be always
safe.

Signed-off-by: Pavel Machek <pavel@suse.cz>

---
commit 06f12eb6da33da70dbdccbee5a687d5353782e1d
tree 62b9b1a785bbc5a9daa22512ec95601d54aa004d
parent 44b4ec2247971ba1a1906752208182146fc5974c
author Pavel <pavel@amd.ucw.cz> Wed, 21 May 2008 11:46:46 +0200
committer Pavel <pavel@amd.ucw.cz> Wed, 21 May 2008 11:46:46 +0200

 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 2decba6..8b7eb0c 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/kernel_stat.h>
 #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>
 
 /*

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
Unify common parts of i8259.c, Pavel Machek, (Tue May 20, 8:15 am)
Re: Unify common parts of i8259.c, Ingo Molnar, (Tue May 20, 1:47 pm)
Re: Unify common parts of i8259.c, Pavel Machek, (Tue May 20, 3:35 pm)
Automatical unification of i8259.c, Pavel Machek, (Wed May 21, 2:44 am)
i8259.c: remove #ifdefs around includes, Pavel Machek, (Wed May 21, 2:47 am)
i8259.c: remove trivial ifdefs, Pavel Machek, (Wed May 21, 2:52 am)
i8259: cleanup codingstyle, Pavel Machek, (Wed May 21, 2:57 am)
Re: Automatical unification of i8259.c, Thomas Gleixner, (Thu May 22, 11:30 am)
Re: Automatical unification of i8259.c, Pavel Machek, (Thu May 22, 1:19 pm)
Re: Automatical unification of i8259.c, Sam Ravnborg, (Thu May 22, 1:30 pm)
i8259: fix final uglyness, Pavel Machek, (Thu May 22, 3:32 pm)
Re: i8259: fix final uglyness, Thomas Gleixner, (Tue May 27, 1:46 am)
Re: i8259: fix final uglyness, Pavel Machek, (Tue May 27, 1:55 am)
Re: i8259: fix final uglyness, Thomas Gleixner, (Tue May 27, 2:01 am)
Re: i8259: fix final uglyness, Pavel Machek, (Wed May 28, 3:42 am)
Re: i8259: fix final uglyness, Ingo Molnar, (Mon Jun 2, 2:43 am)