git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux...
[pandora-kernel.git]
/
include
/
asm-ppc
/
ppc_sys.h
diff --git
a/include/asm-ppc/ppc_sys.h
b/include/asm-ppc/ppc_sys.h
index
de99e92
..
d2fee41
100644
(file)
--- a/
include/asm-ppc/ppc_sys.h
+++ b/
include/asm-ppc/ppc_sys.h
@@
-23,10
+23,6
@@
#if defined(CONFIG_8260)
#include <asm/mpc8260.h>
-#elif defined(CONFIG_83xx)
-#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)