diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2008-01-30 07:30:29 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:30:29 -0500 |
commit | f20ebee41882d28c965166e56c1331fbd28778bb (patch) | |
tree | 8f9675a4e10da77b6a1a080142e7aa1551fd0c3c /arch/x86/kernel | |
parent | f0cd0af1b004f601f3cf96d9e001ffad9207f642 (diff) |
x86: move 8259 defines to i8259.h
Move the i8259 defines and remove the now io_ports.h
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r-- | arch/x86/kernel/apic_32.c | 2 | ||||
-rw-r--r-- | arch/x86/kernel/apm_32.c | 2 | ||||
-rw-r--r-- | arch/x86/kernel/i8259_32.c | 2 | ||||
-rw-r--r-- | arch/x86/kernel/io_apic_32.c | 2 | ||||
-rw-r--r-- | arch/x86/kernel/time_32.c | 1 | ||||
-rw-r--r-- | arch/x86/kernel/vmiclock_32.c | 1 |
6 files changed, 0 insertions, 10 deletions
diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c index 420c15842e44..56352c11a896 100644 --- a/arch/x86/kernel/apic_32.c +++ b/arch/x86/kernel/apic_32.c | |||
@@ -43,8 +43,6 @@ | |||
43 | #include <mach_apicdef.h> | 43 | #include <mach_apicdef.h> |
44 | #include <mach_ipi.h> | 44 | #include <mach_ipi.h> |
45 | 45 | ||
46 | #include "io_ports.h" | ||
47 | |||
48 | /* | 46 | /* |
49 | * Sanity check | 47 | * Sanity check |
50 | */ | 48 | */ |
diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c index af045ca0f653..7496c2e4b6ae 100644 --- a/arch/x86/kernel/apm_32.c +++ b/arch/x86/kernel/apm_32.c | |||
@@ -235,8 +235,6 @@ | |||
235 | #include <asm/paravirt.h> | 235 | #include <asm/paravirt.h> |
236 | #include <asm/reboot.h> | 236 | #include <asm/reboot.h> |
237 | 237 | ||
238 | #include "io_ports.h" | ||
239 | |||
240 | #if defined(CONFIG_APM_DISPLAY_BLANK) && defined(CONFIG_VT) | 238 | #if defined(CONFIG_APM_DISPLAY_BLANK) && defined(CONFIG_VT) |
241 | extern int (*console_blank_hook)(int); | 239 | extern int (*console_blank_hook)(int); |
242 | #endif | 240 | #endif |
diff --git a/arch/x86/kernel/i8259_32.c b/arch/x86/kernel/i8259_32.c index 5f3496d01984..3321ce669295 100644 --- a/arch/x86/kernel/i8259_32.c +++ b/arch/x86/kernel/i8259_32.c | |||
@@ -21,8 +21,6 @@ | |||
21 | #include <asm/arch_hooks.h> | 21 | #include <asm/arch_hooks.h> |
22 | #include <asm/i8259.h> | 22 | #include <asm/i8259.h> |
23 | 23 | ||
24 | #include <io_ports.h> | ||
25 | |||
26 | /* | 24 | /* |
27 | * This is the 'legacy' 8259A Programmable Interrupt Controller, | 25 | * This is the 'legacy' 8259A Programmable Interrupt Controller, |
28 | * present in the majority of PC/AT boxes. | 26 | * present in the majority of PC/AT boxes. |
diff --git a/arch/x86/kernel/io_apic_32.c b/arch/x86/kernel/io_apic_32.c index ab77f1905469..75bf8dc77650 100644 --- a/arch/x86/kernel/io_apic_32.c +++ b/arch/x86/kernel/io_apic_32.c | |||
@@ -48,8 +48,6 @@ | |||
48 | #include <mach_apic.h> | 48 | #include <mach_apic.h> |
49 | #include <mach_apicdef.h> | 49 | #include <mach_apicdef.h> |
50 | 50 | ||
51 | #include "io_ports.h" | ||
52 | |||
53 | int (*ioapic_renumber_irq)(int ioapic, int irq); | 51 | int (*ioapic_renumber_irq)(int ioapic, int irq); |
54 | atomic_t irq_mis_count; | 52 | atomic_t irq_mis_count; |
55 | 53 | ||
diff --git a/arch/x86/kernel/time_32.c b/arch/x86/kernel/time_32.c index e9ead762abe8..2dcbb81b4cd3 100644 --- a/arch/x86/kernel/time_32.c +++ b/arch/x86/kernel/time_32.c | |||
@@ -37,7 +37,6 @@ | |||
37 | #include <asm/hpet.h> | 37 | #include <asm/hpet.h> |
38 | #include <asm/time.h> | 38 | #include <asm/time.h> |
39 | 39 | ||
40 | #include "io_ports.h" | ||
41 | #include "do_timer.h" | 40 | #include "do_timer.h" |
42 | 41 | ||
43 | unsigned int cpu_khz; /* Detected as we calibrate the TSC */ | 42 | unsigned int cpu_khz; /* Detected as we calibrate the TSC */ |
diff --git a/arch/x86/kernel/vmiclock_32.c b/arch/x86/kernel/vmiclock_32.c index b1b5ab08b26e..57f9ef5a324c 100644 --- a/arch/x86/kernel/vmiclock_32.c +++ b/arch/x86/kernel/vmiclock_32.c | |||
@@ -35,7 +35,6 @@ | |||
35 | #include <asm/i8253.h> | 35 | #include <asm/i8253.h> |
36 | 36 | ||
37 | #include <irq_vectors.h> | 37 | #include <irq_vectors.h> |
38 | #include "io_ports.h" | ||
39 | 38 | ||
40 | #define VMI_ONESHOT (VMI_ALARM_IS_ONESHOT | VMI_CYCLES_REAL | vmi_get_alarm_wiring()) | 39 | #define VMI_ONESHOT (VMI_ALARM_IS_ONESHOT | VMI_CYCLES_REAL | vmi_get_alarm_wiring()) |
41 | #define VMI_PERIODIC (VMI_ALARM_IS_PERIODIC | VMI_CYCLES_REAL | vmi_get_alarm_wiring()) | 40 | #define VMI_PERIODIC (VMI_ALARM_IS_PERIODIC | VMI_CYCLES_REAL | vmi_get_alarm_wiring()) |