aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/include/asm')
-rw-r--r--arch/x86/include/asm/apic.h2
-rw-r--r--arch/x86/include/asm/prom.h6
2 files changed, 3 insertions, 5 deletions
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index 3c896946f4c..4afe512120a 100644
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -240,7 +240,7 @@ extern void setup_boot_APIC_clock(void);
240extern void setup_secondary_APIC_clock(void); 240extern void setup_secondary_APIC_clock(void);
241extern int APIC_init_uniprocessor(void); 241extern int APIC_init_uniprocessor(void);
242extern void enable_NMI_through_LVT0(void); 242extern void enable_NMI_through_LVT0(void);
243extern int apic_force_enable(void); 243extern int apic_force_enable(unsigned long addr);
244 244
245/* 245/*
246 * On 32bit this is mach-xxx local 246 * On 32bit this is mach-xxx local
diff --git a/arch/x86/include/asm/prom.h b/arch/x86/include/asm/prom.h
index f58361ba735..971e0b46446 100644
--- a/arch/x86/include/asm/prom.h
+++ b/arch/x86/include/asm/prom.h
@@ -28,9 +28,8 @@ extern int of_ioapic;
28extern u64 initial_dtb; 28extern u64 initial_dtb;
29extern void add_dtb(u64 data); 29extern void add_dtb(u64 data);
30extern void x86_add_irq_domains(void); 30extern void x86_add_irq_domains(void);
31void x86_dtb_find_config(void);
32void x86_dtb_get_config(unsigned int unused);
33void __cpuinit x86_of_pci_init(void); 31void __cpuinit x86_of_pci_init(void);
32void x86_dtb_init(void);
34 33
35static inline struct device_node *pci_device_to_OF_node(struct pci_dev *pdev) 34static inline struct device_node *pci_device_to_OF_node(struct pci_dev *pdev)
36{ 35{
@@ -46,8 +45,7 @@ static inline struct device_node *pci_bus_to_OF_node(struct pci_bus *bus)
46static inline void add_dtb(u64 data) { } 45static inline void add_dtb(u64 data) { }
47static inline void x86_add_irq_domains(void) { } 46static inline void x86_add_irq_domains(void) { }
48static inline void x86_of_pci_init(void) { } 47static inline void x86_of_pci_init(void) { }
49#define x86_dtb_find_config x86_init_noop 48static inline void x86_dtb_init(void) { }
50#define x86_dtb_get_config x86_init_uint_noop
51#define of_ioapic 0 49#define of_ioapic 0
52#endif 50#endif
53 51