[rtems-libbsd commit] Update due to header guard changes

[Sebastian Huber]

Module:    rtems-libbsd
Branch:    master
Commit:    3cb5e9ef6dd3925fff544e164d8fb97e6590f38f
Changeset: http://git.rtems.org/rtems-libbsd/commit/?id=3cb5e9ef6dd3925fff544e164d8fb97e6590f38f

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Thu Jul 23 15:38:50 2015 +0200

Update due to header guard changes

---

 rtemsbsd/include/bsp/nexus-devices.h                 | 2 +-
 rtemsbsd/sys/dev/ffec/if_ffec_mcf548x.c              | 4 ++--
 testsuite/include/rtems/bsd/test/network-config.h.in | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/rtemsbsd/include/bsp/nexus-devices.h b/rtemsbsd/include/bsp/nexus-devices.h
index fcd8775..3b9a97c 100644
--- a/rtemsbsd/include/bsp/nexus-devices.h
+++ b/rtemsbsd/include/bsp/nexus-devices.h
@@ -52,7 +52,7 @@ static const rtems_bsd_device_resource smc0_res[] = {
 RTEMS_BSD_DEFINE_NEXUS_DEVICE(smc, 0, RTEMS_ARRAY_SIZE(smc0_res),
     &smc0_res[0]);
 
-#elif defined(__GENMCF548X_BSP_H)
+#elif defined(LIBBSP_M68K_GENMCF548X_BSP_H)
 
 RTEMS_BSD_DEFINE_NEXUS_DEVICE(fec, 0, 0, NULL);
 
diff --git a/rtemsbsd/sys/dev/ffec/if_ffec_mcf548x.c b/rtemsbsd/sys/dev/ffec/if_ffec_mcf548x.c
index 6aae3d2..67a62e1 100644
--- a/rtemsbsd/sys/dev/ffec/if_ffec_mcf548x.c
+++ b/rtemsbsd/sys/dev/ffec/if_ffec_mcf548x.c
@@ -39,7 +39,7 @@
 
 #include <bsp.h>
 
-#ifdef __GENMCF548X_BSP_H
+#ifdef LIBBSP_M68K_GENMCF548X_BSP_H
 
 #pragma GCC diagnostic ignored "-Wstrict-aliasing"
 #pragma GCC diagnostic ignored "-Wpointer-sign"
@@ -1575,4 +1575,4 @@ DRIVER_MODULE(fec, nexus, fec_nexus_driver, fec_devclass, 0, 0);
 MODULE_DEPEND(fec, nexus, 1, 1, 1);
 MODULE_DEPEND(fec, ether, 1, 1, 1);
 
-#endif /* __GENMCF548X_BSP_H */
+#endif /* LIBBSP_M68K_GENMCF548X_BSP_H */
diff --git a/testsuite/include/rtems/bsd/test/network-config.h.in b/testsuite/include/rtems/bsd/test/network-config.h.in
index 30a9c5a..c652e74 100644
--- a/testsuite/include/rtems/bsd/test/network-config.h.in
+++ b/testsuite/include/rtems/bsd/test/network-config.h.in
@@ -40,7 +40,7 @@
   #define NET_CFG_INTERFACE_0 "smc0"
 #elif defined(LIBBSP_ARM_XILINX_ZYNQ_BSP_H)
   #define NET_CFG_INTERFACE_0 "cgem0"
-#elif defined(__GENMCF548X_BSP_H)
+#elif defined(LIBBSP_M68K_GENMCF548X_BSP_H)
   #define NET_CFG_INTERFACE_0 "fec0"
 #else
   #define NET_CFG_INTERFACE_0 "lo0"