From 0a57e1db23218393483a356c07868413a45caeeb Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Wed, 6 Nov 2013 09:35:05 +0100
Subject: Reduce divergence from FreeBSD sources

---
 freebsd/sys/h8300/h8300/legacy.c | 2 --
 freebsd/sys/h8300/pci/pci_bus.c  | 8 --------
 2 files changed, 10 deletions(-)

(limited to 'freebsd/sys/h8300')

diff --git a/freebsd/sys/h8300/h8300/legacy.c b/freebsd/sys/h8300/h8300/legacy.c
index d2b0a78a..c81ccc5e 100644
--- a/freebsd/sys/h8300/h8300/legacy.c
+++ b/freebsd/sys/h8300/h8300/legacy.c
@@ -49,9 +49,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/rman.h>
 #include <sys/smp.h>
 
-#ifndef __rtems__
 #include <rtems/bsd/local/opt_mca.h>
-#endif /* __rtems__ */
 #ifdef DEV_MCA
 #include <i386/bios/mca_machdep.h>
 #endif
diff --git a/freebsd/sys/h8300/pci/pci_bus.c b/freebsd/sys/h8300/pci/pci_bus.c
index 53446262..ad0342ec 100644
--- a/freebsd/sys/h8300/pci/pci_bus.c
+++ b/freebsd/sys/h8300/pci/pci_bus.c
@@ -60,7 +60,6 @@ static int	pcibios_pcib_route_interrupt(device_t pcib, device_t dev,
 int	pcibios_pcib_route_interrupt(device_t pcib, device_t dev, int pin);
 #endif /* __rtems__ */
 
-
 int
 legacy_pcib_maxslots(device_t dev)
 {
@@ -69,15 +68,9 @@ legacy_pcib_maxslots(device_t dev)
 
 /* read configuration space register */
 
-#ifdef __rtems__
-uint32_t
-legacy_pcib_read_config(device_t dev, u_int bus, u_int slot, u_int func,
-			u_int reg, int bytes)
-#else
 u_int32_t
 legacy_pcib_read_config(device_t dev, u_int bus, u_int slot, u_int func,
 			u_int reg, int bytes)
-#endif
 {
 	return(pci_cfgregread(bus, slot, func, reg, bytes));
 }
@@ -514,7 +507,6 @@ legacy_pcib_attach(device_t dev)
 		if (pir != NULL)
 			device_probe_and_attach(pir);
 	}
-#else /* __rtems__ */
 #endif /* __rtems__ */
 	device_add_child(dev, "pci", bus);
 	return bus_generic_attach(dev);
-- 
cgit v1.2.3