diff options
| author | David Gibson <david@gibson.dropbear.id.au> | 2007-02-05 19:48:28 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-02-06 22:03:23 -0500 |
| commit | a2c70211fa072f4076f0e59f909b69105f69072e (patch) | |
| tree | 7e676b3bdb44a2e30a9891b7dd19923c1624f47c /include/asm-ppc | |
| parent | 4297c9869b3452860f1a2c588d43f9e62c701019 (diff) | |
[POWERPC] Compile fixes for arch/powerpc dcr code
The new dcr code does not currently compile when configured for native
DCR access on ARCH=powerpc. This patch fixes the problems.
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-ppc')
| -rw-r--r-- | include/asm-ppc/ibm4xx.h | 1 | ||||
| -rw-r--r-- | include/asm-ppc/reg_booke.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/include/asm-ppc/ibm4xx.h b/include/asm-ppc/ibm4xx.h index 499c14691c71..7a64ede53bb6 100644 --- a/include/asm-ppc/ibm4xx.h +++ b/include/asm-ppc/ibm4xx.h | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #define __ASM_IBM4XX_H__ | 15 | #define __ASM_IBM4XX_H__ |
| 16 | 16 | ||
| 17 | #include <asm/types.h> | 17 | #include <asm/types.h> |
| 18 | #include <asm/dcr.h> | ||
| 18 | 19 | ||
| 19 | #ifdef CONFIG_40x | 20 | #ifdef CONFIG_40x |
| 20 | 21 | ||
diff --git a/include/asm-ppc/reg_booke.h b/include/asm-ppc/reg_booke.h index a263fc1e65c4..82948ed2744a 100644 --- a/include/asm-ppc/reg_booke.h +++ b/include/asm-ppc/reg_booke.h | |||
| @@ -9,8 +9,6 @@ | |||
| 9 | #ifndef __ASM_PPC_REG_BOOKE_H__ | 9 | #ifndef __ASM_PPC_REG_BOOKE_H__ |
| 10 | #define __ASM_PPC_REG_BOOKE_H__ | 10 | #define __ASM_PPC_REG_BOOKE_H__ |
| 11 | 11 | ||
| 12 | #include <asm/dcr.h> | ||
| 13 | |||
| 14 | #ifndef __ASSEMBLY__ | 12 | #ifndef __ASSEMBLY__ |
| 15 | /* Performance Monitor Registers */ | 13 | /* Performance Monitor Registers */ |
| 16 | #define mfpmr(rn) ({unsigned int rval; \ | 14 | #define mfpmr(rn) ({unsigned int rval; \ |