summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cpukit/ChangeLog5
-rw-r--r--cpukit/include/rtems/pci.h4
2 files changed, 7 insertions, 2 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 09b6f883dd..4c63983a00 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-11 Ralf Corsépius <ralf.corsepius@rtems.org>
+
+ PR 1483/cpukit
+ * include/rtems/pci.h: Rename pci_config into rtems_pci_config_t.
+
2009-12-10 Joel Sherrill <joel.sherrill@OARcorp.com>
PR 1482
diff --git a/cpukit/include/rtems/pci.h b/cpukit/include/rtems/pci.h
index 16a20eeace..0b47d9275c 100644
--- a/cpukit/include/rtems/pci.h
+++ b/cpukit/include/rtems/pci.h
@@ -1133,9 +1133,9 @@ typedef struct {
volatile unsigned char* pci_config_addr;
volatile unsigned char* pci_config_data;
const pci_config_access_functions* pci_functions;
-} pci_config;
+} rtems_pci_config_t;
-extern pci_config BSP_pci_configuration;
+extern rtems_pci_config_t BSP_pci_configuration;
static inline int
pci_read_config_byte(