diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2009-08-20 06:45:33 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2009-08-27 11:12:52 -0400 |
commit | 52fdb5684660f9fd7129f7bbbe279a02893bacb8 (patch) | |
tree | c1b8e93f0ead1708f3634be1dd53b4675ee271cc /arch/x86/include/asm | |
parent | 72302142e165313ee58af81bd76708c12b58d7ab (diff) |
x86: Move mpc_oem_pci_bus to x86_init_ops
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/include/asm')
-rw-r--r-- | arch/x86/include/asm/setup.h | 1 | ||||
-rw-r--r-- | arch/x86/include/asm/x86_init.h | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h index adb5d44d9909..fd2267baba1d 100644 --- a/arch/x86/include/asm/setup.h +++ b/arch/x86/include/asm/setup.h | |||
@@ -24,7 +24,6 @@ struct x86_quirks { | |||
24 | int (*mach_find_smp_config)(unsigned int reserve); | 24 | int (*mach_find_smp_config)(unsigned int reserve); |
25 | 25 | ||
26 | void (*mpc_oem_bus_info)(struct mpc_bus *m, char *name); | 26 | void (*mpc_oem_bus_info)(struct mpc_bus *m, char *name); |
27 | void (*mpc_oem_pci_bus)(struct mpc_bus *m); | ||
28 | }; | 27 | }; |
29 | 28 | ||
30 | extern void x86_quirk_intr_init(void); | 29 | extern void x86_quirk_intr_init(void); |
diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h index fc0eef2f5fdc..404e2d2b06d3 100644 --- a/arch/x86/include/asm/x86_init.h +++ b/arch/x86/include/asm/x86_init.h | |||
@@ -1,6 +1,7 @@ | |||
1 | #ifndef _ASM_X86_PLATFORM_H | 1 | #ifndef _ASM_X86_PLATFORM_H |
2 | #define _ASM_X86_PLATFORM_H | 2 | #define _ASM_X86_PLATFORM_H |
3 | 3 | ||
4 | struct mpc_bus; | ||
4 | struct mpc_cpu; | 5 | struct mpc_cpu; |
5 | struct mpc_table; | 6 | struct mpc_table; |
6 | 7 | ||
@@ -10,12 +11,14 @@ struct mpc_table; | |||
10 | * @setup_ioapic_ids: platform specific ioapic id override | 11 | * @setup_ioapic_ids: platform specific ioapic id override |
11 | * @mpc_apic_id: platform specific mpc apic id assignment | 12 | * @mpc_apic_id: platform specific mpc apic id assignment |
12 | * @smp_read_mpc_oem: platform specific oem mpc table setup | 13 | * @smp_read_mpc_oem: platform specific oem mpc table setup |
14 | * @mpc_oem_pci_bus: platform specific pci bus setup (default NULL) | ||
13 | */ | 15 | */ |
14 | struct x86_init_mpparse { | 16 | struct x86_init_mpparse { |
15 | void (*mpc_record)(unsigned int mode); | 17 | void (*mpc_record)(unsigned int mode); |
16 | void (*setup_ioapic_ids)(void); | 18 | void (*setup_ioapic_ids)(void); |
17 | int (*mpc_apic_id)(struct mpc_cpu *m); | 19 | int (*mpc_apic_id)(struct mpc_cpu *m); |
18 | void (*smp_read_mpc_oem)(struct mpc_table *mpc); | 20 | void (*smp_read_mpc_oem)(struct mpc_table *mpc); |
21 | void (*mpc_oem_pci_bus)(struct mpc_bus *m); | ||
19 | }; | 22 | }; |
20 | 23 | ||
21 | /** | 24 | /** |