projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/home/rmk/linux-2.6-arm
[powerpc.git]
/
include
/
asm-ppc
/
ppc_sys.h
diff --git
a/include/asm-ppc/ppc_sys.h
b/include/asm-ppc/ppc_sys.h
index
048f7c8
..
bba5305
100644
(file)
--- a/
include/asm-ppc/ppc_sys.h
+++ b/
include/asm-ppc/ppc_sys.h
@@
-18,7
+18,7
@@
#define __ASM_PPC_SYS_H
#include <linux/init.h>
#define __ASM_PPC_SYS_H
#include <linux/init.h>
-#include <linux/device.h>
+#include <linux/
platform_
device.h>
#include <linux/types.h>
#if defined(CONFIG_8260)
#include <linux/types.h>
#if defined(CONFIG_8260)
@@
-27,6
+27,8
@@
#include <asm/mpc83xx.h>
#elif defined(CONFIG_85xx)
#include <asm/mpc85xx.h>
#include <asm/mpc83xx.h>
#elif defined(CONFIG_85xx)
#include <asm/mpc85xx.h>
+#elif defined(CONFIG_8xx)
+#include <asm/mpc8xx.h>
#elif defined(CONFIG_PPC_MPC52xx)
#include <asm/mpc52xx.h>
#elif defined(CONFIG_MPC10X_BRIDGE)
#elif defined(CONFIG_PPC_MPC52xx)
#include <asm/mpc52xx.h>
#elif defined(CONFIG_MPC10X_BRIDGE)