git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
include
/
asm-ppc
/
mpc8xx.h
diff --git
a/include/asm-ppc/mpc8xx.h
b/include/asm-ppc/mpc8xx.h
index
3515a7f
..
d3a2f2f
100644
(file)
--- a/
include/asm-ppc/mpc8xx.h
+++ b/
include/asm-ppc/mpc8xx.h
@@
-8,7
+8,6
@@
#ifndef __CONFIG_8xx_DEFS
#define __CONFIG_8xx_DEFS
#ifndef __CONFIG_8xx_DEFS
#define __CONFIG_8xx_DEFS
-#include <linux/config.h>
#ifdef CONFIG_8xx
#ifdef CONFIG_8xx
@@
-111,6
+110,7
@@
enum ppc_sys_devices {
MPC8xx_CPM_SMC1,
MPC8xx_CPM_SMC2,
MPC8xx_CPM_USB,
MPC8xx_CPM_SMC1,
MPC8xx_CPM_SMC2,
MPC8xx_CPM_USB,
+ MPC8xx_MDIO_FEC,
NUM_PPC_SYS_DEVS,
};
NUM_PPC_SYS_DEVS,
};