Merge from the following changes.

sys/conf/files.i386		1.321
sys/dev/syscons/syscons.c	1.343
sys/i386/isa/spkr.c		1.46
sys/isa/fd.c			1.183 and 1.185
sys/isa/syscons_isa.c		1.14
sys/isa/vga_isa.c		1.18

1 files changed, 20 insertions, 17 deletions

diff --git a/sys/pc98/cbus/syscons_cbus.c b/sys/pc98/cbus/syscons_cbus.c
index 28f26d4..c461b0a 100644
--- a/sys/pc98/cbus/syscons_cbus.c
+++ b/sys/pc98/cbus/syscons_cbus.c
@@ -49,25 +49,14 @@
 
 static devclass_t	sc_devclass;
 
-static int	scprobe(device_t dev);
-static int	scattach(device_t dev);
-static int	scresume(device_t dev);
-
-static device_method_t sc_methods[] = {
-	DEVMETHOD(device_probe,         scprobe),
-	DEVMETHOD(device_attach,        scattach),
-	DEVMETHOD(device_resume,        scresume),
-	{ 0, 0 }
-};
-
-static driver_t sc_driver = {
-	SC_DRIVER_NAME,
-	sc_methods,
-	sizeof(sc_softc_t),
-};
-
 static sc_softc_t main_softc;
 
+static void
+scidentify (driver_t *driver, device_t parent)
+{
+	BUS_ADD_CHILD(parent, ISA_ORDER_SPECULATIVE, "sc", 0);
+}
+
 static int
 scprobe(device_t dev)
 {
@@ -212,4 +201,18 @@ sc_tone(int herz)
 	return 0;
 }
 
+static device_method_t sc_methods[] = {
+	DEVMETHOD(device_identify,	scidentify),
+	DEVMETHOD(device_probe,         scprobe),
+	DEVMETHOD(device_attach,        scattach),
+	DEVMETHOD(device_resume,        scresume),
+	{ 0, 0 }
+};
+
+static driver_t sc_driver = {
+	SC_DRIVER_NAME,
+	sc_methods,
+	sizeof(sc_softc_t),
+};
+
 DRIVER_MODULE(sc, isa, sc_driver, sc_devclass, 0, 0);