diff options
| author | Kumar Gala <[email protected]> | 2006-03-20 10:42:05 -0600 |
|---|---|---|
| committer | Kumar Gala <[email protected]> | 2006-03-20 10:42:05 -0600 |
| commit | f8edca2e9a128f526b1fe6f997f7adb852cf5b3c (patch) | |
| tree | 92deb9ddf1153c64ff1ced9392816e60b4ecaa03 /include/common.h | |
| parent | 79582020313e6d992a3bac71cf3a9b337f9ac7f7 (diff) | |
| parent | 7b4fd36b0322ec98836a8459d9be80e2777fdc05 (diff) | |
Merge branch 'origin'
Conflicts:
CHANGELOG
Diffstat (limited to 'include/common.h')
| -rw-r--r-- | include/common.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/common.h b/include/common.h index d2570a803ea..5d8b15628b5 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); |