summaryrefslogtreecommitdiff
path: root/include/asm-ppc/config.h
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-04-08 00:23:11 +0200
committerWolfgang Denk <wd@denx.de>2010-04-08 00:23:11 +0200
commit797131c12595b3d0e2964b706006938c822ee874 (patch)
tree30df95c60094be128b37c392f6c031f536027e47 /include/asm-ppc/config.h
parent92abce8731750e92d9b5adf2e506fdb50eff59bc (diff)
parent933419096e857275b8b01f1ae577162231b143ff (diff)
downloadu-boot-imx-797131c12595b3d0e2964b706006938c822ee874.zip
u-boot-imx-797131c12595b3d0e2964b706006938c822ee874.tar.gz
u-boot-imx-797131c12595b3d0e2964b706006938c822ee874.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'include/asm-ppc/config.h')
-rw-r--r--include/asm-ppc/config.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-ppc/config.h b/include/asm-ppc/config.h
index 0d78aa4..fc3facb 100644
--- a/include/asm-ppc/config.h
+++ b/include/asm-ppc/config.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2009 Freescale Semiconductor, Inc.
+ * Copyright 2009-2010 Freescale Semiconductor, Inc.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
@@ -41,6 +41,7 @@
#endif
#if defined(CONFIG_MPC8572) || defined(CONFIG_P1020) || \
+ defined(CONFIG_P1021) || defined(CONFIG_P1022) || \
defined(CONFIG_P2020) || defined(CONFIG_MPC8641)
#define CONFIG_MAX_CPUS 2
#elif defined(CONFIG_PPC_P4080)