lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

powerpc: Remove use of CONFIG_PPC_MERGE

Browse Source 
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>
This commit is contained in:
Kumar Gala
2008-08-02 02:44:11 +10:00
committed by Paul Mackerras
parent c7c8eede27
commit 9c4cb82515
15 changed files with 6 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/powerpc/include/asm/dcr.h
View File

@@ -65,17 +65,13 @@ typedef dcr_host_mmio_t dcr_host_t;
#endif /* defined(CONFIG_PPC_DCR_NATIVE) && defined(CONFIG_PPC_DCR_MMIO) */
/*
* On CONFIG_PPC_MERGE, we have additional helpers to read the DCR
* base from the device-tree
* additional helpers to read the DCR * base from the device-tree
*/
#ifdef CONFIG_PPC_MERGE
struct device_node;
extern unsigned int dcr_resource_start(struct device_node *np,
unsigned int index);
extern unsigned int dcr_resource_len(struct device_node *np,
unsigned int index);
#endif /* CONFIG_PPC_MERGE */
#endif /* CONFIG_PPC_DCR */
#endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */