summaryrefslogtreecommitdiffstats
path: root/arch/x86/include
diff options
context:
space:
mode:
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>2011-02-24 09:52:42 +0100
committerThomas Gleixner <tglx@linutronix.de>2011-02-24 13:01:59 +0100
commit4a66b1d95ad8baf6ab884a1c64461449b463eb78 (patch)
tree3ae4a1ceb22c69f787bc30f9fa1b9a45b8b29a56 /arch/x86/include
parent3bcbaf6e08d8d82cde781997bd2c56dda87049b5 (diff)
downloadlinux-4a66b1d95ad8baf6ab884a1c64461449b463eb78.tar.gz
linux-4a66b1d95ad8baf6ab884a1c64461449b463eb78.tar.bz2
linux-4a66b1d95ad8baf6ab884a1c64461449b463eb78.zip
x86: dt: Fix OLPC=y/INTEL_CE=n build
Both OLPC and CE4100 activate CONFIG_OF. OLPC uses PROMTREE while CE uses FLATTREE. Compiling for OLPC only breaks due to missing flat tree functions and variables. Use proper wrappers and provide an empty x86_flattree_get_config() inline so OF=y FLATTREE=n builds and works. [ tglx: Make it work with HPET_TIMER=n and make a function static ] Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/include')
-rw-r--r--arch/x86/include/asm/prom.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/include/asm/prom.h b/arch/x86/include/asm/prom.h
index ae50131ad766..f58361ba7357 100644
--- a/arch/x86/include/asm/prom.h
+++ b/arch/x86/include/asm/prom.h
@@ -30,7 +30,6 @@ extern void add_dtb(u64 data);
extern void x86_add_irq_domains(void);
void x86_dtb_find_config(void);
void x86_dtb_get_config(unsigned int unused);
-void add_interrupt_host(struct irq_domain *ih);
void __cpuinit x86_of_pci_init(void);
static inline struct device_node *pci_device_to_OF_node(struct pci_dev *pdev)