diff options
| author |   Kumar Gala <galak@kernel.crashing.org> | 2008-08-02 02:44:11 +1000 |
|---|---|---|
| committer |   Paul Mackerras <paulus@samba.org> | 2008-08-04 13:18:17 +1000 |
| commit | 9c4cb82515130c62224e23fdf7c13c8f6c59c614 (patch) | |
| tree | f916fd843972502d918a1a03bdb99c9c2bbaa91c /arch/powerpc/include/asm/ipic.h | |
| parent | powerpc: Force printing of 'total_memory' to unsigned long long (diff) | |
| download | linux-dev-9c4cb82515130c62224e23fdf7c13c8f6c59c614.tar.xz linux-dev-9c4cb82515130c62224e23fdf7c13c8f6c59c614.zip | |
powerpc: Remove use of CONFIG_PPC_MERGE
Now that arch/ppc is gone and CONFIG_PPC_MERGE is always set, remove
the dead code associated with !CONFIG_PPC_MERGE from arch/powerpc
and include/asm-powerpc.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/include/asm/ipic.h')
| -rw-r--r-- | arch/powerpc/include/asm/ipic.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/powerpc/include/asm/ipic.h b/arch/powerpc/include/asm/ipic.h index 4cf35531c0ef..fb59829983b8 100644 --- a/arch/powerpc/include/asm/ipic.h +++ b/arch/powerpc/include/asm/ipic.h @@ -77,15 +77,8 @@ extern void ipic_disable_mcp(enum ipic_mcp_irq mcp_irq); extern u32 ipic_get_mcp_status(void); extern void ipic_clear_mcp_status(u32 mask); -#ifdef CONFIG_PPC_MERGE extern struct ipic * ipic_init(struct device_node *node, unsigned int flags); extern unsigned int ipic_get_irq(void); -#else -extern void ipic_init(phys_addr_t phys_addr, unsigned int flags, - unsigned int irq_offset, - unsigned char *senses, unsigned int senses_count); -extern int ipic_get_irq(void); -#endif #endif /* __ASM_IPIC_H__ */ #endif /* __KERNEL__ */ |