diff options
author | Wolfgang Denk <wd@denx.de> | 2008-06-11 21:33:16 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2008-06-11 21:33:16 +0200 |
commit | 5ea67393b8b554b8165c38912d753a8df043020d (patch) | |
tree | 080077826cffcfebbaa0a950c663e7d165cf6b7d /include/configs/stxgp3.h | |
parent | 2395db48869e759c4422efa3d3c25161601aa17b (diff) | |
parent | ba04f7010958e88a8910f2a123fee53fdc72e013 (diff) |
Merge branch 'master' of git://www.denx.de/git/u-boot-mpc85xx
Conflicts:
include/asm-ppc/fsl_lbc.h
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'include/configs/stxgp3.h')
-rw-r--r-- | include/configs/stxgp3.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/configs/stxgp3.h b/include/configs/stxgp3.h index ec04a30bec9..6e8213d72a5 100644 --- a/include/configs/stxgp3.h +++ b/include/configs/stxgp3.h @@ -41,6 +41,7 @@ #define CONFIG_MPC85xx 1 /* MPC8540/MPC8560 */ #define CONFIG_CPM2 1 /* has CPM2 */ #define CONFIG_STXGP3 1 /* Silicon Tx GPPP board specific*/ +#define CONFIG_MPC8560 1 #undef CONFIG_PCI /* pci ethernet support */ #define CONFIG_TSEC_ENET /* tsec ethernet support*/ |