summaryrefslogtreecommitdiff
path: root/include/common.h
diff options
context:
space:
mode:
authorMarkus Klotzbuecher <mk@denx.de>2006-03-24 15:43:16 +0100
committerMarkus Klotzbücher <mk@pollux.denx.de>2006-03-24 15:43:16 +0100
commit2770bcb21c82835a5351176e5b2a9221d7fc8ef9 (patch)
tree78edf9afc584e1a76d219bd64d260224a84f0d10 /include/common.h
parent0b953ffc653fc5ab3d3fa47abf0dd9b8bd0703f5 (diff)
parent05d8dce9d07cf4073ea15fbc448c1ce22b6baf0f (diff)
downloadu-boot-imx-2770bcb21c82835a5351176e5b2a9221d7fc8ef9.zip
u-boot-imx-2770bcb21c82835a5351176e5b2a9221d7fc8ef9.tar.gz
u-boot-imx-2770bcb21c82835a5351176e5b2a9221d7fc8ef9.tar.bz2
Merge with http://www.denx.de/git/u-boot.git
Diffstat (limited to 'include/common.h')
-rw-r--r--include/common.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/common.h b/include/common.h
index d2570a8..5d8b156 100644
--- a/include/common.h
+++ b/include/common.h
@@ -365,7 +365,8 @@ void trap_init (ulong);
defined (CONFIG_75x) || \
defined (CONFIG_74xx) || \
defined (CONFIG_MPC8220) || \
- defined(CONFIG_MPC85xx)
+ defined (CONFIG_MPC85xx) || \
+ defined (CONFIG_MPC83XX)
unsigned char in8(unsigned int);
void out8(unsigned int, unsigned char);
unsigned short in16(unsigned int);