Since DELAY() was moved, most <machine/clock.h> #includes have been

unnecessary.

sys/amd64/amd64/mp_machdep.c

@@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_extern.h>
 
 #include <machine/apicreg.h>
-#include <machine/clock.h>
 #include <machine/md_var.h>
 #include <machine/mp_watchdog.h>
 #include <machine/pcb.h>

sys/cam/cam_debug.h

@@ -30,10 +30,6 @@
 #ifndef	_CAM_CAM_DEBUG_H
 #define _CAM_CAM_DEBUG_H 1
 
-#if defined(CAMDEBUG) && defined(_KERNEL)
-#include <machine/clock.h>
-#endif /* CAMDEBUG && _KERNEL */
-
 /*
  * Debugging flags.
  */

sys/coda/cnode.h

@@ -49,7 +49,6 @@
 
 #include <sys/vnode.h>
 #include <sys/lock.h>
-#include <machine/clock.h>
 
 MALLOC_DECLARE(M_CODA);
 

sys/compat/ndis/subr_hal.c

@@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/module.h>
 
 #include <sys/systm.h>
-#include <machine/clock.h>
 #include <machine/bus.h>
 
 #include <sys/bus.h>

sys/compat/ndis/subr_ntoskrnl.c

@@ -57,7 +57,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysctl.h>
 
 #include <machine/atomic.h>
-#include <machine/clock.h>
 #include <machine/bus.h>
 #include <machine/stdarg.h>
 #include <machine/resource.h>

sys/contrib/dev/oltr/if_oltr.c

@@ -58,7 +58,6 @@
 #include <vm/pmap.h>            /* for vtophys */
 
 #include <machine/bus.h>
-#include <machine/clock.h>
 #include <machine/resource.h>
 
 #include <sys/bus.h>

sys/dev/acpica/Osd/OsdSchedule.c

@@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/malloc.h>
 #include <sys/proc.h>
 #include <sys/taskqueue.h>
-#include <machine/clock.h>
 
 #include <contrib/dev/acpica/acpi.h>
 #include <dev/acpica/acpivar.h>

sys/dev/acpica/acpi.c

@@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/sbuf.h>
 #include <sys/smp.h>
 
-#include <machine/clock.h>
 #include <machine/resource.h>
 #include <machine/bus.h>
 #include <sys/rman.h>

sys/dev/aic7xxx/aic79xx_osm.h

@@ -55,7 +55,6 @@
 #define AIC_PCI_CONFIG 1
 #include <machine/bus.h>
 #include <machine/endian.h>
-#include <machine/clock.h>
 #include <machine/resource.h>
 
 #include <sys/rman.h>

sys/dev/aic7xxx/aic7xxx_osm.h

@@ -62,7 +62,6 @@
 #endif
 #include <machine/bus.h>
 #include <machine/endian.h>
-#include <machine/clock.h>
 #include <machine/resource.h>
 
 #include <sys/rman.h>

sys/dev/an/if_an.c

@@ -99,7 +99,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/syslog.h>
 #endif
 #include <sys/sysctl.h>
-#include <machine/clock.h>	/* for DELAY */  
 
 #include <sys/module.h>
 #include <sys/sysctl.h>

sys/dev/arcmsr/arcmsr.c

@@ -68,7 +68,6 @@
 #include <isa/rtc.h>
 
 #include <machine/bus.h>
-#include <machine/clock.h>
 #include <machine/resource.h>
 #include <machine/atomic.h>
 #include <sys/conf.h>

sys/dev/arl/if_arl.c

@@ -70,7 +70,6 @@ __FBSDID("$FreeBSD$");
 
 #include <net/bpf.h>
 
-#include <machine/clock.h>
 
 #include <dev/arl/if_arlreg.h>
 

sys/dev/arl/if_arl_isa.c

@@ -58,7 +58,6 @@ __FBSDID("$FreeBSD$");
 #include <isa/pnpvar.h>
 #include <isa/isa_common.h>
 
