---
.../lib/libbsp/sparc/leon2/startup/bsppredriver.c | 2 +-
c/src/lib/libbsp/sparc/leon3/amba/amba.c | 2 +-
cpukit/libdrvmgr/drvmgr.h | 2 +-
cpukit/libpci/pci_bus.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/c/src/lib/libbsp/sparc/leon2/startup/bsppredriver.c
b/c/src/lib/libbsp/sparc/leon2/startup/bsppredriver.c
index 260c57f..2e41b72 100644
--- a/c/src/lib/libbsp/sparc/leon2/startup/bsppredriver.c
+++ b/c/src/lib/libbsp/sparc/leon2/startup/bsppredriver.c
@@ -61,7 +61,7 @@ struct drvmgr_bus_res leon2_amba_res __attribute__((weak)) =
{
.next = NULL,
.resource = {
- RES_EMPTY
+ DRVMGR_RES_EMPTY
},
};
diff --git a/c/src/lib/libbsp/sparc/leon3/amba/amba.c
b/c/src/lib/libbsp/sparc/leon3/amba/amba.c
index fe481f5..87dcf22 100644
--- a/c/src/lib/libbsp/sparc/leon3/amba/amba.c
+++ b/c/src/lib/libbsp/sparc/leon3/amba/amba.c
@@ -54,7 +54,7 @@ struct drvmgr_bus_res grlib_drv_resources
__attribute__((weak)) =
.next = NULL,
.resource =
{
- RES_EMPTY,
+ DRVMGR_RES_EMPTY,
}
};
diff --git a/cpukit/libdrvmgr/drvmgr.h b/cpukit/libdrvmgr/drvmgr.h
index 1f5bc80..9e491f8 100644
--- a/cpukit/libdrvmgr/drvmgr.h
+++ b/cpukit/libdrvmgr/drvmgr.h
@@ -179,7 +179,7 @@ enum drvmgr_kt {
};
#define DRVMGR_KEY_EMPTY {NULL, DRVMGR_KT_NONE, {0}}
-#define RES_EMPTY {0, 0, NULL}
+#define DRVMGR_RES_EMPTY {0, 0, NULL}
#define MMAP_EMPTY {0, 0, 0}
/*! Union of different values */
diff --git a/cpukit/libpci/pci_bus.c b/cpukit/libpci/pci_bus.c
index 7c2f18b..2172e72 100644
--- a/cpukit/libpci/pci_bus.c
+++ b/cpukit/libpci/pci_bus.c
@@ -115,7 +115,7 @@ struct drvmgr_func pcibus_funcs[] = {
struct drvmgr_bus_res pcibus_drv_resources __attribute__((weak)) = {
.next = NULL,
.resource = {
- RES_EMPTY,
+ DRVMGR_RES_EMPTY,
},
};
--
1.7.0.4
_______________________________________________
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel
