From 6c99250c3fb97ccaa03d4f0c158caffdc53ff995 Mon Sep 17 00:00:00 2001
From: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Date: Fri, 20 Jun 2014 21:19:06 +1000
Subject: [PATCH] device/pci_device.c: Sanitize headers

Change-Id: I6254f4ab767952cc8ff31bb462c7037b027442ba
Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-on: http://review.coreboot.org/6079
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
---
 src/device/pci_device.c | 30 ++++++++----------------------
 1 file changed, 8 insertions(+), 22 deletions(-)

diff --git a/src/device/pci_device.c b/src/device/pci_device.c
index f262586232..8351e9ca63 100644
--- a/src/device/pci_device.c
+++ b/src/device/pci_device.c
@@ -24,39 +24,25 @@
  * Copyright 1997 -- 1999 Martin Mares <mj@atrey.karlin.mff.cuni.cz>
  */
 
-#include <kconfig.h>
+#include <arch/acpi.h>
+#include <arch/io.h>
+#include <bootmode.h>
 #include <console/console.h>
 #include <stdlib.h>
 #include <stdint.h>
 #include <string.h>
-#include <arch/io.h>
-#include <arch/acpi.h>
+#include <delay.h>
+#include <device/agp.h>
+#include <device/cardbus.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include <bootmode.h>
-#include <delay.h>
-#if CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT
-#include <device/hypertransport.h>
-#endif
-#if CONFIG_PCIX_PLUGIN_SUPPORT
 #include <device/pcix.h>
-#endif
-#if CONFIG_PCIEXP_PLUGIN_SUPPORT
 #include <device/pciexp.h>
-#endif
-#if CONFIG_AGP_PLUGIN_SUPPORT
-#include <device/agp.h>
-#endif
-#if CONFIG_CARDBUS_PLUGIN_SUPPORT
-#include <device/cardbus.h>
-#endif
-#if CONFIG_PC80_SYSTEM
+#include <device/hypertransport.h>
 #include <pc80/i8259.h>
-#endif
-#if CONFIG_CHROMEOS
+#include <kconfig.h>
 #include <vendorcode/google/chromeos/chromeos.h>
-#endif
 
 u8 pci_moving_config8(struct device *dev, unsigned int reg)
 {