summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/dev/ata/ata-all.c2
-rw-r--r--sys/dev/ata/ata-raid.c2
-rw-r--r--sys/dev/ata/ata-raid.h2
-rw-r--r--sys/dev/usb/uhci.c6
4 files changed, 9 insertions, 3 deletions
diff --git a/sys/dev/ata/ata-all.c b/sys/dev/ata/ata-all.c
index 10c5381..7774c69 100644
--- a/sys/dev/ata/ata-all.c
+++ b/sys/dev/ata/ata-all.c
@@ -531,7 +531,7 @@ ata_boot_attach(void)
if (ch->devices & ATA_ATA_SLAVE)
ad_attach(&ch->device[SLAVE]);
}
- ar_attach();
+ atar_attach();
#endif
#if defined(DEV_ATAPICD) || defined(DEV_ATAPIFD) || defined(DEV_ATAPIST)
/* then the atapi devices */
diff --git a/sys/dev/ata/ata-raid.c b/sys/dev/ata/ata-raid.c
index ba7e5cf..3aa7fd0 100644
--- a/sys/dev/ata/ata-raid.c
+++ b/sys/dev/ata/ata-raid.c
@@ -107,7 +107,7 @@ ar_probe(struct ad_softc *adp) {
}
void
-ar_attach()
+atar_attach()
{
struct ar_softc *raid;
dev_t dev;
diff --git a/sys/dev/ata/ata-raid.h b/sys/dev/ata/ata-raid.h
index acc3eb0..06a5f8f 100644
--- a/sys/dev/ata/ata-raid.h
+++ b/sys/dev/ata/ata-raid.h
@@ -206,5 +206,5 @@ struct promise_raid_conf {
} __attribute__((packed));
int ar_probe(struct ad_softc *);
-void ar_attach(void);
+void atar_attach(void);
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c
index 4c3e77d..dc95b72 100644
--- a/sys/dev/usb/uhci.c
+++ b/sys/dev/usb/uhci.c
@@ -704,6 +704,12 @@ uhci_dumpregs(uhci_softc_t *sc)
UREAD2(sc, UHCI_PORTSC2)));
}
+Static void
+uhci_dump_ii(uhci_intr_info_t *ii)
+{
+ printf("Fill me in");
+}
+
void
uhci_dump_td(uhci_soft_td_t *p)
{
OpenPOWER on IntegriCloud