r3828 - trunk/coreboot-v2/src/mainboard/dell/s1850

Author: cozzie
Date: 2008-12-20 22:07:20 +0100 (Sat, 20 Dec 2008)
New Revision: 3828

Modified:
   trunk/coreboot-v2/src/mainboard/dell/s1850/reset.c
Log:
Fix dell/s1850 broken in r3822, and prepare it for implicit declaration 
error patch.

Signed-off-by: Corey Osgood 
Acked-by: Corey Osgood

Modified: trunk/coreboot-v2/src/mainboard/dell/s1850/reset.c
===================================================================
--- trunk/coreboot-v2/src/mainboard/dell/s1850/reset.c	2008-12-20 19:35:54 UTC (rev 3827)
+++ trunk/coreboot-v2/src/mainboard/dell/s1850/reset.c	2008-12-20 21:07:20 UTC (rev 3828)
@@ -1,9 +1,9 @@
 #include <arch/io.h>
-#include <device/pci.h>
+
 #include <device/pci_def.h>
 #include <device/pci_ids.h>
 #ifndef __ROMCC__
-#include <device/device.h>
+#include <device/pci.h>
 #define PCI_ID(VENDOR_ID, DEVICE_ID) \
    ((((DEVICE_ID) & 0xFFFF) << 16) | ((VENDOR_ID) & 0xFFFF))
 #define PCI_DEV_INVALID 0
@@ -12,6 +12,8 @@
 {
    return dev_find_device(pci_id >> 16, pci_id & 0xffff, from);
 }
+#else
+#include <arch/romcc_io.h>
 #endif

void soft_reset(void)