summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCorey Osgood <corey.osgood@gmail.com>2008-12-20 21:07:20 +0000
committerCorey Osgood <corey.osgood@gmail.com>2008-12-20 21:07:20 +0000
commitda416f89861a681e151d48726bbf0e6699b7ebff (patch)
treed47fceacc9a655f3f085e690631a398ca1f24bf8
parenteb390abb4e5a9476cf0b8b0c8f9a4a0119a265eb (diff)
Fix dell/s1850 broken in r3822, and prepare it for implicit declaration
error patch. Signed-off-by: Corey Osgood <corey.osgood@gmail.com> Acked-by: Corey Osgood <corey.osgood@gmail.com> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3828 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
-rw-r--r--src/mainboard/dell/s1850/reset.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mainboard/dell/s1850/reset.c b/src/mainboard/dell/s1850/reset.c
index cf9e3d8d69..28a019a7d9 100644
--- a/src/mainboard/dell/s1850/reset.c
+++ b/src/mainboard/dell/s1850/reset.c
@@ -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 @@ static inline device_t pci_locate_device(unsigned pci_id, device_t from)
{
return dev_find_device(pci_id >> 16, pci_id & 0xffff, from);
}
+#else
+#include <arch/romcc_io.h>
#endif
void soft_reset(void)