projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.denx.de/u-boot-arm
[platform/kernel/u-boot.git]
/
include
/
configs
/
mpc5121ads.h
diff --git
a/include/configs/mpc5121ads.h
b/include/configs/mpc5121ads.h
index
6e6af62
..
6f003aa
100644
(file)
--- a/
include/configs/mpc5121ads.h
+++ b/
include/configs/mpc5121ads.h
@@
-336,6
+336,7
@@
* PCI
*/
#ifdef CONFIG_PCI
+#define CONFIG_PCI_INDIRECT_BRIDGE
/*
* General PCI
@@
-370,7
+371,7
@@
/*
* IIM - IC Identification Module
*/
-#undef CONFIG_IIM
+#undef CONFIG_
FSL_
IIM
/*
* EEPROM configuration