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 'fixes' of git://git.linux-nfs.org/pub/linux/nfs-2.6
[pandora-kernel.git]
/
include
/
asm-ppc
/
mpc8260.h
diff --git
a/include/asm-ppc/mpc8260.h
b/include/asm-ppc/mpc8260.h
index
3214526
..
23579d4
100644
(file)
--- a/
include/asm-ppc/mpc8260.h
+++ b/
include/asm-ppc/mpc8260.h
@@
-8,7
+8,6
@@
#ifndef __ASM_PPC_MPC8260_H__
#define __ASM_PPC_MPC8260_H__
-#include <linux/config.h>
#ifdef CONFIG_8260
@@
-83,6
+82,8
@@
enum ppc_sys_devices {
MPC82xx_CPM_SMC2,
MPC82xx_CPM_USB,
MPC82xx_SEC1,
+ MPC82xx_MDIO_BB,
+ NUM_PPC_SYS_DEVS,
};
#ifndef __ASSEMBLY__