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/dcr.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/dcr.h')
| -rw-r--r-- | arch/powerpc/include/asm/dcr.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/powerpc/include/asm/dcr.h b/arch/powerpc/include/asm/dcr.h index 53b283050ab3..d13fb68bb5c0 100644 --- a/arch/powerpc/include/asm/dcr.h +++ b/arch/powerpc/include/asm/dcr.h @@ -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__ */ |