IFC to head to catch up the bhyve branch

Approved by:	grehan@

3 files changed, 3 insertions, 7 deletions

diff --git a/sys/dev/dc/dcphy.c b/sys/dev/dc/dcphy.c
index ab44993..a05f2ed 100644
--- a/sys/dev/dc/dcphy.c
+++ b/sys/dev/dc/dcphy.c
@@ -95,7 +95,7 @@ static device_method_t dcphy_methods[] = {
 	DEVMETHOD(device_attach,	dcphy_attach),
 	DEVMETHOD(device_detach,	mii_phy_detach),
 	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static devclass_t dcphy_devclass;
diff --git a/sys/dev/dc/if_dc.c b/sys/dev/dc/if_dc.c
index b9ea19a..0ace34e 100644
--- a/sys/dev/dc/if_dc.c
+++ b/sys/dev/dc/if_dc.c
@@ -337,17 +337,13 @@ static device_method_t dc_methods[] = {
 	DEVMETHOD(device_resume,	dc_resume),
 	DEVMETHOD(device_shutdown,	dc_shutdown),
 
-	/* bus interface */
-	DEVMETHOD(bus_print_child,	bus_generic_print_child),
-	DEVMETHOD(bus_driver_added,	bus_generic_driver_added),
-
 	/* MII interface */
 	DEVMETHOD(miibus_readreg,	dc_miibus_readreg),
 	DEVMETHOD(miibus_writereg,	dc_miibus_writereg),
 	DEVMETHOD(miibus_statchg,	dc_miibus_statchg),
 	DEVMETHOD(miibus_mediainit,	dc_miibus_mediainit),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t dc_driver = {
diff --git a/sys/dev/dc/pnphy.c b/sys/dev/dc/pnphy.c
index 6546acd..98e721d 100644
--- a/sys/dev/dc/pnphy.c
+++ b/sys/dev/dc/pnphy.c
@@ -74,7 +74,7 @@ static device_method_t pnphy_methods[] = {
 	DEVMETHOD(device_attach,	pnphy_attach),
 	DEVMETHOD(device_detach,	mii_phy_detach),
 	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static devclass_t pnphy_devclass;