summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/prom.h
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2011-12-16 23:50:17 +0100
committerGrant Likely <grant.likely@secretlab.ca>2012-02-23 22:37:47 +0100
commitb4e518547da042fdc65bd4bdafd046fed13337d5 (patch)
tree822699cd36da40399119d11b4820513af2eb22a7 /arch/x86/include/asm/prom.h
parentppc-6xx: fix build failure in flipper-pic.c and hlwd-pic.c (diff)
downloadlinux-b4e518547da042fdc65bd4bdafd046fed13337d5.tar.xz
linux-b4e518547da042fdc65bd4bdafd046fed13337d5.zip
irq_domain/x86: Convert x86 (embedded) to use common irq_domain
This patch removes the x86-specific definition of irq_domain and replaces it with the common implementation. Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Acked-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Cc: Rob Herring <rob.herring@calxeda.com> Cc: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/include/asm/prom.h')
-rw-r--r--arch/x86/include/asm/prom.h10
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/x86/include/asm/prom.h b/arch/x86/include/asm/prom.h
index 644dd885f05a..60bef663609a 100644
--- a/arch/x86/include/asm/prom.h
+++ b/arch/x86/include/asm/prom.h
@@ -21,7 +21,6 @@
#include <asm/irq.h>
#include <linux/atomic.h>
#include <asm/setup.h>
-#include <asm/irq_controller.h>
#ifdef CONFIG_OF
extern int of_ioapic;
@@ -43,15 +42,6 @@ extern char cmd_line[COMMAND_LINE_SIZE];
#define pci_address_to_pio pci_address_to_pio
unsigned long pci_address_to_pio(phys_addr_t addr);
-/**
- * irq_dispose_mapping - Unmap an interrupt
- * @virq: linux virq number of the interrupt to unmap
- *
- * FIXME: We really should implement proper virq handling like power,
- * but that's going to be major surgery.
- */
-static inline void irq_dispose_mapping(unsigned int virq) { }
-
#define HAVE_ARCH_DEVTREE_FIXUPS
#endif /* __ASSEMBLY__ */