diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-10-12 09:06:32 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-10-12 09:06:32 +1000 |
| commit | 8087ebd5a121ac6bf5a8eba2459c01d3659c3e31 (patch) | |
| tree | 31394658c138dcb130a229af03e3beefca8db642 /include | |
| parent | 895532a166010d8d8b4d58d63d21012eced22492 (diff) | |
| parent | 4d9e55103aec1ba7d0617cfd88412ec39e1e2d32 (diff) | |
| download | linux-stable-8087ebd5a121ac6bf5a8eba2459c01d3659c3e31.tar.gz linux-stable-8087ebd5a121ac6bf5a8eba2459c01d3659c3e31.tar.bz2 linux-stable-8087ebd5a121ac6bf5a8eba2459c01d3659c3e31.zip | |
Merge branch 'for-2.6.24' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into for-2.6.24
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-powerpc/cpm2.h | 4 | ||||
| -rw-r--r-- | include/asm-powerpc/fs_pd.h | 2 | ||||
| -rw-r--r-- | include/asm-powerpc/mpc85xx.h | 45 |
3 files changed, 4 insertions, 47 deletions
diff --git a/include/asm-powerpc/cpm2.h b/include/asm-powerpc/cpm2.h index e698b1d09dcf..f1112c15ef96 100644 --- a/include/asm-powerpc/cpm2.h +++ b/include/asm-powerpc/cpm2.h @@ -13,6 +13,10 @@ #include <asm/immap_cpm2.h> #include <asm/cpm.h> +#ifdef CONFIG_PPC_85xx +#define CPM_MAP_ADDR (get_immrbase() + 0x80000) +#endif + /* CPM Command register. */ #define CPM_CR_RST ((uint)0x80000000) diff --git a/include/asm-powerpc/fs_pd.h b/include/asm-powerpc/fs_pd.h index 64706a0532d3..9361cd5342cc 100644 --- a/include/asm-powerpc/fs_pd.h +++ b/include/asm-powerpc/fs_pd.h @@ -19,8 +19,6 @@ #if defined(CONFIG_8260) #include <asm/mpc8260.h> -#elif defined(CONFIG_85xx) -#include <asm/mpc85xx.h> #endif #define cpm2_map(member) (&cpm2_immr->member) diff --git a/include/asm-powerpc/mpc85xx.h b/include/asm-powerpc/mpc85xx.h deleted file mode 100644 index 54142997a584..000000000000 --- a/include/asm-powerpc/mpc85xx.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * include/asm-powerpc/mpc85xx.h - * - * MPC85xx definitions - * - * Maintainer: Kumar Gala <galak@kernel.crashing.org> - * - * Copyright 2004 Freescale Semiconductor, Inc - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - */ - -#ifdef __KERNEL__ -#ifndef __ASM_MPC85xx_H__ -#define __ASM_MPC85xx_H__ - -#include <asm/mmu.h> - -#ifdef CONFIG_85xx - -#if defined(CONFIG_MPC8540_ADS) || defined(CONFIG_MPC8560_ADS) -#include <platforms/85xx/mpc85xx_ads.h> -#endif -#if defined(CONFIG_MPC8555_CDS) || defined(CONFIG_MPC8548_CDS) -#include <platforms/85xx/mpc8555_cds.h> -#endif -#ifdef CONFIG_MPC85xx_CDS -#include <platforms/85xx/mpc85xx_cds.h> -#endif - -/* Let modules/drivers get at CCSRBAR */ -extern phys_addr_t get_ccsrbar(void); - -#ifdef MODULE -#define CCSRBAR get_ccsrbar() -#else -#define CCSRBAR BOARD_CCSRBAR -#endif - -#endif /* CONFIG_85xx */ -#endif /* __ASM_MPC85xx_H__ */ -#endif /* __KERNEL__ */ |