[coreboot-gerrit] Patch set updated for coreboot: ea31bd3 arch/armv7 devicetree: Drop unnecessary PCI headers

[Kyösti Mälkki (kyosti.malkki@gmail.com)]

Kyösti Mälkki (kyosti.malkki at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3622

-gerrit

commit ea31bd3b695629005422622b7afc658c558e1f9b
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date:   Sun Jul 7 12:51:19 2013 +0300

    arch/armv7 devicetree: Drop unnecessary PCI headers
    
    Including pci.h for arch/armv7 breaks builds and/or uses invalid
    arch/pci_ops.h.
    
    Change-Id: Ib78e7367be400c96ab0f8d6ec25dce241a768abd
    Signed-off-by: Kyösti Mälkki <kyosti.malkki at gmail.com>
---
 src/lib/hardwaremain.c | 1 -
 util/sconfig/main.c    | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/lib/hardwaremain.c b/src/lib/hardwaremain.c
index 56539cb..28dac5b 100644
--- a/src/lib/hardwaremain.c
+++ b/src/lib/hardwaremain.c
@@ -26,7 +26,6 @@
 #include <console/console.h>
 #include <version.h>
 #include <device/device.h>
-#include <device/pci.h>
 #include <delay.h>
 #include <stdlib.h>
 #include <reset.h>
diff --git a/util/sconfig/main.c b/util/sconfig/main.c
index 03ba1ef..4161c48 100644
--- a/util/sconfig/main.c
+++ b/util/sconfig/main.c
@@ -634,7 +634,7 @@ int main(int argc, char** argv) {
 	if (scan_mode == STATIC_MODE) {
 
 		fprintf(autogen, "#include <device/device.h>\n");
-		fprintf(autogen, "#include <device/pci.h>\n");
+		fprintf(autogen, "#if CONFIG_PCI\n#include <device/pci.h>\n#endif\n");
 		h = &headers;
 		while (h->next) {
 			h = h->next;