Index: acpi_support/acpi_asus_wmi.c =================================================================== --- acpi_support/acpi_asus_wmi.c (revision 246123) +++ acpi_support/acpi_asus_wmi.c (working copy) @@ -304,7 +304,8 @@ DEVMETHOD(device_probe, acpi_asus_wmi_probe), DEVMETHOD(device_attach, acpi_asus_wmi_attach), DEVMETHOD(device_detach, acpi_asus_wmi_detach), - {0, 0} + + DEVMETHOD_END }; static driver_t acpi_asus_wmi_driver = { Index: acpi_support/acpi_fujitsu.c =================================================================== --- acpi_support/acpi_fujitsu.c (revision 246123) +++ acpi_support/acpi_fujitsu.c (working copy) @@ -154,7 +154,8 @@ DEVMETHOD(device_detach, acpi_fujitsu_detach), DEVMETHOD(device_suspend, acpi_fujitsu_suspend), DEVMETHOD(device_resume, acpi_fujitsu_resume), - {0, 0} + + DEVMETHOD_END }; static driver_t acpi_fujitsu_driver = { Index: acpi_support/acpi_hp.c =================================================================== --- acpi_support/acpi_hp.c (revision 246123) +++ acpi_support/acpi_hp.c (working copy) @@ -324,7 +324,8 @@ DEVMETHOD(device_probe, acpi_hp_probe), DEVMETHOD(device_attach, acpi_hp_attach), DEVMETHOD(device_detach, acpi_hp_detach), - {0, 0} + + DEVMETHOD_END }; static driver_t acpi_hp_driver = { Index: acpi_support/acpi_ibm.c =================================================================== --- acpi_support/acpi_ibm.c (revision 246123) +++ acpi_support/acpi_ibm.c (working copy) @@ -303,7 +303,7 @@ DEVMETHOD(device_detach, acpi_ibm_detach), DEVMETHOD(device_resume, acpi_ibm_resume), - {0, 0} + DEVMETHOD_END }; static driver_t acpi_ibm_driver = { Index: acpi_support/acpi_panasonic.c =================================================================== --- acpi_support/acpi_panasonic.c (revision 246123) +++ acpi_support/acpi_panasonic.c (working copy) @@ -118,7 +118,7 @@ DEVMETHOD(device_detach, acpi_panasonic_detach), DEVMETHOD(device_shutdown, acpi_panasonic_shutdown), - {0, 0} + DEVMETHOD_END }; static driver_t acpi_panasonic_driver = { Index: acpi_support/acpi_sony.c =================================================================== --- acpi_support/acpi_sony.c (revision 246123) +++ acpi_support/acpi_sony.c (working copy) @@ -95,7 +95,7 @@ DEVMETHOD(device_attach, acpi_sony_attach), DEVMETHOD(device_detach, acpi_sony_detach), - {0, 0} + DEVMETHOD_END }; static driver_t acpi_sony_driver = { Index: acpi_support/acpi_toshiba.c =================================================================== --- acpi_support/acpi_toshiba.c (revision 246123) +++ acpi_support/acpi_toshiba.c (working copy) @@ -172,7 +172,7 @@ DEVMETHOD(device_attach, acpi_toshiba_attach), DEVMETHOD(device_detach, acpi_toshiba_detach), - {0, 0} + DEVMETHOD_END }; static driver_t acpi_toshiba_driver = { @@ -190,7 +190,7 @@ DEVMETHOD(device_probe, acpi_toshiba_video_probe), DEVMETHOD(device_attach, acpi_toshiba_video_attach), - {0, 0} + DEVMETHOD_END }; static driver_t acpi_toshiba_video_driver = { Index: acpica/acpi.c =================================================================== --- acpica/acpi.c (revision 246123) +++ acpica/acpi.c (working copy) @@ -217,7 +217,7 @@ /* ISA emulation */ DEVMETHOD(isa_pnp_probe, acpi_isa_pnp_probe), - {0, 0} + DEVMETHOD_END }; static driver_t acpi_driver = { Index: acpica/acpi_acad.c =================================================================== --- acpica/acpi_acad.c (revision 246123) +++ acpica/acpi_acad.c (working copy) @@ -74,7 +74,7 @@ DEVMETHOD(device_probe, acpi_acad_probe), DEVMETHOD(device_attach, acpi_acad_attach), - {0, 0} + DEVMETHOD_END }; static driver_t acpi_acad_driver = { Index: acpica/acpi_button.c =================================================================== --- acpica/acpi_button.c (revision 246123) +++ acpica/acpi_button.c (working copy) @@ -79,8 +79,7 @@ DEVMETHOD(device_suspend, acpi_button_suspend), DEVMETHOD(device_shutdown, acpi_button_suspend), DEVMETHOD(device_resume, acpi_button_resume), - - {0, 0} + DEVMETHOD_END }; static driver_t acpi_button_driver = { Index: acpica/acpi_cmbat.c =================================================================== --- acpica/acpi_cmbat.c (revision 246123) +++ acpica/acpi_cmbat.c (working copy) @@ -99,7 +99,7 @@ DEVMETHOD(acpi_batt_get_info, acpi_cmbat_bif), DEVMETHOD(acpi_batt_get_status, acpi_cmbat_bst), - {0, 0} + DEVMETHOD_END }; static driver_t acpi_cmbat_driver = { Index: acpica/acpi_dock.c =================================================================== --- acpica/acpi_dock.c (revision 246123) +++ acpica/acpi_dock.c (working copy) @@ -521,7 +521,7 @@ DEVMETHOD(device_probe, acpi_dock_probe), DEVMETHOD(device_attach, acpi_dock_attach), - {0, 0} + DEVMETHOD_END }; static driver_t acpi_dock_driver = { Index: acpica/acpi_ec.c =================================================================== --- acpica/acpi_ec.c (revision 246123) +++ acpica/acpi_ec.c (working copy) @@ -253,7 +253,7 @@ DEVMETHOD(acpi_ec_read, acpi_ec_read_method), DEVMETHOD(acpi_ec_write, acpi_ec_write_method), - {0, 0} + DEVMETHOD_END }; static driver_t acpi_ec_driver = { Index: acpica/acpi_hpet.c =================================================================== --- acpica/acpi_hpet.c (revision 246123) +++ acpica/acpi_hpet.c (working copy) @@ -849,7 +849,7 @@ DEVMETHOD(bus_remap_intr, hpet_remap_intr), #endif - {0, 0} + DEVMETHOD_END }; static driver_t hpet_driver = { Index: acpica/acpi_lid.c =================================================================== --- acpica/acpi_lid.c (revision 246123) +++ acpica/acpi_lid.c (working copy) @@ -69,7 +69,7 @@ DEVMETHOD(device_suspend, acpi_lid_suspend), DEVMETHOD(device_resume, acpi_lid_resume), - {0, 0} + DEVMETHOD_END }; static driver_t acpi_lid_driver = { Index: acpica/acpi_pci.c =================================================================== --- acpica/acpi_pci.c (revision 246123) +++ acpica/acpi_pci.c (working copy) @@ -94,7 +94,7 @@ /* PCI interface */ DEVMETHOD(pci_set_powerstate, acpi_pci_set_powerstate_method), - { 0, 0 } + DEVMETHOD_END }; static devclass_t pci_devclass; Index: acpica/acpi_pci_link.c =================================================================== --- acpica/acpi_pci_link.c (revision 246123) +++ acpica/acpi_pci_link.c (working copy) @@ -1097,7 +1097,7 @@ DEVMETHOD(device_attach, acpi_pci_link_attach), DEVMETHOD(device_resume, acpi_pci_link_resume), - {0, 0} + DEVMETHOD_END }; static driver_t acpi_pci_link_driver = { Index: acpica/acpi_pcib_pci.c =================================================================== --- acpica/acpi_pcib_pci.c (revision 246123) +++ acpica/acpi_pcib_pci.c (working copy) @@ -83,7 +83,7 @@ DEVMETHOD(pcib_route_interrupt, acpi_pcib_pci_route_interrupt), DEVMETHOD(pcib_power_for_sleep, acpi_pcib_power_for_sleep), - {0, 0} + DEVMETHOD_END }; static devclass_t pcib_devclass; Index: acpica/acpi_perf.c =================================================================== --- acpica/acpi_perf.c (revision 246123) +++ acpica/acpi_perf.c (working copy) @@ -122,7 +122,8 @@ DEVMETHOD(cpufreq_drv_get, acpi_px_get), DEVMETHOD(cpufreq_drv_type, acpi_px_type), DEVMETHOD(cpufreq_drv_settings, acpi_px_settings), - {0, 0} + + DEVMETHOD_END }; static driver_t acpi_perf_driver = { Index: acpica/acpi_resource.c =================================================================== --- acpica/acpi_resource.c (revision 246123) +++ acpica/acpi_resource.c (working copy) @@ -615,7 +615,7 @@ DEVMETHOD(device_probe, acpi_sysres_probe), DEVMETHOD(device_attach, acpi_sysres_attach), - {0, 0} + DEVMETHOD_END }; static driver_t acpi_sysres_driver = { Index: acpica/acpi_smbat.c =================================================================== --- acpica/acpi_smbat.c (revision 246123) +++ acpica/acpi_smbat.c (working copy) @@ -89,7 +89,7 @@ DEVMETHOD(acpi_batt_get_status, acpi_smbat_get_bst), DEVMETHOD(acpi_batt_get_info, acpi_smbat_get_bif), - {0, 0} + DEVMETHOD_END }; static driver_t acpi_smbat_driver = { Index: acpica/acpi_thermal.c =================================================================== --- acpica/acpi_thermal.c (revision 246123) +++ acpica/acpi_thermal.c (working copy) @@ -152,7 +152,7 @@ DEVMETHOD(device_probe, acpi_tz_probe), DEVMETHOD(device_attach, acpi_tz_attach), - {0, 0} + DEVMETHOD_END }; static driver_t acpi_tz_driver = { Index: acpica/acpi_throttle.c =================================================================== --- acpica/acpi_throttle.c (revision 246123) +++ acpica/acpi_throttle.c (working copy) @@ -114,7 +114,7 @@ DEVMETHOD(cpufreq_drv_get, acpi_thr_get), DEVMETHOD(cpufreq_drv_type, acpi_thr_type), DEVMETHOD(cpufreq_drv_settings, acpi_thr_settings), - {0, 0} + DEVMETHOD_END }; static driver_t acpi_throttle_driver = { Index: acpica/acpi_timer.c =================================================================== --- acpica/acpi_timer.c (revision 246123) +++ acpica/acpi_timer.c (working copy) @@ -82,7 +82,7 @@ DEVMETHOD(device_probe, acpi_timer_probe), DEVMETHOD(device_attach, acpi_timer_attach), - {0, 0} + DEVMETHOD_END }; static driver_t acpi_timer_driver = { Index: adlink/adlink.c =================================================================== --- adlink/adlink.c (revision 246123) +++ adlink/adlink.c (working copy) @@ -407,7 +407,8 @@ DEVMETHOD(device_suspend, bus_generic_suspend), DEVMETHOD(device_resume, bus_generic_resume), DEVMETHOD(device_shutdown, bus_generic_shutdown), - {0, 0} + + DEVMETHOD_END }; static driver_t adlink_driver = { Index: amdsbwd/amdsbwd.c =================================================================== --- amdsbwd/amdsbwd.c (revision 246123) +++ amdsbwd/amdsbwd.c (working copy) @@ -139,7 +139,7 @@ #if 0 DEVMETHOD(device_shutdown, amdsbwd_detach), #endif - {0, 0} + DEVMETHOD_END }; static devclass_t amdsbwd_devclass; Index: amdtemp/amdtemp.c =================================================================== --- amdtemp/amdtemp.c (revision 246123) +++ amdtemp/amdtemp.c (working copy) @@ -134,7 +134,7 @@ DEVMETHOD(device_attach, amdtemp_attach), DEVMETHOD(device_detach, amdtemp_detach), - {0, 0} + DEVMETHOD_END }; static driver_t amdtemp_driver = { Index: auxio/auxio.c =================================================================== --- auxio/auxio.c (revision 246123) +++ auxio/auxio.c (working copy) @@ -131,7 +131,8 @@ DEVMETHOD(device_probe, auxio_bus_probe), DEVMETHOD(device_attach, auxio_sbus_attach), DEVMETHOD(device_detach, auxio_bus_detach), - {0, 0} + + DEVMETHOD_END }; static driver_t auxio_sbus_driver = { @@ -151,7 +152,8 @@ DEVMETHOD(device_probe, auxio_bus_probe), DEVMETHOD(device_attach, auxio_ebus_attach), DEVMETHOD(device_detach, auxio_bus_detach), - {0, 0} + + DEVMETHOD_END }; static driver_t auxio_ebus_driver = { Index: ce/if_ce.c =================================================================== --- ce/if_ce.c (revision 246123) +++ ce/if_ce.c (working copy) @@ -145,7 +145,7 @@ DEVMETHOD(device_attach, ce_attach), DEVMETHOD(device_detach, ce_detach), - {0, 0} + DEVMETHOD_END }; typedef struct _ce_dma_mem_t { Index: cfi/cfi_bus_fdt.c =================================================================== --- cfi/cfi_bus_fdt.c (revision 246123) +++ cfi/cfi_bus_fdt.c (working copy) @@ -51,7 +51,7 @@ DEVMETHOD(device_attach, cfi_attach), DEVMETHOD(device_detach, cfi_detach), - {0, 0} + DEVMETHOD_END }; static driver_t cfi_fdt_driver = { Index: cfi/cfi_bus_ixp4xx.c =================================================================== --- cfi/cfi_bus_ixp4xx.c (revision 246123) +++ cfi/cfi_bus_ixp4xx.c (working copy) @@ -69,7 +69,7 @@ DEVMETHOD(device_attach, cfi_attach), DEVMETHOD(device_detach, cfi_detach), - {0, 0} + DEVMETHOD_END }; static driver_t cfi_ixp4xx_driver = { Index: coretemp/coretemp.c =================================================================== --- coretemp/coretemp.c (revision 246123) +++ coretemp/coretemp.c (working copy) @@ -85,7 +85,7 @@ DEVMETHOD(device_attach, coretemp_attach), DEVMETHOD(device_detach, coretemp_detach), - {0, 0} + DEVMETHOD_END }; static driver_t coretemp_driver = { Index: cp/if_cp.c =================================================================== --- cp/if_cp.c (revision 246123) +++ cp/if_cp.c (working copy) @@ -93,7 +93,7 @@ DEVMETHOD(device_attach, cp_attach), DEVMETHOD(device_detach, cp_detach), - {0, 0} + DEVMETHOD_END }; typedef struct _cp_dma_mem_t { Index: cpufreq/ichss.c =================================================================== --- cpufreq/ichss.c (revision 246123) +++ cpufreq/ichss.c (working copy) @@ -113,7 +113,7 @@ DEVMETHOD(cpufreq_drv_get, ichss_get), DEVMETHOD(cpufreq_drv_type, ichss_type), DEVMETHOD(cpufreq_drv_settings, ichss_settings), - {0, 0} + DEVMETHOD_END }; static driver_t ichss_driver = { "ichss", ichss_methods, sizeof(struct ichss_softc) Index: ctau/if_ct.c =================================================================== --- ctau/if_ct.c (revision 246123) +++ ctau/if_ct.c (working copy) @@ -93,7 +93,8 @@ DEVMETHOD(device_probe, ct_probe), DEVMETHOD(device_attach, ct_attach), DEVMETHOD(device_detach, ct_detach), - {0, 0} + + DEVMETHOD_END }; typedef struct _ct_dma_mem_t { Index: cx/if_cx.c =================================================================== --- cx/if_cx.c (revision 246123) +++ cx/if_cx.c (working copy) @@ -113,7 +113,8 @@ DEVMETHOD(device_probe, cx_probe), DEVMETHOD(device_attach, cx_attach), DEVMETHOD(device_detach, cx_detach), - {0, 0} + + DEVMETHOD_END }; typedef struct _cx_dma_mem_t { Index: digi/digi_isa.c =================================================================== --- digi/digi_isa.c (revision 246123) +++ digi/digi_isa.c (working copy) @@ -462,7 +462,8 @@ DEVMETHOD(device_attach, digi_isa_attach), DEVMETHOD(device_detach, digi_detach), DEVMETHOD(device_shutdown, digi_shutdown), - {0, 0} + + DEVMETHOD_END }; static driver_t digi_isa_drv = { Index: digi/digi_pci.c =================================================================== --- digi/digi_pci.c (revision 246123) +++ digi/digi_pci.c (working copy) @@ -219,7 +219,8 @@ DEVMETHOD(device_attach, digi_pci_attach), DEVMETHOD(device_detach, digi_detach), DEVMETHOD(device_shutdown, digi_shutdown), - {0, 0} + + DEVMETHOD_END }; static driver_t digi_pci_drv = { Index: e1000/if_em.c =================================================================== --- e1000/if_em.c (revision 246123) +++ e1000/if_em.c (working copy) @@ -309,7 +309,7 @@ DEVMETHOD(device_shutdown, em_shutdown), DEVMETHOD(device_suspend, em_suspend), DEVMETHOD(device_resume, em_resume), - {0, 0} + DEVMETHOD_END }; static driver_t em_driver = { Index: e1000/if_igb.c =================================================================== --- e1000/if_igb.c (revision 246123) +++ e1000/if_igb.c (working copy) @@ -294,7 +294,7 @@ DEVMETHOD(device_shutdown, igb_shutdown), DEVMETHOD(device_suspend, igb_suspend), DEVMETHOD(device_resume, igb_resume), - {0, 0} + DEVMETHOD_END }; static driver_t igb_driver = { Index: e1000/if_lem.c =================================================================== --- e1000/if_lem.c (revision 246123) +++ e1000/if_lem.c (working copy) @@ -262,7 +262,7 @@ DEVMETHOD(device_shutdown, lem_shutdown), DEVMETHOD(device_suspend, lem_suspend), DEVMETHOD(device_resume, lem_resume), - {0, 0} + DEVMETHOD_END }; static driver_t lem_driver = { Index: ep/if_ep_eisa.c =================================================================== --- ep/if_ep_eisa.c (revision 246123) +++ ep/if_ep_eisa.c (working copy) @@ -238,7 +238,7 @@ DEVMETHOD(device_attach, ep_eisa_attach), DEVMETHOD(device_detach, ep_detach), - {0, 0} + DEVMETHOD_END }; static driver_t ep_eisa_driver = { Index: ep/if_ep_isa.c =================================================================== --- ep/if_ep_isa.c (revision 246123) +++ ep/if_ep_isa.c (working copy) @@ -391,7 +391,7 @@ DEVMETHOD(device_attach, ep_isa_attach), DEVMETHOD(device_detach, ep_detach), - {0, 0} + DEVMETHOD_END }; static driver_t ep_isa_driver = { Index: ep/if_ep_mca.c =================================================================== --- ep/if_ep_mca.c (revision 246123) +++ ep/if_ep_mca.c (working copy) @@ -145,7 +145,7 @@ DEVMETHOD(device_attach, ep_mca_attach), DEVMETHOD(device_detach, ep_detach), - {0, 0} + DEVMETHOD_END }; static driver_t ep_mca_driver = { Index: ep/if_ep_pccard.c =================================================================== --- ep/if_ep_pccard.c (revision 246123) +++ ep/if_ep_pccard.c (working copy) @@ -223,7 +223,7 @@ DEVMETHOD(device_attach, ep_pccard_attach), DEVMETHOD(device_detach, ep_detach), - {0, 0} + DEVMETHOD_END }; static driver_t ep_pccard_driver = { Index: fdc/fdc_acpi.c =================================================================== --- fdc/fdc_acpi.c (revision 246123) +++ fdc/fdc_acpi.c (working copy) @@ -258,7 +258,7 @@ DEVMETHOD(bus_read_ivar, fdc_read_ivar), DEVMETHOD(bus_write_ivar, fdc_write_ivar), - {0, 0} + DEVMETHOD_END }; static driver_t fdc_acpi_driver = { Index: iicbus/ad7418.c =================================================================== --- iicbus/ad7418.c (revision 246123) +++ iicbus/ad7418.c (working copy) @@ -219,7 +219,7 @@ DEVMETHOD(device_probe, ad7418_probe), DEVMETHOD(device_attach, ad7418_attach), - {0, 0}, + DEVMETHOD_END }; static driver_t ad7418_driver = { Index: iicbus/ds133x.c =================================================================== --- iicbus/ds133x.c (revision 246123) +++ iicbus/ds133x.c (working copy) @@ -347,7 +347,7 @@ DEVMETHOD(clock_gettime, ds133x_gettime), DEVMETHOD(clock_settime, ds133x_settime), - {0, 0}, + DEVMETHOD_END }; static driver_t ds133x_driver = { Index: iicbus/ds1672.c =================================================================== --- iicbus/ds1672.c (revision 246123) +++ iicbus/ds1672.c (working copy) @@ -167,7 +167,7 @@ DEVMETHOD(clock_gettime, ds1672_gettime), DEVMETHOD(clock_settime, ds1672_settime), - {0, 0}, + DEVMETHOD_END }; static driver_t ds1672_driver = { Index: iicbus/icee.c =================================================================== --- iicbus/icee.c (revision 246123) +++ iicbus/icee.c (working copy) @@ -262,7 +262,7 @@ DEVMETHOD(device_probe, icee_probe), DEVMETHOD(device_attach, icee_attach), - {0, 0}, + DEVMETHOD_END }; static driver_t icee_driver = { Index: ixgb/if_ixgb.c =================================================================== --- ixgb/if_ixgb.c (revision 246123) +++ ixgb/if_ixgb.c (working copy) @@ -159,7 +159,8 @@ DEVMETHOD(device_attach, ixgb_attach), DEVMETHOD(device_detach, ixgb_detach), DEVMETHOD(device_shutdown, ixgb_shutdown), - {0, 0} + + DEVMETHOD_END }; static driver_t ixgb_driver = { Index: ixgbe/ixgbe.c =================================================================== --- ixgbe/ixgbe.c (revision 246123) +++ ixgbe/ixgbe.c (working copy) @@ -216,7 +216,8 @@ DEVMETHOD(device_attach, ixgbe_attach), DEVMETHOD(device_detach, ixgbe_detach), DEVMETHOD(device_shutdown, ixgbe_shutdown), - {0, 0} + + DEVMETHOD_END }; static driver_t ixgbe_driver = { Index: ixgbe/ixv.c =================================================================== --- ixgbe/ixv.c (revision 246123) +++ ixgbe/ixv.c (working copy) @@ -169,7 +169,8 @@ DEVMETHOD(device_attach, ixv_attach), DEVMETHOD(device_detach, ixv_detach), DEVMETHOD(device_shutdown, ixv_shutdown), - {0, 0} + + DEVMETHOD_END }; static driver_t ixv_driver = { Index: mfi/mfi_cam.c =================================================================== --- mfi/mfi_cam.c (revision 246123) +++ mfi/mfi_cam.c (working copy) @@ -99,7 +99,8 @@ DEVMETHOD(device_probe, mfip_probe), DEVMETHOD(device_attach, mfip_attach), DEVMETHOD(device_detach, mfip_detach), - {0, 0} + + DEVMETHOD_END }; static driver_t mfip_driver = { "mfip", Index: mn/if_mn.c =================================================================== --- mn/if_mn.c (revision 246123) +++ mn/if_mn.c (working copy) @@ -1418,7 +1418,7 @@ DEVMETHOD(device_resume, bus_generic_resume), DEVMETHOD(device_shutdown, bus_generic_shutdown), - {0, 0} + DEVMETHOD_END }; static driver_t mn_driver = { Index: mxge/if_mxge.c =================================================================== --- mxge/if_mxge.c (revision 246123) +++ mxge/if_mxge.c (working copy) @@ -124,7 +124,8 @@ DEVMETHOD(device_attach, mxge_attach), DEVMETHOD(device_detach, mxge_detach), DEVMETHOD(device_shutdown, mxge_shutdown), - {0, 0} + + DEVMETHOD_END }; static driver_t mxge_driver = Index: my/if_my.c =================================================================== --- my/if_my.c (revision 246123) +++ my/if_my.c (working copy) @@ -153,7 +153,7 @@ DEVMETHOD(device_detach, my_detach), DEVMETHOD(device_shutdown, my_shutdown), - {0, 0} + DEVMETHOD_END }; static driver_t my_driver = { Index: nvram2env/nvram2env.c =================================================================== --- nvram2env/nvram2env.c (revision 246123) +++ nvram2env/nvram2env.c (working copy) @@ -303,7 +303,8 @@ DEVMETHOD(device_identify, nvram2env_identify), DEVMETHOD(device_probe, nvram2env_probe), DEVMETHOD(device_attach, nvram2env_attach), - {0, 0}, + + DEVMETHOD_END }; static driver_t nvram2env_driver = { Index: nxge/if_nxge.c =================================================================== --- nxge/if_nxge.c (revision 246123) +++ nxge/if_nxge.c (working copy) @@ -3507,7 +3507,8 @@ DEVMETHOD(device_attach, xge_attach), DEVMETHOD(device_detach, xge_detach), DEVMETHOD(device_shutdown, xge_shutdown), - {0, 0} + + DEVMETHOD_END }; static driver_t xge_driver = { Index: oce/oce_if.c =================================================================== --- oce/oce_if.c (revision 246123) +++ oce/oce_if.c (working copy) @@ -108,7 +108,8 @@ DEVMETHOD(device_attach, oce_attach), DEVMETHOD(device_detach, oce_detach), DEVMETHOD(device_shutdown, oce_shutdown), - {0, 0} + + DEVMETHOD_END }; static driver_t oce_driver = { Index: sdhci/sdhci_pci.c =================================================================== --- sdhci/sdhci_pci.c (revision 246123) +++ sdhci/sdhci_pci.c (working copy) @@ -426,7 +426,7 @@ DEVMETHOD(sdhci_write_4, sdhci_pci_write_4), DEVMETHOD(sdhci_write_multi_4, sdhci_pci_write_multi_4), - {0, 0}, + DEVMETHOD_END }; static driver_t sdhci_pci_driver = { Index: sound/pci/emu10kx-midi.c =================================================================== --- sound/pci/emu10kx-midi.c (revision 246123) +++ sound/pci/emu10kx-midi.c (working copy) @@ -239,7 +239,7 @@ DEVMETHOD(device_attach, emu_midi_attach), DEVMETHOD(device_detach, emu_midi_detach), - {0, 0}, + DEVMETHOD_END }; static driver_t emu_midi_driver = { Index: sound/pci/emu10kx-pcm.c =================================================================== --- sound/pci/emu10kx-pcm.c (revision 246123) +++ sound/pci/emu10kx-pcm.c (working copy) @@ -1520,7 +1520,8 @@ DEVMETHOD(device_probe, emu_pcm_probe), DEVMETHOD(device_attach, emu_pcm_attach), DEVMETHOD(device_detach, emu_pcm_detach), - {0, 0} + + DEVMETHOD_END }; static driver_t emu_pcm_driver = { Index: sound/pci/emu10kx.c =================================================================== --- sound/pci/emu10kx.c (revision 246123) +++ sound/pci/emu10kx.c (working copy) @@ -3529,7 +3529,7 @@ DEVMETHOD(bus_read_ivar, emu_read_ivar), DEVMETHOD(bus_write_ivar, emu_write_ivar), - {0, 0} + DEVMETHOD_END }; Index: sound/sbus/cs4231.c =================================================================== --- sound/sbus/cs4231.c (revision 246123) +++ sound/sbus/cs4231.c (working copy) @@ -231,7 +231,8 @@ DEVMETHOD(device_detach, cs4231_bus_detach), DEVMETHOD(device_suspend, cs4231_bus_suspend), DEVMETHOD(device_resume, cs4231_bus_resume), - {0, 0} + + DEVMETHOD_END }; static driver_t cs4231_sbus_driver = { @@ -249,7 +250,8 @@ DEVMETHOD(device_detach, cs4231_bus_detach), DEVMETHOD(device_suspend, cs4231_bus_suspend), DEVMETHOD(device_resume, cs4231_bus_resume), - {0, 0} + + DEVMETHOD_END }; static driver_t cs4231_ebus_driver = { Index: sound/usb/uaudio_pcm.c =================================================================== --- sound/usb/uaudio_pcm.c (revision 246123) +++ sound/usb/uaudio_pcm.c (working copy) @@ -227,7 +227,7 @@ DEVMETHOD(device_attach, ua_attach), DEVMETHOD(device_detach, ua_detach), - {0, 0} + DEVMETHOD_END }; static driver_t ua_pcm_driver = { Index: usb/controller/usb_controller.c =================================================================== --- usb/controller/usb_controller.c (revision 246123) +++ usb/controller/usb_controller.c (working copy) @@ -114,7 +114,8 @@ DEVMETHOD(device_suspend, usb_suspend), DEVMETHOD(device_resume, usb_resume), DEVMETHOD(device_shutdown, usb_shutdown), - {0, 0} + + DEVMETHOD_END }; static driver_t usb_driver = { Index: usb/input/uhid.c =================================================================== --- usb/input/uhid.c (revision 246123) +++ usb/input/uhid.c (working copy) @@ -852,7 +852,8 @@ DEVMETHOD(device_probe, uhid_probe), DEVMETHOD(device_attach, uhid_attach), DEVMETHOD(device_detach, uhid_detach), - {0, 0} + + DEVMETHOD_END }; static driver_t uhid_driver = { Index: usb/input/ukbd.c =================================================================== --- usb/input/ukbd.c (revision 246123) +++ usb/input/ukbd.c (working copy) @@ -2120,7 +2120,8 @@ DEVMETHOD(device_attach, ukbd_attach), DEVMETHOD(device_detach, ukbd_detach), DEVMETHOD(device_resume, ukbd_resume), - {0, 0} + + DEVMETHOD_END }; static driver_t ukbd_driver = { Index: usb/input/ums.c =================================================================== --- usb/input/ums.c (revision 246123) +++ usb/input/ums.c (working copy) @@ -1039,7 +1039,8 @@ DEVMETHOD(device_probe, ums_probe), DEVMETHOD(device_attach, ums_attach), DEVMETHOD(device_detach, ums_detach), - {0, 0} + + DEVMETHOD_END }; static driver_t ums_driver = { Index: usb/misc/udbp.c =================================================================== --- usb/misc/udbp.c (revision 246123) +++ usb/misc/udbp.c (working copy) @@ -248,7 +248,8 @@ DEVMETHOD(device_probe, udbp_probe), DEVMETHOD(device_attach, udbp_attach), DEVMETHOD(device_detach, udbp_detach), - {0, 0} + + DEVMETHOD_END }; static driver_t udbp_driver = { Index: usb/misc/ufm.c =================================================================== --- usb/misc/ufm.c (revision 246123) +++ usb/misc/ufm.c (working copy) @@ -105,7 +105,8 @@ DEVMETHOD(device_probe, ufm_probe), DEVMETHOD(device_attach, ufm_attach), DEVMETHOD(device_detach, ufm_detach), - {0, 0} + + DEVMETHOD_END }; static driver_t ufm_driver = { Index: usb/net/if_cdce.c =================================================================== --- usb/net/if_cdce.c (revision 246123) +++ usb/net/if_cdce.c (working copy) @@ -237,7 +237,7 @@ DEVMETHOD(device_suspend, cdce_suspend), DEVMETHOD(device_resume, cdce_resume), - {0, 0} + DEVMETHOD_END }; static driver_t cdce_driver = { Index: usb/net/if_cue.c =================================================================== --- usb/net/if_cue.c (revision 246123) +++ usb/net/if_cue.c (working copy) @@ -157,7 +157,7 @@ DEVMETHOD(device_attach, cue_attach), DEVMETHOD(device_detach, cue_detach), - {0, 0} + DEVMETHOD_END }; static driver_t cue_driver = { Index: usb/net/if_ipheth.c =================================================================== --- usb/net/if_ipheth.c (revision 246123) +++ usb/net/if_ipheth.c (working copy) @@ -116,7 +116,7 @@ DEVMETHOD(device_attach, ipheth_attach), DEVMETHOD(device_detach, ipheth_detach), - {0, 0} + DEVMETHOD_END }; static driver_t ipheth_driver = { Index: usb/net/if_kue.c =================================================================== --- usb/net/if_kue.c (revision 246123) +++ usb/net/if_kue.c (working copy) @@ -199,7 +199,7 @@ DEVMETHOD(device_attach, kue_attach), DEVMETHOD(device_detach, kue_detach), - {0, 0} + DEVMETHOD_END }; static driver_t kue_driver = { Index: usb/net/if_smsc.c =================================================================== --- usb/net/if_smsc.c (revision 246123) +++ usb/net/if_smsc.c (working copy) @@ -1810,7 +1810,7 @@ DEVMETHOD(miibus_writereg, smsc_miibus_writereg), DEVMETHOD(miibus_statchg, smsc_miibus_statchg), - {0, 0} + DEVMETHOD_END }; static driver_t smsc_driver = { Index: usb/storage/umass.c =================================================================== --- usb/storage/umass.c (revision 246123) +++ usb/storage/umass.c (working copy) @@ -698,7 +698,8 @@ DEVMETHOD(device_probe, umass_probe), DEVMETHOD(device_attach, umass_attach), DEVMETHOD(device_detach, umass_detach), - {0, 0} + + DEVMETHOD_END }; static driver_t umass_driver = { Index: usb/storage/urio.c =================================================================== --- usb/storage/urio.c (revision 246123) +++ usb/storage/urio.c (working copy) @@ -185,7 +185,8 @@ DEVMETHOD(device_probe, urio_probe), DEVMETHOD(device_attach, urio_attach), DEVMETHOD(device_detach, urio_detach), - {0, 0} + + DEVMETHOD_END }; static driver_t urio_driver = { Index: usb/storage/ustorage_fs.c =================================================================== --- usb/storage/ustorage_fs.c (revision 246123) +++ usb/storage/ustorage_fs.c (working copy) @@ -256,7 +256,7 @@ DEVMETHOD(device_suspend, ustorage_fs_suspend), DEVMETHOD(device_resume, ustorage_fs_resume), - {0, 0} + DEVMETHOD_END }; static driver_t ustorage_fs_driver = { Index: usb/usb_compat_linux.c =================================================================== --- usb/usb_compat_linux.c (revision 246123) +++ usb/usb_compat_linux.c (working copy) @@ -113,7 +113,7 @@ DEVMETHOD(device_suspend, usb_linux_suspend), DEVMETHOD(device_resume, usb_linux_resume), - {0, 0} + DEVMETHOD_END }; static driver_t usb_linux_driver = { Index: vx/if_vx_eisa.c =================================================================== --- vx/if_vx_eisa.c (revision 246123) +++ vx/if_vx_eisa.c (working copy) @@ -177,7 +177,7 @@ DEVMETHOD(device_probe, vx_eisa_probe), DEVMETHOD(device_attach, vx_eisa_attach), - {0, 0} + DEVMETHOD_END }; static driver_t vx_eisa_driver = { Index: vx/if_vx_pci.c =================================================================== --- vx/if_vx_pci.c (revision 246123) +++ vx/if_vx_pci.c (working copy) @@ -61,7 +61,7 @@ DEVMETHOD(device_attach, vx_pci_attach), DEVMETHOD(device_shutdown, vx_pci_shutdown), - {0, 0} + DEVMETHOD_END }; static driver_t vx_driver = { Index: vxge/vxge.c =================================================================== --- vxge/vxge.c (revision 246123) +++ vxge/vxge.c (working copy) @@ -4188,7 +4188,8 @@ DEVMETHOD(device_attach, vxge_attach), DEVMETHOD(device_detach, vxge_detach), DEVMETHOD(device_shutdown, vxge_shutdown), - {0, 0} + + DEVMETHOD_END }; static driver_t vxge_driver = { Index: xen/console/console.c =================================================================== --- xen/console/console.c (revision 246123) +++ xen/console/console.c (working copy) @@ -410,7 +410,8 @@ DEVMETHOD(device_identify, xc_identify), DEVMETHOD(device_probe, xc_probe), DEVMETHOD(device_attach, xc_attach), - {0, 0} + + DEVMETHOD_END }; static driver_t xc_driver = {