[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>
This commit is contained in:
parent
4297c9869b
commit
a2c70211fa
5 changed files with 4 additions and 2 deletions
|
@ -44,6 +44,7 @@
|
|||
#include <asm/btext.h>
|
||||
#include <asm/div64.h>
|
||||
#include <asm/signal.h>
|
||||
#include <asm/dcr.h>
|
||||
|
||||
#ifdef CONFIG_8xx
|
||||
#include <asm/commproc.h>
|
||||
|
|
|
@ -43,6 +43,7 @@
|
|||
#include <asm/div64.h>
|
||||
#include <asm/xmon.h>
|
||||
#include <asm/signal.h>
|
||||
#include <asm/dcr.h>
|
||||
|
||||
#ifdef CONFIG_8xx
|
||||
#include <asm/commproc.h>
|
||||
|
|
|
@ -33,6 +33,7 @@
|
|||
* 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,
|
||||
|
|
|
@ -15,6 +15,7 @@
|
|||
#define __ASM_IBM4XX_H__
|
||||
|
||||
#include <asm/types.h>
|
||||
#include <asm/dcr.h>
|
||||
|
||||
#ifdef CONFIG_40x
|
||||
|
||||
|
|
|
@ -9,8 +9,6 @@
|
|||
#ifndef __ASM_PPC_REG_BOOKE_H__
|
||||
#define __ASM_PPC_REG_BOOKE_H__
|
||||
|
||||
#include <asm/dcr.h>
|
||||
|
||||
#ifndef __ASSEMBLY__
|
||||
/* Performance Monitor Registers */
|
||||
#define mfpmr(rn) ({unsigned int rval; \
|
||||
|
|
Loading…
Reference in a new issue