-#include <machine/clock.h>
 #include <machine/md_var.h>
 #include <vm/vm.h>
 #include <vm/pmap.h>

sys/dev/bce/if_bcereg.h

@@ -63,7 +63,6 @@
 #include <netinet/in.h>
 #include <netinet/ip.h>
 
-#include <machine/clock.h>      /* for DELAY */
 #include <machine/bus.h>
 #include <machine/resource.h>
 #include <sys/bus.h>

sys/dev/bfe/if_bfe.c

@@ -53,7 +53,6 @@ __FBSDID("$FreeBSD$");
 #include <netinet/in.h>
 #include <netinet/ip.h>
 
-#include <machine/clock.h>      /* for DELAY */
 #include <machine/bus.h>
 #include <machine/resource.h>
 #include <sys/bus.h>

sys/dev/bge/if_bge.c

@@ -95,7 +95,6 @@ __FBSDID("$FreeBSD$");
 #include <netinet/in.h>
 #include <netinet/ip.h>
 
-#include <machine/clock.h>      /* for DELAY */
 #include <machine/bus.h>
 #include <machine/resource.h>
 #include <sys/bus.h>

sys/dev/ciss/ciss.c

@@ -93,7 +93,6 @@
 #include <cam/scsi/scsi_all.h>
 #include <cam/scsi/scsi_message.h>
 
-#include <machine/clock.h>
 #include <machine/bus.h>
 #include <machine/endian.h>
 #include <machine/resource.h>

sys/dev/cnw/if_cnw.c

