Darwin: More renames

diff --git a/lib/darwin.c b/lib/darwin.c
index e34c423712a7472cfa637bdb63ef6bbf9efc1a1e..9167393efe164bba7ea757f82a68e45e0a89a13f 100644 (file)
--- a/lib/darwin.c
+++ b/lib/darwin.c
@@ -194,9 +194,9 @@ darwin_write(struct pci_dev *d, int pos, byte *buf, int len)
   return 1;
 }
 
-struct pci_methods pm_darwin_device = {
-    "darwin-device",
-    "Darwin device",
+struct pci_methods pm_darwin = {
+    "darwin",
+    "Darwin",
     darwin_config,
     darwin_detect,
     darwin_init,

diff --git a/lib/init.c b/lib/init.c
index 04d8638a64ce7569c742d7d8067c13ce0de7b3ff..d28271e8e3003780f9eb849c059ff0c2ec64c71a 100644 (file)
--- a/lib/init.c
+++ b/lib/init.c
@@ -58,7 +58,7 @@ static struct pci_methods *pci_methods[PCI_ACCESS_MAX] = {
   NULL,
 #endif
 #ifdef PCI_HAVE_PM_DARWIN_DEVICE
-  &pm_darwin_device,
+  &pm_darwin,
 #else
   NULL,
 #endif

diff --git a/lib/internal.h b/lib/internal.h
index de57c5ecb145ff673223a2e4494ae81201dd7763..2c6d3ef58a16560200d6cb9baa9ac128c0b3ea57 100644 (file)
--- a/lib/internal.h
+++ b/lib/internal.h
@@ -75,4 +75,4 @@ void pci_free_caps(struct pci_dev *);
 
 extern struct pci_methods pm_intel_conf1, pm_intel_conf2, pm_linux_proc,
        pm_fbsd_device, pm_aix_device, pm_nbsd_libpci, pm_obsd_device,
-       pm_dump, pm_linux_sysfs, pm_darwin_device;
+       pm_dump, pm_linux_sysfs, pm_darwin;