diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-04-18 13:34:30 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-04-18 13:34:30 +1000 |
| commit | 11a55f2274bf0d719e4dd05f4ac5e89a15740211 (patch) | |
| tree | 0886a988b43e280fe00e529155f8cd796e7edcc8 /arch/powerpc/sysdev/cpm_common.c | |
| parent | 858c52d15f186e055dc33a1872f5b45a66d42296 (diff) | |
| parent | 1a9ebc0cd2b3bb4450834e564722630fbc40611b (diff) | |
| download | talos-op-linux-11a55f2274bf0d719e4dd05f4ac5e89a15740211.tar.gz talos-op-linux-11a55f2274bf0d719e4dd05f4ac5e89a15740211.zip | |
Merge branch 'powerpc-next' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc
Diffstat (limited to 'arch/powerpc/sysdev/cpm_common.c')
| -rw-r--r-- | arch/powerpc/sysdev/cpm_common.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/powerpc/sysdev/cpm_common.c b/arch/powerpc/sysdev/cpm_common.c index 165981c87786..cb7df2dce44f 100644 --- a/arch/powerpc/sysdev/cpm_common.c +++ b/arch/powerpc/sysdev/cpm_common.c @@ -58,7 +58,6 @@ void __init udbg_init_cpm(void) } #endif -#ifdef CONFIG_PPC_CPM_NEW_BINDING static spinlock_t cpm_muram_lock; static rh_block_t cpm_boot_muram_rh_block[16]; static rh_info_t cpm_muram_info; @@ -199,5 +198,3 @@ dma_addr_t cpm_muram_dma(void __iomem *addr) return muram_pbase + ((u8 __iomem *)addr - muram_vbase); } EXPORT_SYMBOL(cpm_muram_dma); - -#endif /* CONFIG_PPC_CPM_NEW_BINDING */ |