@@ -246,7 +246,6 @@ struct cfattach cnw_ca = {
 
 #include <machine/bus.h>
 #include <machine/resource.h>
-#include <machine/clock.h>
 #include <machine/md_var.h>
 #include <sys/rman.h>
 

sys/dev/cpufreq/ichss.c

@@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$");
 
 #include <dev/pci/pcivar.h>
 #include <machine/bus.h>
-#include <machine/clock.h>
 #include <machine/resource.h>
 #include <sys/rman.h>
 

sys/dev/ct/bshw_machdep.c

@@ -75,7 +75,6 @@ __FBSDID("$FreeBSD$");
 
 #ifdef __FreeBSD__
 #include <machine/bus.h>
-#include <machine/clock.h>
 #include <machine/md_var.h>
 
 #include <compat/netbsd/dvcfg.h>

sys/dev/ctau/if_ct.c

@@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$");
 #include <net/if.h>
 #include <machine/cpufunc.h>
 #include <machine/cserial.h>
-#include <machine/clock.h>
 #include <machine/resource.h>
 #include <dev/cx/machdep.h>
 #include <dev/ctau/ctddk.h>

sys/dev/cx/if_cx.c

@@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$");
 #include <net/if.h>
 #include <machine/cpufunc.h>
 #include <machine/cserial.h>
-#include <machine/clock.h>
 #include <machine/resource.h>
 #include <dev/cx/machdep.h>
 #include <dev/cx/cxddk.h>

sys/dev/dpt/dpt_scsi.c

@@ -63,7 +63,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/resource.h>
 #include <sys/rman.h>
 
-#include <machine/clock.h>
 
 #include <cam/cam.h>
 #include <cam/cam_ccb.h>

sys/dev/ed/if_ed_cbus.c

@@ -37,7 +37,6 @@
 #include <machine/bus.h>
 #include <sys/rman.h>
 #include <machine/resource.h>
-#include <machine/clock.h>
 
 #include <net/ethernet.h>
 #include <net/if.h>

sys/dev/fb/boot_font.c

@@ -61,7 +61,6 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/md_var.h>
 #include <machine/pc/bios.h>
-#include <machine/clock.h>
 #include <machine/bus.h>
 #include <machine/pc/vesa.h>
 #include <machine/resource.h>

sys/dev/fb/gfb.c

@@ -70,7 +70,6 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/md_var.h>
 #include <machine/pc/bios.h>
-#include <machine/clock.h>
 #include <machine/bus.h>
 #include <machine/pc/vesa.h>
 #include <machine/resource.h>

sys/dev/fxp/if_fxp.c

@@ -62,7 +62,6 @@ __FBSDID("$FreeBSD$");
 #include <net/ethernet.h>
 #include <net/if_arp.h>
 
-#include <machine/clock.h>	/* for DELAY */
 
 #include <net/if_types.h>
 #include <net/if_vlan_var.h>

sys/dev/gfb/gfb_pci.c

@@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/md_var.h>
 #include <machine/pc/bios.h>
-#include <machine/clock.h>
 #include <machine/bus.h>
 #include <machine/pc/vesa.h>
 #include <machine/resource.h>

sys/dev/hifn/hifn7751.c

@@ -63,7 +63,6 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm.h>
 #include <vm/pmap.h>
 
-#include <machine/clock.h>
 #include <machine/bus.h>
 #include <machine/resource.h>
 #include <sys/bus.h>

sys/dev/hptmv/entry.c

@@ -50,7 +50,6 @@
 #else 
 #include <pci/pcireg.h>
 #include <pci/pcivar.h>
-#include <machine/clock.h>
 #include <sys/wait.h>
 #include <sys/sysproto.h>
 #endif

sys/dev/idt/idt.c

@@ -95,7 +95,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/proc.h>
 #include <sys/signalvar.h>
 #include <sys/mman.h>
-#include <machine/clock.h>
 #include <machine/cpu.h>	/* bootverbose */
 
 #include <sys/bus.h>

sys/dev/ie/if_ie_isa.c

@@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/resource.h>
 #include <sys/rman.h>
 
-#include <machine/clock.h>
 #include <machine/md_var.h>
 
 #include <net/if.h>

sys/dev/iir/iir.c

@@ -57,7 +57,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 
 #include <machine/bus.h>
-#include <machine/clock.h>
 #include <machine/stdarg.h>
 
 #include <cam/cam.h>

sys/dev/iir/iir_pci.c

@@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h> 
 #include <machine/resource.h>
-#include <machine/clock.h>
 #include <sys/rman.h>
 
 #include <dev/pci/pcireg.h>

sys/dev/ipmi/ipmi.c

@@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 #include <machine/resource.h>
-#include <machine/clock.h>
 #include <sys/rman.h>
 #include <sys/watchdog.h>
 #include <sys/sysctl.h>

sys/dev/ips/ips.c

@@ -32,7 +32,6 @@ __FBSDID("$FreeBSD$");
 #include <dev/ips/ips.h>
 #include <sys/stat.h>
 #include <sys/time.h>
-#include <machine/clock.h>
 
 static d_open_t ips_open;
 static d_close_t ips_close;

sys/dev/ipw/if_ipw.c

@@ -53,7 +53,6 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 #include <machine/resource.h>
-#include <machine/clock.h>
 #include <sys/rman.h>
 
 #include <dev/pci/pcireg.h>

sys/dev/isp/isp_freebsd.h

@@ -57,7 +57,6 @@
 #include <sys/bus.h>
 
 #include <machine/bus.h>
-#include <machine/clock.h>
 #include <machine/cpu.h>
 
 #include <cam/cam.h>

sys/dev/iwi/if_iwi.c

@@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 #include <machine/resource.h>
-#include <machine/clock.h>
 #include <sys/rman.h>
 
 #include <dev/pci/pcireg.h>

sys/dev/ixgb/if_ixgb.h

@@ -67,7 +67,6 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <machine/bus.h>
 #include <sys/rman.h>
 #include <machine/resource.h>
-#include <machine/clock.h>
 #if __FreeBSD_version >= 502000
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>

sys/dev/ixgb/if_ixgb_osdep.h

@@ -48,7 +48,6 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <machine/bus.h>
 #include <sys/rman.h>
 #include <machine/resource.h>
-#include <machine/clock.h>
 #if __FreeBSD_version >= 502000
         #include <dev/pci/pcivar.h>
         #include <dev/pci/pcireg.h>

sys/dev/lge/if_lge.c

@@ -89,7 +89,6 @@ __FBSDID("$FreeBSD$");
 
 #include <vm/vm.h>              /* for vtophys */
 #include <vm/pmap.h>            /* for vtophys */
-#include <machine/clock.h>      /* for DELAY */
 #include <machine/bus.h>
 #include <machine/resource.h>
 #include <sys/bus.h>

sys/dev/lmc/if_lmc.c

@@ -110,7 +110,6 @@
 # include <net/netisr.h>
 # include <machine/bus.h>
 # include <machine/resource.h>
-# include <machine/clock.h>
 # include <sys/rman.h>
 # include <vm/vm.h>
 # include <vm/pmap.h>

sys/dev/mii/brgphy.c

@@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <sys/bus.h>
 
-#include <machine/clock.h>
 
 #include <net/if.h>
 #include <net/ethernet.h>

sys/dev/mii/ciphy.c

@@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <sys/bus.h>
 
-#include <machine/clock.h>
 
 #include <net/if.h>
 #include <net/if_arp.h>

sys/dev/mii/e1000phy.c

@@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <sys/bus.h>
 
-#include <machine/clock.h>
 
 #include <net/if.h>
 #include <net/if_media.h>

sys/dev/mii/nsgphy.c

@@ -61,7 +61,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <sys/bus.h>
 
-#include <machine/clock.h>
 
 #include <net/if.h>
 #include <net/if_media.h>

sys/dev/mii/rgephy.c

@@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <sys/bus.h>
 
-#include <machine/clock.h>
 
 #include <net/if.h>
 #include <net/if_arp.h>

sys/dev/mii/tdkphy.c

@@ -54,7 +54,6 @@ __FBSDID("$FreeBSD$");
 #include <net/if.h>
 #include <net/if_media.h>
 
-#include <machine/clock.h>
 
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>

sys/dev/mpt/mpt.h

@@ -117,7 +117,6 @@
 #include <sys/bus.h>
 #include <sys/module.h>
 
-#include <machine/clock.h>
 #include <machine/cpu.h>
 #include <machine/resource.h>
 

sys/dev/mse/mse.c

@@ -82,7 +82,6 @@
 #include <sys/mouse.h>
 
 #include <machine/bus.h>
-#include <machine/clock.h>
 #include <machine/resource.h>
 #include <sys/rman.h>
 

sys/dev/mse/mse_cbus.c

@@ -82,7 +82,6 @@
 #include <sys/mouse.h>
 
 #include <machine/bus.h>
-#include <machine/clock.h>
 #include <machine/resource.h>
 #include <sys/rman.h>
 

sys/dev/mse/mse_isa.c

@@ -82,7 +82,6 @@
 #include <sys/mouse.h>
 
 #include <machine/bus.h>
-#include <machine/clock.h>
 #include <machine/resource.h>
 #include <sys/rman.h>
 

sys/dev/mxge/if_mxge.c

@@ -66,7 +66,6 @@ __FBSDID("$FreeBSD$");
 #include <netinet/in.h>
 #include <netinet/ip.h>
 
-#include <machine/clock.h>      /* for DELAY */
 #include <machine/bus.h>
 #include <machine/resource.h>
 #include <sys/bus.h>

sys/dev/my/if_my.c

@@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$");
 
 #include <vm/vm.h>		/* for vtophys */
 #include <vm/pmap.h>		/* for vtophys */
-#include <machine/clock.h>	/* for DELAY */
 #include <machine/bus.h>
 #include <machine/resource.h>
 #include <sys/bus.h>

sys/dev/myri10ge/if_myri10ge.c

@@ -66,7 +66,6 @@ __FBSDID("$FreeBSD$");
 #include <netinet/in.h>
 #include <netinet/ip.h>
 
-#include <machine/clock.h>      /* for DELAY */
 #include <machine/bus.h>
 #include <machine/resource.h>
 #include <sys/bus.h>

sys/dev/ncv/ncr53c500.c

@@ -73,7 +73,6 @@ __FBSDID("$FreeBSD$");
 #endif /* __NetBSD__ */
 
 #ifdef __FreeBSD__
-#include <machine/clock.h>
 #include <machine/cpu.h>
 #include <machine/bus.h>
 

sys/dev/nge/if_nge.c

@@ -113,7 +113,6 @@ __FBSDID("$FreeBSD$");
 
 #include <vm/vm.h>              /* for vtophys */
 #include <vm/pmap.h>            /* for vtophys */
-#include <machine/clock.h>      /* for DELAY */
 #include <machine/bus.h>
 #include <machine/resource.h>
 #include <sys/bus.h>

sys/dev/nsp/nsp.c

@@ -72,7 +72,6 @@ __FBSDID("$FreeBSD$");
 #endif /* __NetBSD__ */
 
 #ifdef __FreeBSD__
-#include <machine/clock.h>
 #include <machine/cpu.h>
 #include <machine/bus.h>
 

sys/dev/nve/if_nve.c

@@ -99,7 +99,6 @@ __FBSDID("$FreeBSD$");
 
 #include <vm/vm.h>		/* for vtophys */
 #include <vm/pmap.h>		/* for vtophys */
-#include <machine/clock.h>	/* for DELAY */
 #include <sys/bus.h>
 #include <sys/rman.h>
 

sys/dev/pbio/pbio.c

@@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/module.h>
 #include <machine/bus.h>
 #include <machine/resource.h>
-#include <machine/clock.h>	/* DELAY() */
 #include <sys/rman.h>
 #include <dev/pbio/pbioio.h>		/* pbio IOCTL definitions */
 #include <sys/uio.h>

sys/dev/pccbb/pccbb.c

@@ -96,7 +96,6 @@ __FBSDID("$FreeBSD$");
 
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
-#include <machine/clock.h>
 
 #include <dev/pccard/pccardreg.h>
 #include <dev/pccard/pccardvar.h>

sys/dev/pccbb/pccbb_pci.c

@@ -93,7 +93,6 @@ __FBSDID("$FreeBSD$");
 
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
-#include <machine/clock.h>
 
 #include <dev/pccard/pccardreg.h>
 #include <dev/pccard/pccardvar.h>

sys/dev/pdq/pdq_freebsd.h

@@ -62,7 +62,6 @@
 
 #include <vm/vm.h>              /* for vtophys */
 #include <vm/pmap.h>            /* for vtophys */
-#include <machine/clock.h>      /* for DELAY */
 
 #endif	/* PDQ_HWSUPPORT */
 

sys/dev/pdq/pdqvar.h

@@ -88,7 +88,6 @@ enum _pdq_type_t {
 #include <vm/pmap.h>
 #include <vm/vm_extern.h>
 #include <machine/cpufunc.h>
-#include <machine/clock.h>
 #define	ifnet_ret_t void
 typedef int ioctl_cmd_t;
 typedef enum { PDQ_BUS_EISA, PDQ_BUS_PCI } pdq_bus_t;

sys/dev/ppbus/vpoio.c

@@ -37,7 +37,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 #include <sys/malloc.h>
 
-#include <machine/clock.h>
 
 #endif
 

sys/dev/ral/if_ral_pci.c

@@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 #include <machine/resource.h>
-#include <machine/clock.h>
 #include <sys/rman.h>
 
 #include <net/bpf.h>

sys/dev/ral/rt2560.c

@@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 #include <machine/resource.h>
-#include <machine/clock.h>
 #include <sys/rman.h>
 
 #include <net/bpf.h>

sys/dev/ral/rt2661.c

@@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 #include <machine/resource.h>
-#include <machine/clock.h>
 #include <sys/rman.h>
 
 #include <net/bpf.h>

sys/dev/safe/safe.c

@@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm.h>
 #include <vm/pmap.h>
 
-#include <machine/clock.h>
 #include <machine/bus.h>
 #include <machine/resource.h>
 #include <sys/bus.h>

sys/dev/sbsh/if_sbsh.c

@@ -37,7 +37,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/proc.h>
 #include <sys/socket.h>
 #include <sys/random.h>
-#include <machine/clock.h>
 #include <machine/stdarg.h>
 
 #include <net/if.h>

sys/dev/sound/pcm/sound.h

@@ -55,7 +55,6 @@
 #if __FreeBSD_version < 500000
 #include <sys/buf.h>
 #endif
-#include <machine/clock.h>	/* for DELAY */
 #include <machine/resource.h>
 #include <machine/bus.h>
 #include <sys/rman.h>

sys/dev/stg/tmc18c30.c

@@ -71,7 +71,6 @@ __FBSDID("$FreeBSD$");
 #endif /* __NetBSD__ */
 
 #ifdef __FreeBSD__
-#include <machine/clock.h>
 #include <machine/cpu.h>
 #include <machine/bus.h>
 

sys/dev/trm/trm.c

@@ -83,7 +83,6 @@ __FBSDID("$FreeBSD$");
 #include <dev/pci/pcireg.h>
 #include <machine/resource.h>
 #include <machine/bus.h>
-#include <machine/clock.h>
 #include <sys/rman.h>
 
 #include <cam/cam.h>

sys/dev/tx/if_tx.c

@@ -61,7 +61,6 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 #include <machine/resource.h>
-#include <machine/clock.h>	/* for DELAY */
 #include <sys/bus.h>
 #include <sys/rman.h>
 

sys/dev/txp/if_txp.c

@@ -73,7 +73,6 @@ __FBSDID("$FreeBSD$");
 
 #include <vm/vm.h>              /* for vtophys */
 #include <vm/pmap.h>            /* for vtophys */
-#include <machine/clock.h>	/* for DELAY */
 #include <machine/bus.h>
 #include <machine/resource.h>
 #include <sys/bus.h>

sys/dev/ubsec/ubsec.c

@@ -63,7 +63,6 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm.h>
 #include <vm/pmap.h>
 
-#include <machine/clock.h>
 #include <machine/bus.h>
 #include <machine/resource.h>
 #include <sys/bus.h>

sys/dev/usb/ehci.c

@@ -94,7 +94,6 @@ __FBSDID("$FreeBSD$");
 #include <dev/usb/ehcivar.h>
 
 #if defined(__FreeBSD__)
-#include <machine/clock.h>
 
 #define delay(d)                DELAY(d)
 #endif

sys/dev/usb/if_ural.c

@@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 #include <machine/resource.h>
-#include <machine/clock.h>
 #include <sys/rman.h>
 
 #include <net/bpf.h>

sys/dev/usb/ohci.c

@@ -91,7 +91,6 @@ __FBSDID("$FreeBSD$");
 #include <dev/usb/ohcivar.h>
 
 #if defined(__FreeBSD__)
-#include <machine/clock.h>
 
 #define delay(d)                DELAY(d)
 #endif

sys/dev/usb/uhci.c

@@ -96,7 +96,6 @@ __FBSDID("$FreeBSD$");
 /*#define UHCI_CTL_LOOP */
 
 #if defined(__FreeBSD__)
-#include <machine/clock.h>
 
 #define delay(d)		DELAY(d)
 #endif

sys/dev/usb/usb_subr.c

@@ -77,7 +77,6 @@ __FBSDID("$FreeBSD$");
 #include <dev/usb/usb_quirks.h>
 
 #if defined(__FreeBSD__)
-#include <machine/clock.h>
 #define delay(d)         DELAY(d)
 #endif
 

sys/dev/usb/usbdi.c

@@ -67,7 +67,6 @@ __FBSDID("$FreeBSD$");
 
 #if defined(__FreeBSD__)
 #include "usb_if.h"
-#include <machine/clock.h>
 #define delay(d)	DELAY(d)
 #endif
 

sys/dev/wds/wd7000.c

@@ -144,7 +144,6 @@ __FBSDID("$FreeBSD$");
 #include <cam/scsi/scsi_all.h>
 #include <cam/scsi/scsi_message.h>
 
-#include <machine/clock.h>
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>

sys/dev/wi/if_wi.c

@@ -87,7 +87,6 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 #include <machine/resource.h>
-#include <machine/clock.h>
 #include <machine/atomic.h>
 #include <sys/rman.h>
 

sys/dev/wi/if_wi_pci.c

@@ -49,7 +49,6 @@
 
 #include <machine/bus.h>
 #include <machine/resource.h>
-#include <machine/clock.h>
 #include <sys/rman.h>
 
 #include <dev/pci/pcireg.h>

sys/fs/coda/cnode.h

@@ -49,7 +49,6 @@
 
 #include <sys/vnode.h>
 #include <sys/lock.h>
-#include <machine/clock.h>
 
 MALLOC_DECLARE(M_CODA);
 

sys/fs/smbfs/smbfs_subr.c

@@ -35,7 +35,6 @@
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
-#include <machine/clock.h>
 #include <sys/time.h>
 #include <sys/vnode.h>
 #include <sys/sysctl.h>

sys/i386/cpufreq/powernow.c

@@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/md_var.h>
 #include <machine/specialreg.h>
 #include <machine/cputypes.h>
-#include <machine/clock.h>
 #include <machine/vmparam.h>
 #include <sys/rman.h>
 

sys/i386/i386/mp_machdep.c

@@ -71,7 +71,6 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_extern.h>
 
 #include <machine/apicreg.h>
-#include <machine/clock.h>
 #include <machine/md_var.h>
 #include <machine/mp_watchdog.h>
 #include <machine/pcb.h>

sys/i386/isa/npx.c

@@ -62,7 +62,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/md_var.h>
 #include <machine/pcb.h>
 #include <machine/psl.h>
-#include <machine/clock.h>
 #include <machine/resource.h>
 #include <machine/specialreg.h>
 #include <machine/segments.h>

sys/i386/isa/spic.c

@@ -63,7 +63,6 @@ __FBSDID("$FreeBSD$");
 #include <isa/isavar.h>
 #include <sys/poll.h>
 #include <machine/pci_cfgreg.h>
-#include <machine/clock.h>
 #include <sys/tty.h>
 #include <sys/conf.h>
 #include <sys/fcntl.h>

sys/i4b/capi/iavc/iavc_card.c

@@ -37,7 +37,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <net/if.h>
 
-#include <machine/clock.h>
 
 #include <machine/bus.h>
 #include <machine/resource.h>

sys/i4b/capi/iavc/iavc_isa.c

@@ -33,7 +33,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <net/if.h>
 
-#include <machine/clock.h>
 
 #include <machine/bus.h>
 #include <machine/resource.h>

sys/i4b/capi/iavc/iavc_lli.c

@@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/malloc.h>
 #include <net/if.h>
 
-#include <machine/clock.h>
 
 #include <machine/bus.h>
 #include <sys/bus.h>

sys/i4b/capi/iavc/iavc_pci.c

@@ -37,7 +37,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <net/if.h>
 
-#include <machine/clock.h>
 
 #include <machine/bus.h>
 #include <machine/resource.h>

sys/i4b/layer1/itjc/i4b_itjc_isac.c

@@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 
 #include <machine/stdarg.h>
-#include <machine/clock.h>
 
 #include <net/if.h>
 

sys/i4b/layer1/itjc/i4b_itjc_l1.c

@@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 
 #include <machine/stdarg.h>
-#include <machine/clock.h>
 
 #include <net/if.h>
 

sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c

@@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 
 #include <machine/stdarg.h>
-#include <machine/clock.h>
 
 #include <net/if.h>