summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorad <ad@NetBSD.org>2007-10-19 11:59:34 +0000
committerad <ad@NetBSD.org>2007-10-19 11:59:34 +0000
commita2a3828545f06ae25986dcfcd3831f7308c09784 (patch)
tree1ae2eaf3967585225c706634df5ff7207bbfa6b8 /sys/dev
parent1ba4d2957ab5b24977347329a3bb4ad8491f12e4 (diff)
machine/{bus,cpu,intr}.h -> sys/{bus,cpu,intr}.h
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/acpi/acpi_ec.c6
-rw-r--r--sys/dev/acpi/acpivar.h4
-rw-r--r--sys/dev/acpi/atppc_acpi.c6
-rw-r--r--sys/dev/acpi/attimer_acpi.c6
-rw-r--r--sys/dev/acpi/com_acpi.c6
-rw-r--r--sys/dev/acpi/fdc_acpi.c8
-rw-r--r--sys/dev/acpi/hpet_acpi.c6
-rw-r--r--sys/dev/acpi/joy_acpi.c6
-rw-r--r--sys/dev/acpi/lpt_acpi.c6
-rw-r--r--sys/dev/acpi/mpu_acpi.c6
-rw-r--r--sys/dev/acpi/pckbc_acpi.c6
-rw-r--r--sys/dev/acpi/pcppi_acpi.c6
-rw-r--r--sys/dev/acpi/ug_acpi.c6
-rw-r--r--sys/dev/acpi/wss_acpi.c6
-rw-r--r--sys/dev/acpi/ym_acpi.c6
-rw-r--r--sys/dev/adb/adb_bus.c6
-rw-r--r--sys/dev/ata/ata.c8
-rw-r--r--sys/dev/ata/ata_wdc.c8
-rw-r--r--sys/dev/ata/satavar.h4
-rw-r--r--sys/dev/ata/wd.c8
-rw-r--r--sys/dev/bi/bi.c8
-rw-r--r--sys/dev/bi/if_ni.c6
-rw-r--r--sys/dev/bi/kdb.c6
-rw-r--r--sys/dev/bluetooth/btuart.c8
-rw-r--r--sys/dev/cardbus/adv_cardbus.c8
-rw-r--r--sys/dev/cardbus/ahc_cardbus.c8
-rw-r--r--sys/dev/cardbus/cardbus.c6
-rw-r--r--sys/dev/cardbus/cardbus_exrom.c6
-rw-r--r--sys/dev/cardbus/cardbus_map.c6
-rw-r--r--sys/dev/cardbus/cardslot.c6
-rw-r--r--sys/dev/cardbus/ehci_cardbus.c6
-rw-r--r--sys/dev/cardbus/fwohci_cardbus.c6
-rw-r--r--sys/dev/cardbus/if_ath_cardbus.c8
-rw-r--r--sys/dev/cardbus/if_atw_cardbus.c8
-rw-r--r--sys/dev/cardbus/if_ex_cardbus.c8
-rw-r--r--sys/dev/cardbus/if_fxp_cardbus.c8
-rw-r--r--sys/dev/cardbus/if_ral_cardbus.c8
-rw-r--r--sys/dev/cardbus/if_re_cardbus.c6
-rw-r--r--sys/dev/cardbus/if_rtk_cardbus.c6
-rw-r--r--sys/dev/cardbus/if_rtw_cardbus.c8
-rw-r--r--sys/dev/cardbus/if_tlp_cardbus.c8
-rw-r--r--sys/dev/cardbus/njata_cardbus.c8
-rw-r--r--sys/dev/cardbus/njs_cardbus.c8
-rw-r--r--sys/dev/cardbus/ohci_cardbus.c6
-rw-r--r--sys/dev/cardbus/rbus.c6
-rw-r--r--sys/dev/cardbus/rbus.h4
-rw-r--r--sys/dev/cardbus/rbus_ppb.c8
-rw-r--r--sys/dev/cardbus/uhci_cardbus.c6
-rw-r--r--sys/dev/dec/dz.c6
-rw-r--r--sys/dev/dec/dzkbd.c6
-rw-r--r--sys/dev/dec/dzms.c6
-rw-r--r--sys/dev/dec/if_le_dec.c6
-rw-r--r--sys/dev/drm/drmP.h2
-rw-r--r--sys/dev/ebus/cs4231_ebus.c6
-rw-r--r--sys/dev/eisa/ahb.c8
-rw-r--r--sys/dev/eisa/ahc_eisa.c8
-rw-r--r--sys/dev/eisa/bha_eisa.c8
-rw-r--r--sys/dev/eisa/cac_eisa.c8
-rw-r--r--sys/dev/eisa/depca_eisa.c8
-rw-r--r--sys/dev/eisa/dpt_eisa.c8
-rw-r--r--sys/dev/eisa/eisa.c6
-rw-r--r--sys/dev/eisa/eisavar.h4
-rw-r--r--sys/dev/eisa/if_ep_eisa.c10
-rw-r--r--sys/dev/eisa/if_fea.c8
-rw-r--r--sys/dev/eisa/if_tlp_eisa.c8
-rw-r--r--sys/dev/eisa/mlx_eisa.c8
-rw-r--r--sys/dev/eisa/uha_eisa.c8
-rw-r--r--sys/dev/hpc/bicons.c6
-rw-r--r--sys/dev/hpc/bivideo.c6
-rw-r--r--sys/dev/hpc/btnmgr.c6
-rw-r--r--sys/dev/hpc/button.c6
-rw-r--r--sys/dev/hpc/hpcapm.c6
-rw-r--r--sys/dev/hpc/hpcfb.c6
-rw-r--r--sys/dev/hpc/hpcin.c6
-rw-r--r--sys/dev/hpc/hpcioman.c6
-rw-r--r--sys/dev/hpc/hpckbd.c8
-rw-r--r--sys/dev/hpc/hpcout.c6
-rw-r--r--sys/dev/hpc/pwctl.c6
-rw-r--r--sys/dev/i2c/at24cxx.c4
-rw-r--r--sys/dev/i2c/ddc.c6
-rw-r--r--sys/dev/i2c/m41t00.c4
-rw-r--r--sys/dev/i2o/dpti.c6
-rw-r--r--sys/dev/i2o/iop.c7
-rw-r--r--sys/dev/i2o/iopl.c6
-rw-r--r--sys/dev/i2o/iopsp.c6
-rw-r--r--sys/dev/i2o/ld_iop.c6
-rw-r--r--sys/dev/ic/aac.c6
-rw-r--r--sys/dev/ic/acpipmtimer.c6
-rw-r--r--sys/dev/ic/ad1848.c8
-rw-r--r--sys/dev/ic/adv.c8
-rw-r--r--sys/dev/ic/advlib.c8
-rw-r--r--sys/dev/ic/adw.c8
-rw-r--r--sys/dev/ic/adwlib.c8
-rw-r--r--sys/dev/ic/adwmcode.c8
-rw-r--r--sys/dev/ic/aha.c8
-rw-r--r--sys/dev/ic/aic6360.c8
-rw-r--r--sys/dev/ic/aic6915.c8
-rw-r--r--sys/dev/ic/aic77xx.c8
-rw-r--r--sys/dev/ic/aic79xx_osm.h10
-rw-r--r--sys/dev/ic/aic7xxx_osm.h6
-rw-r--r--sys/dev/ic/aic7xxx_seeprom.c10
-rw-r--r--sys/dev/ic/am7930.c8
-rw-r--r--sys/dev/ic/am79c930.c10
-rw-r--r--sys/dev/ic/an.c6
-rw-r--r--sys/dev/ic/ath.c6
-rw-r--r--sys/dev/ic/ath_netbsd.c6
-rw-r--r--sys/dev/ic/athrate-amrr.c6
-rw-r--r--sys/dev/ic/athrate-onoe.c6
-rw-r--r--sys/dev/ic/athrate-sample.c6
-rw-r--r--sys/dev/ic/atppc.c8
-rw-r--r--sys/dev/ic/atppcvar.h4
-rw-r--r--sys/dev/ic/attimer.c6
-rw-r--r--sys/dev/ic/atw.c8
-rw-r--r--sys/dev/ic/awi.c8
-rw-r--r--sys/dev/ic/ax88190.c6
-rw-r--r--sys/dev/ic/bha.c8
-rw-r--r--sys/dev/ic/cac.c6
-rw-r--r--sys/dev/ic/cd18xx.c6
-rw-r--r--sys/dev/ic/ciss.c6
-rw-r--r--sys/dev/ic/clmpcc.c6
-rw-r--r--sys/dev/ic/com.c6
-rw-r--r--sys/dev/ic/com_cpcbus.c6
-rw-r--r--sys/dev/ic/com_upc.c8
-rw-r--r--sys/dev/ic/cpc700.c6
-rw-r--r--sys/dev/ic/cs4231.c6
-rw-r--r--sys/dev/ic/cs89x0.c8
-rw-r--r--sys/dev/ic/cy.c6
-rw-r--r--sys/dev/ic/daic.c4
-rw-r--r--sys/dev/ic/depca.c10
-rw-r--r--sys/dev/ic/dl10019.c8
-rw-r--r--sys/dev/ic/dp8390.c6
-rw-r--r--sys/dev/ic/dp83905.c6
-rw-r--r--sys/dev/ic/dp83932.c8
-rw-r--r--sys/dev/ic/dpt.c6
-rw-r--r--sys/dev/ic/elink3.c10
-rw-r--r--sys/dev/ic/elinkxl.c10
-rw-r--r--sys/dev/ic/esiop.c6
-rw-r--r--sys/dev/ic/fmv.c6
-rw-r--r--sys/dev/ic/gem.c8
-rw-r--r--sys/dev/ic/hd44780_subr.c8
-rw-r--r--sys/dev/ic/hd64570.c10
-rw-r--r--sys/dev/ic/hme.c6
-rw-r--r--sys/dev/ic/hpet.c6
-rw-r--r--sys/dev/ic/hscx.c6
-rw-r--r--sys/dev/ic/i128.c6
-rw-r--r--sys/dev/ic/i82365.c8
-rw-r--r--sys/dev/ic/i82557.c8
-rw-r--r--sys/dev/ic/i82586.c6
-rw-r--r--sys/dev/ic/i82596.c8
-rw-r--r--sys/dev/ic/iavc.c6
-rw-r--r--sys/dev/ic/icp.c6
-rw-r--r--sys/dev/ic/icp_ioctl.c6
-rw-r--r--sys/dev/ic/icpsp.c6
-rw-r--r--sys/dev/ic/igsfb.c6
-rw-r--r--sys/dev/ic/igsfb_subr.c6
-rw-r--r--sys/dev/ic/iha.c8
-rw-r--r--sys/dev/ic/iic_cpcbus.c6
-rw-r--r--sys/dev/ic/intersil7170.c6
-rw-r--r--sys/dev/ic/interwave.c8
-rw-r--r--sys/dev/ic/isac.c6
-rw-r--r--sys/dev/ic/isacsx.c8
-rw-r--r--sys/dev/ic/isic.c6
-rw-r--r--sys/dev/ic/isic_bchan.c6
-rw-r--r--sys/dev/ic/isic_l1.c6
-rw-r--r--sys/dev/ic/isic_l1fsm.c6
-rw-r--r--sys/dev/ic/isp_netbsd.h4
-rw-r--r--sys/dev/ic/joy.c6
-rw-r--r--sys/dev/ic/lcdkp_subr.c8
-rw-r--r--sys/dev/ic/ld_aac.c6
-rw-r--r--sys/dev/ic/ld_cac.c6
-rw-r--r--sys/dev/ic/ld_icp.c6
-rw-r--r--sys/dev/ic/ld_mlx.c6
-rw-r--r--sys/dev/ic/lemac.c6
-rw-r--r--sys/dev/ic/lm700x.h4
-rw-r--r--sys/dev/ic/lpt.c6
-rw-r--r--sys/dev/ic/lpt_upc.c8
-rw-r--r--sys/dev/ic/lsi64854.c8
-rw-r--r--sys/dev/ic/matrixkp_subr.c6
-rw-r--r--sys/dev/ic/mb86950.c6
-rw-r--r--sys/dev/ic/mb86960.c6
-rw-r--r--sys/dev/ic/mb89352.c8
-rw-r--r--sys/dev/ic/mc146818.c6
-rw-r--r--sys/dev/ic/mfi.c6
-rw-r--r--sys/dev/ic/midway.c6
-rw-r--r--sys/dev/ic/mk48txx.c6
-rw-r--r--sys/dev/ic/mlx.c6
-rw-r--r--sys/dev/ic/mm58167.c6
-rw-r--r--sys/dev/ic/mpt_netbsd.h6
-rw-r--r--sys/dev/ic/mpu.c10
-rw-r--r--sys/dev/ic/mtd803.c6
-rw-r--r--sys/dev/ic/mx98905.c6
-rw-r--r--sys/dev/ic/ncr5380var.h4
-rw-r--r--sys/dev/ic/ne2000.c6
-rw-r--r--sys/dev/ic/ninjaata32.c8
-rw-r--r--sys/dev/ic/ninjascsi32.c8
-rw-r--r--sys/dev/ic/nslm7x.c8
-rw-r--r--sys/dev/ic/oosiop.c8
-rw-r--r--sys/dev/ic/opl.c8
-rw-r--r--sys/dev/ic/oplinstrs.c6
-rw-r--r--sys/dev/ic/osiop.c8
-rw-r--r--sys/dev/ic/pcdisplay_chars.c6
-rw-r--r--sys/dev/ic/pcdisplay_subr.c6
-rw-r--r--sys/dev/ic/pcf8584.c6
-rw-r--r--sys/dev/ic/pckbc.c6
-rw-r--r--sys/dev/ic/pdqvar.h6
-rw-r--r--sys/dev/ic/rrunner.c10
-rw-r--r--sys/dev/ic/rt2560.c8
-rw-r--r--sys/dev/ic/rt2661.c8
-rw-r--r--sys/dev/ic/rtl80x9.c8
-rw-r--r--sys/dev/ic/rtl8169.c4
-rw-r--r--sys/dev/ic/rtl81x9.c6
-rw-r--r--sys/dev/ic/rtw.c8
-rw-r--r--sys/dev/ic/rtwphy.c6
-rw-r--r--sys/dev/ic/rtwphyio.c6
-rw-r--r--sys/dev/ic/seeq8005.c8
-rw-r--r--sys/dev/ic/sgec.c6
-rw-r--r--sys/dev/ic/siop.c6
-rw-r--r--sys/dev/ic/siop_common.c6
-rw-r--r--sys/dev/ic/sl811hs.c8
-rw-r--r--sys/dev/ic/smc83c170.c8
-rw-r--r--sys/dev/ic/smc90cx6.c8
-rw-r--r--sys/dev/ic/smc91cxx.c8
-rw-r--r--sys/dev/ic/smc93cx6.c6
-rw-r--r--sys/dev/ic/spic.c6
-rw-r--r--sys/dev/ic/sti.c6
-rw-r--r--sys/dev/ic/sunscpalvar.h4
-rw-r--r--sys/dev/ic/tcic2.c8
-rw-r--r--sys/dev/ic/tea5757.h4
-rw-r--r--sys/dev/ic/timer_cpcbus.c6
-rw-r--r--sys/dev/ic/tms320av110.c6
-rw-r--r--sys/dev/ic/tms320av110var.h4
-rw-r--r--sys/dev/ic/tropic.c8
-rw-r--r--sys/dev/ic/tulip.c8
-rw-r--r--sys/dev/ic/ug.c8
-rw-r--r--sys/dev/ic/uha.c8
-rw-r--r--sys/dev/ic/upc.c6
-rw-r--r--sys/dev/ic/upcvar.h4
-rw-r--r--sys/dev/ic/vga.c6
-rw-r--r--sys/dev/ic/vga_common.c6
-rw-r--r--sys/dev/ic/vga_raster.c6
-rw-r--r--sys/dev/ic/vga_subr.c6
-rw-r--r--sys/dev/ic/wd33c93.c6
-rw-r--r--sys/dev/ic/wdc.c8
-rw-r--r--sys/dev/ic/wdc_upc.c8
-rw-r--r--sys/dev/ic/we.c8
-rw-r--r--sys/dev/ic/wi.c6
-rw-r--r--sys/dev/ieee1394/firewire.c6
-rw-r--r--sys/dev/ieee1394/fw_port.h4
-rw-r--r--sys/dev/ieee1394/fwdev.c6
-rw-r--r--sys/dev/ieee1394/fwdma.c6
-rw-r--r--sys/dev/ieee1394/fwmem.c6
-rw-r--r--sys/dev/ieee1394/fwohci.c6
-rw-r--r--sys/dev/ieee1394/if_fwip.c6
-rw-r--r--sys/dev/ieee1394/sbp.c6
-rw-r--r--sys/dev/if_ndis/if_ndis.c4
-rw-r--r--sys/dev/if_ndis/if_ndis_pccard.c2
-rw-r--r--sys/dev/if_ndis/if_ndis_pci.c2
-rw-r--r--sys/dev/isa/ad1848_isa.c8
-rw-r--r--sys/dev/isa/addcom_isa.c8
-rw-r--r--sys/dev/isa/adv_isa.c6
-rw-r--r--sys/dev/isa/aha_isa.c8
-rw-r--r--sys/dev/isa/aic_isa.c8
-rw-r--r--sys/dev/isa/aps.c6
-rw-r--r--sys/dev/isa/aria.c8
-rw-r--r--sys/dev/isa/ast.c8
-rw-r--r--sys/dev/isa/atppc_isa.c8
-rw-r--r--sys/dev/isa/atppc_isadma.c8
-rw-r--r--sys/dev/isa/attimer_isa.c6
-rw-r--r--sys/dev/isa/aztech.c6
-rw-r--r--sys/dev/isa/bha_isa.c8
-rw-r--r--sys/dev/isa/boca.c8
-rw-r--r--sys/dev/isa/cec.c6
-rw-r--r--sys/dev/isa/cms.c6
-rw-r--r--sys/dev/isa/com_isa.c8
-rw-r--r--sys/dev/isa/com_multi.c8
-rw-r--r--sys/dev/isa/commultiprint.c4
-rw-r--r--sys/dev/isa/cs89x0isa.c6
-rw-r--r--sys/dev/isa/cy_isa.c8
-rw-r--r--sys/dev/isa/daic_isa.c8
-rw-r--r--sys/dev/isa/depca_isa.c10
-rw-r--r--sys/dev/isa/dpt_isa.c8
-rw-r--r--sys/dev/isa/ega.c6
-rw-r--r--sys/dev/isa/elink.c6
-rw-r--r--sys/dev/isa/esp_isa.c8
-rw-r--r--sys/dev/isa/ess.c10
-rw-r--r--sys/dev/isa/ess_isa.c8
-rw-r--r--sys/dev/isa/fd.c10
-rw-r--r--sys/dev/isa/fdc_isa.c8
-rw-r--r--sys/dev/isa/gus.c10
-rw-r--r--sys/dev/isa/i82365_isa.c8
-rw-r--r--sys/dev/isa/i82365_isasubr.c8
-rw-r--r--sys/dev/isa/ics2101.c6
-rw-r--r--sys/dev/isa/if_ai.c10
-rw-r--r--sys/dev/isa/if_ate.c8
-rw-r--r--sys/dev/isa/if_cs_isa.c8
-rw-r--r--sys/dev/isa/if_ec.c8
-rw-r--r--sys/dev/isa/if_ef.c10
-rw-r--r--sys/dev/isa/if_eg.c10
-rw-r--r--sys/dev/isa/if_el.c10
-rw-r--r--sys/dev/isa/if_ep_isa.c10
-rw-r--r--sys/dev/isa/if_fmv_isa.c8
-rw-r--r--sys/dev/isa/if_hp.c6
-rw-r--r--sys/dev/isa/if_ix.c10
-rw-r--r--sys/dev/isa/if_iy.c10
-rw-r--r--sys/dev/isa/if_lc_isa.c10
-rw-r--r--sys/dev/isa/if_le_isa.c10
-rw-r--r--sys/dev/isa/if_ne_isa.c8
-rw-r--r--sys/dev/isa/if_ntwoc_isa.c12
-rw-r--r--sys/dev/isa/if_sm_isa.c8
-rw-r--r--sys/dev/isa/if_tr_isa.c10
-rw-r--r--sys/dev/isa/if_tribm_isa.c6
-rw-r--r--sys/dev/isa/if_trtcm_isa.c6
-rw-r--r--sys/dev/isa/if_tscs_isa.c8
-rw-r--r--sys/dev/isa/if_we_isa.c8
-rw-r--r--sys/dev/isa/ioat66.c8
-rw-r--r--sys/dev/isa/isa.c6
-rw-r--r--sys/dev/isa/isadma.c6
-rw-r--r--sys/dev/isa/isavar.h4
-rw-r--r--sys/dev/isa/isic_isa.c8
-rw-r--r--sys/dev/isa/isic_isa_avm_a1.c6
-rw-r--r--sys/dev/isa/isic_isa_itk_ix1.c4
-rw-r--r--sys/dev/isa/isic_isa_tel_s016.c6
-rw-r--r--sys/dev/isa/isic_isa_tel_s0163.c6
-rw-r--r--sys/dev/isa/isic_isa_tel_s08.c6
-rw-r--r--sys/dev/isa/isic_isa_usr_sti.c6
-rw-r--r--sys/dev/isa/it.c8
-rw-r--r--sys/dev/isa/joy_ess.c4
-rw-r--r--sys/dev/isa/joy_isa.c6
-rw-r--r--sys/dev/isa/lm_isa.c6
-rw-r--r--sys/dev/isa/lpt_isa.c8
-rw-r--r--sys/dev/isa/mcd.c10
-rw-r--r--sys/dev/isa/midi_pcppi.c6
-rw-r--r--sys/dev/isa/moxa_isa.c8
-rw-r--r--sys/dev/isa/mpu_isa.c6
-rw-r--r--sys/dev/isa/mpu_sb.c6
-rw-r--r--sys/dev/isa/mpu_ym.c6
-rw-r--r--sys/dev/isa/nca_isa.c8
-rw-r--r--sys/dev/isa/nsclpcsio_isa.c6
-rw-r--r--sys/dev/isa/opl_ess.c6
-rw-r--r--sys/dev/isa/opl_isa.c6
-rw-r--r--sys/dev/isa/opl_sb.c6
-rw-r--r--sys/dev/isa/opl_wss.c6
-rw-r--r--sys/dev/isa/opl_ym.c6
-rw-r--r--sys/dev/isa/pas.c10
-rw-r--r--sys/dev/isa/pcdisplay.c6
-rw-r--r--sys/dev/isa/pckbc_isa.c6
-rw-r--r--sys/dev/isa/pcppi.c6
-rw-r--r--sys/dev/isa/radiotrack.c6
-rw-r--r--sys/dev/isa/rtfps.c8
-rw-r--r--sys/dev/isa/satlink.c10
-rw-r--r--sys/dev/isa/sb.c10
-rw-r--r--sys/dev/isa/sb_isa.c6
-rw-r--r--sys/dev/isa/sbdsp.c10
-rw-r--r--sys/dev/isa/seagate.c6
-rw-r--r--sys/dev/isa/slhci_isa.c8
-rw-r--r--sys/dev/isa/smsc.c8
-rw-r--r--sys/dev/isa/spkr.c6
-rw-r--r--sys/dev/isa/tcic2_isa.c8
-rw-r--r--sys/dev/isa/tcom.c8
-rw-r--r--sys/dev/isa/toaster.c6
-rw-r--r--sys/dev/isa/toasterlcd.c6
-rw-r--r--sys/dev/isa/tsdio.c8
-rw-r--r--sys/dev/isa/ug_isa.c8
-rw-r--r--sys/dev/isa/uha_isa.c8
-rw-r--r--sys/dev/isa/wdc_isa.c8
-rw-r--r--sys/dev/isa/wds.c8
-rw-r--r--sys/dev/isa/weasel_isa.c6
-rw-r--r--sys/dev/isa/wss.c10
-rw-r--r--sys/dev/isa/wss_isa.c10
-rw-r--r--sys/dev/isa/wt.c8
-rw-r--r--sys/dev/isa/ym.c10
-rw-r--r--sys/dev/isapnp/aha_isapnp.c6
-rw-r--r--sys/dev/isapnp/aic_isapnp.c6
-rw-r--r--sys/dev/isapnp/atppc_isapnp.c6
-rw-r--r--sys/dev/isapnp/com_isapnp.c6
-rw-r--r--sys/dev/isapnp/ess_isapnp.c6
-rw-r--r--sys/dev/isapnp/gus_isapnp.c6
-rw-r--r--sys/dev/isapnp/i82365_isapnp.c8
-rw-r--r--sys/dev/isapnp/if_an_isapnp.c8
-rw-r--r--sys/dev/isapnp/if_cs_isapnp.c8
-rw-r--r--sys/dev/isapnp/if_ep_isapnp.c10
-rw-r--r--sys/dev/isapnp/if_fmv_isapnp.c8
-rw-r--r--sys/dev/isapnp/if_le_isapnp.c10
-rw-r--r--sys/dev/isapnp/if_ne_isapnp.c8
-rw-r--r--sys/dev/isapnp/if_tr_isapnp.c10
-rw-r--r--sys/dev/isapnp/isapnp.c6
-rw-r--r--sys/dev/isapnp/isapnpdebug.c6
-rw-r--r--sys/dev/isapnp/isapnpres.c6
-rw-r--r--sys/dev/isapnp/isic_isapnp.c8
-rw-r--r--sys/dev/isapnp/isic_isapnp_ctx_s0P.c6
-rw-r--r--sys/dev/isapnp/isic_isapnp_drn_ngo.c6
-rw-r--r--sys/dev/isapnp/isic_isapnp_dynalink.c6
-rw-r--r--sys/dev/isapnp/isic_isapnp_elsa_qs1i.c6
-rw-r--r--sys/dev/isapnp/isic_isapnp_itkix.c6
-rw-r--r--sys/dev/isapnp/isic_isapnp_siemens_isurf.c6
-rw-r--r--sys/dev/isapnp/isic_isapnp_sws.c6
-rw-r--r--sys/dev/isapnp/isic_isapnp_tel_s0P.c6
-rw-r--r--sys/dev/isapnp/joy_isapnp.c6
-rw-r--r--sys/dev/isapnp/mpu_isapnp.c6
-rw-r--r--sys/dev/isapnp/sb_isapnp.c6
-rw-r--r--sys/dev/isapnp/wdc_isapnp.c8
-rw-r--r--sys/dev/isapnp/wss_isapnp.c6
-rw-r--r--sys/dev/marvell/gt.c6
-rw-r--r--sys/dev/marvell/gti2c.c8
-rw-r--r--sys/dev/marvell/gtidma.c8
-rw-r--r--sys/dev/marvell/gtmpsc.c8
-rw-r--r--sys/dev/marvell/gtpci.c8
-rw-r--r--sys/dev/marvell/if_gfe.c6
-rw-r--r--sys/dev/marvell/obio.c6
-rw-r--r--sys/dev/mca/aha_mca.c8
-rw-r--r--sys/dev/mca/com_mca.c8
-rw-r--r--sys/dev/mca/ed_mca.c8
-rw-r--r--sys/dev/mca/edc_mca.c8
-rw-r--r--sys/dev/mca/esp_mca.c8
-rw-r--r--sys/dev/mca/if_ate_mca.c8
-rw-r--r--sys/dev/mca/if_elmc_mca.c6
-rw-r--r--sys/dev/mca/if_ep_mca.c6
-rw-r--r--sys/dev/mca/if_le_mca.c10
-rw-r--r--sys/dev/mca/if_ne_mca.c6
-rw-r--r--sys/dev/mca/if_tra_mca.c8
-rw-r--r--sys/dev/mca/if_we_mca.c6
-rw-r--r--sys/dev/mca/mca.c6
-rw-r--r--sys/dev/mca/mcavar.h4
-rw-r--r--sys/dev/mii/ciphy.c6
-rw-r--r--sys/dev/mii/rlphy.c6
-rw-r--r--sys/dev/mii/tlphy.c6
-rw-r--r--sys/dev/mscp/mscp.c6
-rw-r--r--sys/dev/mscp/mscp_disk.c8
-rw-r--r--sys/dev/mscp/mscp_subr.c6
-rw-r--r--sys/dev/mscp/mscp_tape.c8
-rw-r--r--sys/dev/mvme/clmpcc_pcctwo.c10
-rw-r--r--sys/dev/mvme/clock_pcctwo.c6
-rw-r--r--sys/dev/mvme/if_ie_mvme.c8
-rw-r--r--sys/dev/mvme/lpt_mvme.c8
-rw-r--r--sys/dev/mvme/lpt_pcctwo.c8
-rw-r--r--sys/dev/mvme/memc.c8
-rw-r--r--sys/dev/mvme/mvmebus.c8
-rw-r--r--sys/dev/mvme/osiop_pcctwo.c8
-rw-r--r--sys/dev/mvme/pcctwo.c8
-rw-r--r--sys/dev/mvme/vme_two.c8
-rw-r--r--sys/dev/mvme/vme_two_isr.c8
-rw-r--r--sys/dev/ofisa/atppc_ofisa.c6
-rw-r--r--sys/dev/ofisa/com_ofisa.c8
-rw-r--r--sys/dev/ofisa/ess_ofisa.c8
-rw-r--r--sys/dev/ofisa/if_cs_ofisa.c8
-rw-r--r--sys/dev/ofisa/joy_ofisa.c6
-rw-r--r--sys/dev/ofisa/lpt_ofisa.c8
-rw-r--r--sys/dev/ofisa/ofisa.c8
-rw-r--r--sys/dev/ofisa/pckbc_ofisa.c6
-rw-r--r--sys/dev/ofisa/sb_ofisa.c8
-rw-r--r--sys/dev/ofisa/wdc_ofisa.c8
-rw-r--r--sys/dev/pci/aac_pci.c8
-rw-r--r--sys/dev/pci/adv_pci.c8
-rw-r--r--sys/dev/pci/adw_pci.c8
-rw-r--r--sys/dev/pci/agp.c6
-rw-r--r--sys/dev/pci/agp_ali.c6
-rw-r--r--sys/dev/pci/agp_amd64.c4
-rw-r--r--sys/dev/pci/agp_apple.c6
-rw-r--r--sys/dev/pci/agp_i810.c6
-rw-r--r--sys/dev/pci/agp_intel.c6
-rw-r--r--sys/dev/pci/agp_sis.c6
-rw-r--r--sys/dev/pci/agp_via.c6
-rw-r--r--sys/dev/pci/ahc_pci.c8
-rw-r--r--sys/dev/pci/amdpm.c6
-rw-r--r--sys/dev/pci/amr.c6
-rw-r--r--sys/dev/pci/atppc_puc.c6
-rw-r--r--sys/dev/pci/auacer.c6
-rw-r--r--sys/dev/pci/auich.c6
-rw-r--r--sys/dev/pci/auixp.c8
-rw-r--r--sys/dev/pci/autri.c8
-rw-r--r--sys/dev/pci/bha_pci.c8
-rw-r--r--sys/dev/pci/bktr/bktr_audio.c6
-rw-r--r--sys/dev/pci/bktr/bktr_card.c6
-rw-r--r--sys/dev/pci/bktr/bktr_core.c6
-rw-r--r--sys/dev/pci/bktr/bktr_os.c6
-rw-r--r--sys/dev/pci/bktr/bktr_reg.h4
-rw-r--r--sys/dev/pci/bktr/bktr_tuner.c6
-rw-r--r--sys/dev/pci/btvmei.c6
-rw-r--r--sys/dev/pci/btvmeii.c6
-rw-r--r--sys/dev/pci/cac_pci.c6
-rw-r--r--sys/dev/pci/ciss_pci.c6
-rw-r--r--sys/dev/pci/cmpci.c8
-rw-r--r--sys/dev/pci/com_puc.c6
-rw-r--r--sys/dev/pci/cs4280.c6
-rw-r--r--sys/dev/pci/cs4281.c6
-rw-r--r--sys/dev/pci/cs428x.c6
-rw-r--r--sys/dev/pci/cxgb_adapter.h2
-rw-r--r--sys/dev/pci/cxgb_lro.c2
-rw-r--r--sys/dev/pci/cxgb_main.c2
-rw-r--r--sys/dev/pci/cxgb_offload.c2
-rw-r--r--sys/dev/pci/cxgb_osdep.h2
-rw-r--r--sys/dev/pci/cxgb_sge.c2
-rw-r--r--sys/dev/pci/cy82c693.c6
-rw-r--r--sys/dev/pci/cy_pci.c8
-rw-r--r--sys/dev/pci/cyber.c6
-rw-r--r--sys/dev/pci/dpt_pci.c8
-rw-r--r--sys/dev/pci/eap.c6
-rw-r--r--sys/dev/pci/ehci_pci.c6
-rw-r--r--sys/dev/pci/esa.c8
-rw-r--r--sys/dev/pci/esm.c6
-rw-r--r--sys/dev/pci/eso.c8
-rw-r--r--sys/dev/pci/fms.c8
-rw-r--r--sys/dev/pci/fwlynx_pci.c8
-rw-r--r--sys/dev/pci/fwohci_pci.c8
-rw-r--r--sys/dev/pci/gtp.c6
-rw-r--r--sys/dev/pci/iavc_pci.c6
-rw-r--r--sys/dev/pci/ichsmb.c6
-rw-r--r--sys/dev/pci/icp_pci.c6
-rw-r--r--sys/dev/pci/if_an_pci.c8
-rw-r--r--sys/dev/pci/if_atw_pci.c8
-rw-r--r--sys/dev/pci/if_de.c8
-rw-r--r--sys/dev/pci/if_dge.c8
-rw-r--r--sys/dev/pci/if_ep_pci.c10
-rw-r--r--sys/dev/pci/if_epic_pci.c8
-rw-r--r--sys/dev/pci/if_esh_pci.c10
-rw-r--r--sys/dev/pci/if_ex_pci.c10
-rw-r--r--sys/dev/pci/if_fxp_pci.c8
-rw-r--r--sys/dev/pci/if_gem_pci.c8
-rw-r--r--sys/dev/pci/if_hme_pci.c6
-rw-r--r--sys/dev/pci/if_ipw.c8
-rw-r--r--sys/dev/pci/if_iwi.c8
-rw-r--r--sys/dev/pci/if_kse.c8
-rw-r--r--sys/dev/pci/if_le_pci.c10
-rw-r--r--sys/dev/pci/if_lmc.c12
-rw-r--r--sys/dev/pci/if_mtd_pci.c6
-rw-r--r--sys/dev/pci/if_ne_pci.c8
-rw-r--r--sys/dev/pci/if_nfe.c6
-rw-r--r--sys/dev/pci/if_ntwoc_pci.c10
-rw-r--r--sys/dev/pci/if_pcn.c8
-rw-r--r--sys/dev/pci/if_ral_pci.c8
-rw-r--r--sys/dev/pci/if_re_pci.c4
-rw-r--r--sys/dev/pci/if_rtk_pci.c6
-rw-r--r--sys/dev/pci/if_rtw_pci.c8
-rw-r--r--sys/dev/pci/if_sf_pci.c8
-rw-r--r--sys/dev/pci/if_sip.c8
-rw-r--r--sys/dev/pci/if_ste.c8
-rw-r--r--sys/dev/pci/if_stge.c8
-rw-r--r--sys/dev/pci/if_ti.c6
-rw-r--r--sys/dev/pci/if_tl.c8
-rw-r--r--sys/dev/pci/if_tlp_pci.c8
-rw-r--r--sys/dev/pci/if_txp.c6
-rw-r--r--sys/dev/pci/if_vge.c6
-rw-r--r--sys/dev/pci/if_vr.c8
-rw-r--r--sys/dev/pci/if_wi_pci.c8
-rw-r--r--sys/dev/pci/if_wm.c8
-rw-r--r--sys/dev/pci/if_wpi.c8
-rw-r--r--sys/dev/pci/if_xge.c8
-rw-r--r--sys/dev/pci/ifpci.c8
-rw-r--r--sys/dev/pci/ifpci2.c8
-rw-r--r--sys/dev/pci/igsfb_pci.c8
-rw-r--r--sys/dev/pci/iop_pci.c6
-rw-r--r--sys/dev/pci/isic_pci.c14
-rw-r--r--sys/dev/pci/isic_pci_elsa_qs1p.c6
-rw-r--r--sys/dev/pci/iwic_bchan.c6
-rw-r--r--sys/dev/pci/iwic_dchan.c6
-rw-r--r--sys/dev/pci/iwic_fsm.c6
-rw-r--r--sys/dev/pci/iwic_pci.c6
-rw-r--r--sys/dev/pci/iwicvar.h4
-rw-r--r--sys/dev/pci/joy_eap.c4
-rw-r--r--sys/dev/pci/joy_eso.c6
-rw-r--r--sys/dev/pci/joy_pci.c6
-rw-r--r--sys/dev/pci/ld_amr.c6
-rw-r--r--sys/dev/pci/ld_twa.c6
-rw-r--r--sys/dev/pci/ld_twe.c6
-rw-r--r--sys/dev/pci/lpt_puc.c6
-rw-r--r--sys/dev/pci/mfi_pci.c6
-rw-r--r--sys/dev/pci/mlx_pci.c6
-rw-r--r--sys/dev/pci/mly.c6
-rw-r--r--sys/dev/pci/mpu_cmpci.c6
-rw-r--r--sys/dev/pci/mpu_eso.c6
-rw-r--r--sys/dev/pci/mpu_fms.c6
-rw-r--r--sys/dev/pci/mpu_yds.c6
-rw-r--r--sys/dev/pci/neo.c6
-rw-r--r--sys/dev/pci/nfsmb.c6
-rw-r--r--sys/dev/pci/njs_pci.c8
-rw-r--r--sys/dev/pci/oboe.c8
-rw-r--r--sys/dev/pci/ohci_pci.c6
-rw-r--r--sys/dev/pci/opl_cmpci.c6
-rw-r--r--sys/dev/pci/opl_eso.c6
-rw-r--r--sys/dev/pci/opl_fms.c6
-rw-r--r--sys/dev/pci/opl_sv.c6
-rw-r--r--sys/dev/pci/opl_yds.c6
-rw-r--r--sys/dev/pci/pccbb.c8
-rw-r--r--sys/dev/pci/pci_subr.c6
-rw-r--r--sys/dev/pci/pcivar.h4
-rw-r--r--sys/dev/pci/pcscp.c8
-rw-r--r--sys/dev/pci/piixpm.c4
-rw-r--r--sys/dev/pci/radeonfb.c6
-rw-r--r--sys/dev/pci/radeonfb_bios.c6
-rw-r--r--sys/dev/pci/radeonfb_i2c.c4
-rw-r--r--sys/dev/pci/sv.c6
-rw-r--r--sys/dev/pci/tga.c8
-rw-r--r--sys/dev/pci/trm.c8
-rw-r--r--sys/dev/pci/twa.c6
-rw-r--r--sys/dev/pci/twareg.h4
-rw-r--r--sys/dev/pci/twe.c6
-rw-r--r--sys/dev/pci/uhci_pci.c6
-rw-r--r--sys/dev/pci/unichromefb.c6
-rw-r--r--sys/dev/pci/universe_pci.c6
-rw-r--r--sys/dev/pci/viaenv.c6
-rw-r--r--sys/dev/pci/weasel_pci.c6
-rw-r--r--sys/dev/pci/yds.c8
-rw-r--r--sys/dev/pckbport/pckbd.c6
-rw-r--r--sys/dev/pckbport/pms.c6
-rw-r--r--sys/dev/pckbport/synaptics.c4
-rw-r--r--sys/dev/pcmcia/aic_pcmcia.c10
-rw-r--r--sys/dev/pcmcia/bt3c.c10
-rw-r--r--sys/dev/pcmcia/btbc.c8
-rw-r--r--sys/dev/pcmcia/com_pcmcia.c8
-rw-r--r--sys/dev/pcmcia/esl.c10
-rw-r--r--sys/dev/pcmcia/esl_pcmcia.c8
-rw-r--r--sys/dev/pcmcia/esp_pcmcia.c8
-rw-r--r--sys/dev/pcmcia/fdc_pcmcia.c8
-rw-r--r--sys/dev/pcmcia/if_an_pcmcia.c10
-rw-r--r--sys/dev/pcmcia/if_awi_pcmcia.c10
-rw-r--r--sys/dev/pcmcia/if_cs_pcmcia.c8
-rw-r--r--sys/dev/pcmcia/if_ep_pcmcia.c10
-rw-r--r--sys/dev/pcmcia/if_mbe_pcmcia.c8
-rw-r--r--sys/dev/pcmcia/if_ne_pcmcia.c8
-rw-r--r--sys/dev/pcmcia/if_ray.c10
-rw-r--r--sys/dev/pcmcia/if_sm_pcmcia.c8
-rw-r--r--sys/dev/pcmcia/if_tr_pcmcia.c8
-rw-r--r--sys/dev/pcmcia/if_wi_pcmcia.c10
-rw-r--r--sys/dev/pcmcia/isic_pcmcia.c8
-rw-r--r--sys/dev/pcmcia/isic_pcmcia_avm_fritz.c6
-rw-r--r--sys/dev/pcmcia/isic_pcmcia_elsa_isdnmc.c4
-rw-r--r--sys/dev/pcmcia/isic_pcmcia_elsa_mcall.c4
-rw-r--r--sys/dev/pcmcia/isic_pcmcia_sbspeedstar2.c4
-rw-r--r--sys/dev/pcmcia/mhzc.c8
-rw-r--r--sys/dev/pcmcia/nca_pcmcia.c8
-rw-r--r--sys/dev/pcmcia/opl_esl.c6
-rw-r--r--sys/dev/pcmcia/pcmciachip.h4
-rw-r--r--sys/dev/pcmcia/pcmcom.c8
-rw-r--r--sys/dev/pcmcia/slhci_pcmcia.c6
-rw-r--r--sys/dev/pcmcia/spc_pcmcia.c8
-rw-r--r--sys/dev/pcmcia/wdc_pcmcia.c8
-rw-r--r--sys/dev/pcmcia/xirc.c8
-rw-r--r--sys/dev/podulebus/acemidi.c6
-rw-r--r--sys/dev/podulebus/dtide.c6
-rw-r--r--sys/dev/podulebus/hcide.c6
-rw-r--r--sys/dev/podulebus/if_ea.c8
-rw-r--r--sys/dev/podulebus/if_eb.c8
-rw-r--r--sys/dev/podulebus/if_ei.c6
-rw-r--r--sys/dev/podulebus/sec.c6
-rw-r--r--sys/dev/ppbus/if_plip.c6
-rw-r--r--sys/dev/ppbus/lpt.c6
-rw-r--r--sys/dev/ppbus/ppbus_base.h4
-rw-r--r--sys/dev/ppbus/ppbus_conf.h4
-rw-r--r--sys/dev/qbus/dhu.c6
-rw-r--r--sys/dev/qbus/dl.c6
-rw-r--r--sys/dev/qbus/dz_uba.c6
-rw-r--r--sys/dev/qbus/if_de.c6
-rw-r--r--sys/dev/qbus/if_dmc.c6
-rw-r--r--sys/dev/qbus/if_il.c6
-rw-r--r--sys/dev/qbus/if_qe.c6
-rw-r--r--sys/dev/qbus/if_qt.c6
-rw-r--r--sys/dev/qbus/if_uba.c6
-rw-r--r--sys/dev/qbus/qd.c8
-rw-r--r--sys/dev/qbus/rf.c6
-rw-r--r--sys/dev/qbus/rl.c6
-rw-r--r--sys/dev/qbus/ts.c6
-rw-r--r--sys/dev/qbus/uba.c8
-rw-r--r--sys/dev/qbus/uda.c6
-rw-r--r--sys/dev/sbus/agten.c6
-rw-r--r--sys/dev/sbus/be.c8
-rw-r--r--sys/dev/sbus/bpp.c8
-rw-r--r--sys/dev/sbus/cgsix_sbus.c6
-rw-r--r--sys/dev/sbus/cgthree_sbus.c6
-rw-r--r--sys/dev/sbus/cs4231_sbus.c8
-rw-r--r--sys/dev/sbus/dbri.c8
-rw-r--r--sys/dev/sbus/dma_sbus.c8
-rw-r--r--sys/dev/sbus/esp_sbus.c8
-rw-r--r--sys/dev/sbus/genfb_sbus.c6
-rw-r--r--sys/dev/sbus/if_en.c10
-rw-r--r--sys/dev/sbus/if_gem_sbus.c8
-rw-r--r--sys/dev/sbus/if_hme_sbus.c8
-rw-r--r--sys/dev/sbus/if_le.c8
-rw-r--r--sys/dev/sbus/if_le_lebuffer.c8
-rw-r--r--sys/dev/sbus/if_le_ledma.c8
-rw-r--r--sys/dev/sbus/isp_sbus.c6
-rw-r--r--sys/dev/sbus/lebuffer.c8
-rw-r--r--sys/dev/sbus/magma.c6
-rw-r--r--sys/dev/sbus/p9100.c6
-rw-r--r--sys/dev/sbus/qe.c8
-rw-r--r--sys/dev/sbus/qec.c8
-rw-r--r--sys/dev/sbus/spif.c6
-rw-r--r--sys/dev/sbus/stp4020.c6
-rw-r--r--sys/dev/sbus/tcx.c6
-rw-r--r--sys/dev/sbus/xbox.c6
-rw-r--r--sys/dev/sbus/zx.c6
-rw-r--r--sys/dev/scsipi/atapi_wdc.c8
-rw-r--r--sys/dev/splash/splash.c6
-rw-r--r--sys/dev/sun/cgsix.c6
-rw-r--r--sys/dev/sun/cgthree.c6
-rw-r--r--sys/dev/tc/asc_tc.c6
-rw-r--r--sys/dev/tc/asc_tcds.c6
-rw-r--r--sys/dev/tc/bba.c8
-rw-r--r--sys/dev/tc/cfb.c8
-rw-r--r--sys/dev/tc/mfb.c8
-rw-r--r--sys/dev/tc/px.c8
-rw-r--r--sys/dev/tc/pxg.c8
-rw-r--r--sys/dev/tc/sfb.c8
-rw-r--r--sys/dev/tc/sfbplus.c8
-rw-r--r--sys/dev/tc/stic.c8
-rw-r--r--sys/dev/tc/tcds.c6
-rw-r--r--sys/dev/tc/tcvar.h6
-rw-r--r--sys/dev/tc/tfb.c8
-rw-r--r--sys/dev/tc/xcfb.c8
-rw-r--r--sys/dev/usb/ehci.c6
-rw-r--r--sys/dev/usb/if_atu.c6
-rw-r--r--sys/dev/usb/if_rum.c8
-rw-r--r--sys/dev/usb/if_ural.c8
-rw-r--r--sys/dev/usb/if_zyd.c6
-rw-r--r--sys/dev/usb/ohci.c8
-rw-r--r--sys/dev/usb/uhci.c8
-rw-r--r--sys/dev/usb/uhub.c6
-rw-r--r--sys/dev/usb/ukyopon.c6
-rw-r--r--sys/dev/usb/usb.c6
-rw-r--r--sys/dev/usb/usb_mem.c6
-rw-r--r--sys/dev/usb/usb_subr.c6
-rw-r--r--sys/dev/usb/usbdi.c8
-rw-r--r--sys/dev/usb/xboxcontroller.c6
-rw-r--r--sys/dev/vme/if_ie_vme.c8
-rw-r--r--sys/dev/vme/sc_vme.c8
-rw-r--r--sys/dev/vme/si.c8
-rw-r--r--sys/dev/vme/vme.c6
-rw-r--r--sys/dev/vme/xd.c8
-rw-r--r--sys/dev/vme/xy.c8
-rw-r--r--sys/dev/wsfb/genfbvar.h6
-rw-r--r--sys/dev/xmi/bi_xmi.c6
-rw-r--r--sys/dev/xmi/xmi.c8
731 files changed, 2519 insertions, 2520 deletions
diff --git a/sys/dev/acpi/acpi_ec.c b/sys/dev/acpi/acpi_ec.c
index 43340e3338d..151415ea7ae 100644
--- a/sys/dev/acpi/acpi_ec.c
+++ b/sys/dev/acpi/acpi_ec.c
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_ec.c,v 1.41 2007/06/26 22:36:16 jmcneill Exp $ */
+/* $NetBSD: acpi_ec.c,v 1.42 2007/10/19 11:59:34 ad Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -172,7 +172,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.41 2007/06/26 22:36:16 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.42 2007/10/19 11:59:34 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -181,7 +181,7 @@ __KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.41 2007/06/26 22:36:16 jmcneill Exp $"
#include <sys/proc.h>
#include <sys/kernel.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/acpi/acpica.h>
#include <dev/acpi/acpireg.h>
diff --git a/sys/dev/acpi/acpivar.h b/sys/dev/acpi/acpivar.h
index 1287fe7dc24..67a5fb97815 100644
--- a/sys/dev/acpi/acpivar.h
+++ b/sys/dev/acpi/acpivar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: acpivar.h,v 1.29 2007/08/08 08:52:31 cube Exp $ */
+/* $NetBSD: acpivar.h,v 1.30 2007/10/19 11:59:35 ad Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -41,7 +41,7 @@
* support.
*/
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/isa/isavar.h>
diff --git a/sys/dev/acpi/atppc_acpi.c b/sys/dev/acpi/atppc_acpi.c
index cbb649e2bcd..799ccb19040 100644
--- a/sys/dev/acpi/atppc_acpi.c
+++ b/sys/dev/acpi/atppc_acpi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: atppc_acpi.c,v 1.9 2007/03/04 06:01:43 christos Exp $ */
+/* $NetBSD: atppc_acpi.c,v 1.10 2007/10/19 11:59:35 ad Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atppc_acpi.c,v 1.9 2007/03/04 06:01:43 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atppc_acpi.c,v 1.10 2007/10/19 11:59:35 ad Exp $");
#include "opt_atppc.h"
@@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: atppc_acpi.c,v 1.9 2007/03/04 06:01:43 christos Exp
#include <sys/proc.h>
#include <sys/termios.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
#include <dev/isa/isadmavar.h>
diff --git a/sys/dev/acpi/attimer_acpi.c b/sys/dev/acpi/attimer_acpi.c
index 6235f220f7d..d4956f8f239 100644
--- a/sys/dev/acpi/attimer_acpi.c
+++ b/sys/dev/acpi/attimer_acpi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: attimer_acpi.c,v 1.6 2007/10/06 07:21:04 xtraeme Exp $ */
+/* $NetBSD: attimer_acpi.c,v 1.7 2007/10/19 11:59:35 ad Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: attimer_acpi.c,v 1.6 2007/10/06 07:21:04 xtraeme Exp $");
+__KERNEL_RCSID(0, "$NetBSD: attimer_acpi.c,v 1.7 2007/10/19 11:59:35 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -75,7 +75,7 @@ __KERNEL_RCSID(0, "$NetBSD: attimer_acpi.c,v 1.6 2007/10/06 07:21:04 xtraeme Exp
#include <sys/device.h>
#include <sys/proc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/acpi/acpica.h>
#include <dev/acpi/acpireg.h>
diff --git a/sys/dev/acpi/com_acpi.c b/sys/dev/acpi/com_acpi.c
index 0bce9f8c63a..2bdcc9a4eb6 100644
--- a/sys/dev/acpi/com_acpi.c
+++ b/sys/dev/acpi/com_acpi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: com_acpi.c,v 1.23 2007/05/04 14:18:36 christos Exp $ */
+/* $NetBSD: com_acpi.c,v 1.24 2007/10/19 11:59:35 ad Exp $ */
/*
* Copyright (c) 2002 Jared D. McNeill <jmcneill@invisible.ca>
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_acpi.c,v 1.23 2007/05/04 14:18:36 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_acpi.c,v 1.24 2007/10/19 11:59:35 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: com_acpi.c,v 1.23 2007/05/04 14:18:36 christos Exp $
#include <sys/proc.h>
#include <sys/termios.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
#include <dev/isa/isadmavar.h>
diff --git a/sys/dev/acpi/fdc_acpi.c b/sys/dev/acpi/fdc_acpi.c
index 10d34f67fbc..69c5b1ee4bb 100644
--- a/sys/dev/acpi/fdc_acpi.c
+++ b/sys/dev/acpi/fdc_acpi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fdc_acpi.c,v 1.30 2006/11/16 01:32:47 christos Exp $ */
+/* $NetBSD: fdc_acpi.c,v 1.31 2007/10/19 11:59:35 ad Exp $ */
/*
* Copyright (c) 2002 Jared D. McNeill <jmcneill@invisible.ca>
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdc_acpi.c,v 1.30 2006/11/16 01:32:47 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdc_acpi.c,v 1.31 2007/10/19 11:59:35 ad Exp $");
#include "rnd.h"
@@ -47,8 +47,8 @@ __KERNEL_RCSID(0, "$NetBSD: fdc_acpi.c,v 1.30 2006/11/16 01:32:47 christos Exp $
#include <sys/rnd.h>
#endif
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/isa/isavar.h>
#include <dev/isa/isadmavar.h>
diff --git a/sys/dev/acpi/hpet_acpi.c b/sys/dev/acpi/hpet_acpi.c
index 2c2a19fb15d..25263df09a1 100644
--- a/sys/dev/acpi/hpet_acpi.c
+++ b/sys/dev/acpi/hpet_acpi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hpet_acpi.c,v 1.1 2007/03/08 14:26:28 njoly Exp $ */
+/* $NetBSD: hpet_acpi.c,v 1.2 2007/10/19 11:59:35 ad Exp $ */
/*
* Copyright (c) 2006 Nicolas Joly
@@ -29,14 +29,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpet_acpi.c,v 1.1 2007/03/08 14:26:28 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpet_acpi.c,v 1.2 2007/10/19 11:59:35 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/errno.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/acpi/acpica.h>
#include <dev/acpi/acpireg.h>
diff --git a/sys/dev/acpi/joy_acpi.c b/sys/dev/acpi/joy_acpi.c
index 25fdc8ee5a8..d29a72cb46a 100644
--- a/sys/dev/acpi/joy_acpi.c
+++ b/sys/dev/acpi/joy_acpi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: joy_acpi.c,v 1.6 2007/10/06 07:21:04 xtraeme Exp $ */
+/* $NetBSD: joy_acpi.c,v 1.7 2007/10/19 11:59:35 ad Exp $ */
/*
* Copyright (c) 2002 Jared D. McNeill <jmcneill@invisible.ca>
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: joy_acpi.c,v 1.6 2007/10/06 07:21:04 xtraeme Exp $");
+__KERNEL_RCSID(0, "$NetBSD: joy_acpi.c,v 1.7 2007/10/19 11:59:35 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: joy_acpi.c,v 1.6 2007/10/06 07:21:04 xtraeme Exp $")
#include <sys/device.h>
#include <sys/proc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/acpi/acpica.h>
#include <dev/acpi/acpireg.h>
diff --git a/sys/dev/acpi/lpt_acpi.c b/sys/dev/acpi/lpt_acpi.c
index ead751619f0..73fb3068ab9 100644
--- a/sys/dev/acpi/lpt_acpi.c
+++ b/sys/dev/acpi/lpt_acpi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lpt_acpi.c,v 1.14 2006/11/16 01:32:47 christos Exp $ */
+/* $NetBSD: lpt_acpi.c,v 1.15 2007/10/19 11:59:35 ad Exp $ */
/*
* Copyright (c) 2002 Jared D. McNeill <jmcneill@invisible.ca>
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lpt_acpi.c,v 1.14 2006/11/16 01:32:47 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lpt_acpi.c,v 1.15 2007/10/19 11:59:35 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: lpt_acpi.c,v 1.14 2006/11/16 01:32:47 christos Exp $
#include <sys/proc.h>
#include <sys/termios.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
#include <dev/isa/isadmavar.h>
diff --git a/sys/dev/acpi/mpu_acpi.c b/sys/dev/acpi/mpu_acpi.c
index b6108ddd967..22ffdbbcb7f 100644
--- a/sys/dev/acpi/mpu_acpi.c
+++ b/sys/dev/acpi/mpu_acpi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mpu_acpi.c,v 1.6 2007/10/06 07:21:04 xtraeme Exp $ */
+/* $NetBSD: mpu_acpi.c,v 1.7 2007/10/19 11:59:35 ad Exp $ */
/*
* Copyright (c) 2002 Jared D. McNeill <jmcneill@invisible.ca>
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpu_acpi.c,v 1.6 2007/10/06 07:21:04 xtraeme Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpu_acpi.c,v 1.7 2007/10/19 11:59:35 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -40,7 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: mpu_acpi.c,v 1.6 2007/10/06 07:21:04 xtraeme Exp $")
#include <sys/device.h>
#include <sys/proc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
#include <dev/isa/isadmavar.h>
diff --git a/sys/dev/acpi/pckbc_acpi.c b/sys/dev/acpi/pckbc_acpi.c
index 4743d24f641..063db3f85cd 100644
--- a/sys/dev/acpi/pckbc_acpi.c
+++ b/sys/dev/acpi/pckbc_acpi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbc_acpi.c,v 1.21 2007/10/05 18:31:46 jmcneill Exp $ */
+/* $NetBSD: pckbc_acpi.c,v 1.22 2007/10/19 11:59:35 ad Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pckbc_acpi.c,v 1.21 2007/10/05 18:31:46 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbc_acpi.c,v 1.22 2007/10/19 11:59:35 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -61,7 +61,7 @@ __KERNEL_RCSID(0, "$NetBSD: pckbc_acpi.c,v 1.21 2007/10/05 18:31:46 jmcneill Exp
#include <sys/queue.h>
#include <sys/lock.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
diff --git a/sys/dev/acpi/pcppi_acpi.c b/sys/dev/acpi/pcppi_acpi.c
index e0fe100e79f..5a60dc74ade 100644
--- a/sys/dev/acpi/pcppi_acpi.c
+++ b/sys/dev/acpi/pcppi_acpi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pcppi_acpi.c,v 1.6 2007/10/06 07:21:04 xtraeme Exp $ */
+/* $NetBSD: pcppi_acpi.c,v 1.7 2007/10/19 11:59:35 ad Exp $ */
/*
* Copyright (c) 2002 Jared D. McNeill <jmcneill@invisible.ca>
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcppi_acpi.c,v 1.6 2007/10/06 07:21:04 xtraeme Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcppi_acpi.c,v 1.7 2007/10/19 11:59:35 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: pcppi_acpi.c,v 1.6 2007/10/06 07:21:04 xtraeme Exp $
#include <sys/device.h>
#include <sys/proc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/acpi/acpica.h>
#include <dev/acpi/acpireg.h>
diff --git a/sys/dev/acpi/ug_acpi.c b/sys/dev/acpi/ug_acpi.c
index f8e88b3988a..51ff605adf2 100644
--- a/sys/dev/acpi/ug_acpi.c
+++ b/sys/dev/acpi/ug_acpi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ug_acpi.c,v 1.2 2007/05/08 17:17:14 xtraeme Exp $ */
+/* $NetBSD: ug_acpi.c,v 1.3 2007/10/19 11:59:36 ad Exp $ */
/*
* Copyright (c) 2007 Mihai Chelaru <kefren@netbsd.ro>
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ug_acpi.c,v 1.2 2007/05/08 17:17:14 xtraeme Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ug_acpi.c,v 1.3 2007/10/19 11:59:36 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: ug_acpi.c,v 1.2 2007/05/08 17:17:14 xtraeme Exp $");
#include <sys/proc.h>
#include <sys/envsys.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/acpi/acpica.h>
#include <dev/acpi/acpireg.h>
diff --git a/sys/dev/acpi/wss_acpi.c b/sys/dev/acpi/wss_acpi.c
index b67889a9b00..478a403bbf4 100644
--- a/sys/dev/acpi/wss_acpi.c
+++ b/sys/dev/acpi/wss_acpi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wss_acpi.c,v 1.17 2006/11/16 01:32:47 christos Exp $ */
+/* $NetBSD: wss_acpi.c,v 1.18 2007/10/19 11:59:36 ad Exp $ */
/*
* Copyright (c) 2002 Jared D. McNeill <jmcneill@invisible.ca>
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wss_acpi.c,v 1.17 2006/11/16 01:32:47 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wss_acpi.c,v 1.18 2007/10/19 11:59:36 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -36,7 +36,7 @@ __KERNEL_RCSID(0, "$NetBSD: wss_acpi.c,v 1.17 2006/11/16 01:32:47 christos Exp $
#include <sys/device.h>
#include <sys/proc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/audioio.h>
#include <dev/audio_if.h>
diff --git a/sys/dev/acpi/ym_acpi.c b/sys/dev/acpi/ym_acpi.c
index c0b54320c21..41bfe021986 100644
--- a/sys/dev/acpi/ym_acpi.c
+++ b/sys/dev/acpi/ym_acpi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ym_acpi.c,v 1.3 2006/11/16 01:32:47 christos Exp $ */
+/* $NetBSD: ym_acpi.c,v 1.4 2007/10/19 11:59:36 ad Exp $ */
/*
* Copyright (c) 2006 Jasper Wallace <jasper@pointless.net>
@@ -29,12 +29,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ym_acpi.c,v 1.3 2006/11/16 01:32:47 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ym_acpi.c,v 1.4 2007/10/19 11:59:36 ad Exp $");
#include "mpu_ym.h"
#include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/acpi/acpivar.h>
diff --git a/sys/dev/adb/adb_bus.c b/sys/dev/adb/adb_bus.c
index 4af3baae6a9..b595f42bd3a 100644
--- a/sys/dev/adb/adb_bus.c
+++ b/sys/dev/adb/adb_bus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: adb_bus.c,v 1.5 2007/04/16 00:18:34 macallan Exp $ */
+/* $NetBSD: adb_bus.c,v 1.6 2007/10/19 11:59:36 ad Exp $ */
/*-
* Copyright (c) 2006 Michael Lorenz
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adb_bus.c,v 1.5 2007/04/16 00:18:34 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adb_bus.c,v 1.6 2007/10/19 11:59:36 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: adb_bus.c,v 1.5 2007/04/16 00:18:34 macallan Exp $")
#include <sys/device.h>
#include <sys/proc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <dev/adb/adbvar.h>
diff --git a/sys/dev/ata/ata.c b/sys/dev/ata/ata.c
index 1d611336e4c..bd1f556f060 100644
--- a/sys/dev/ata/ata.c
+++ b/sys/dev/ata/ata.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ata.c,v 1.90 2007/07/09 21:00:30 ad Exp $ */
+/* $NetBSD: ata.c,v 1.91 2007/10/19 11:59:36 ad Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.90 2007/07/09 21:00:30 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.91 2007/10/19 11:59:36 ad Exp $");
#include "opt_ata.h"
@@ -47,8 +47,8 @@ __KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.90 2007/07/09 21:00:30 ad Exp $");
#include <sys/errno.h>
#include <sys/ataio.h>
-#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
#include <dev/ata/ataconf.h>
#include <dev/ata/atareg.h>
diff --git a/sys/dev/ata/ata_wdc.c b/sys/dev/ata/ata_wdc.c
index 76165292fa9..8b5ed667cf3 100644
--- a/sys/dev/ata/ata_wdc.c
+++ b/sys/dev/ata/ata_wdc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ata_wdc.c,v 1.86 2007/04/08 06:59:43 dyoung Exp $ */
+/* $NetBSD: ata_wdc.c,v 1.87 2007/10/19 11:59:36 ad Exp $ */
/*
* Copyright (c) 1998, 2001, 2003 Manuel Bouyer.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ata_wdc.c,v 1.86 2007/04/08 06:59:43 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata_wdc.c,v 1.87 2007/10/19 11:59:36 ad Exp $");
#include "opt_ata.h"
@@ -83,8 +83,8 @@ __KERNEL_RCSID(0, "$NetBSD: ata_wdc.c,v 1.86 2007/04/08 06:59:43 dyoung Exp $");
#include <sys/syslog.h>
#include <sys/proc.h>
-#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
#ifndef __BUS_SPACE_HAS_STREAM_METHODS
#define bus_space_write_multi_stream_2 bus_space_write_multi_2
#define bus_space_write_multi_stream_4 bus_space_write_multi_4
diff --git a/sys/dev/ata/satavar.h b/sys/dev/ata/satavar.h
index 2f977f27082..2d7c011e750 100644
--- a/sys/dev/ata/satavar.h
+++ b/sys/dev/ata/satavar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: satavar.h,v 1.3 2006/11/20 23:42:21 bouyer Exp $ */
+/* $NetBSD: satavar.h,v 1.4 2007/10/19 11:59:36 ad Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
#ifndef _DEV_ATA_SATAVAR_H_
#define _DEV_ATA_SATAVAR_H_
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ata/atavar.h>
/*
diff --git a/sys/dev/ata/wd.c b/sys/dev/ata/wd.c
index 0215b198ff6..c017bddd55d 100644
--- a/sys/dev/ata/wd.c
+++ b/sys/dev/ata/wd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wd.c,v 1.346 2007/10/08 16:41:11 ad Exp $ */
+/* $NetBSD: wd.c,v 1.347 2007/10/19 11:59:37 ad Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.346 2007/10/08 16:41:11 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.347 2007/10/19 11:59:37 ad Exp $");
#include "opt_ata.h"
@@ -93,8 +93,8 @@ __KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.346 2007/10/08 16:41:11 ad Exp $");
#include <sys/rnd.h>
#endif
-#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
#include <dev/ata/atareg.h>
#include <dev/ata/atavar.h>
diff --git a/sys/dev/bi/bi.c b/sys/dev/bi/bi.c
index c8fa7b23663..c4312b2169a 100644
--- a/sys/dev/bi/bi.c
+++ b/sys/dev/bi/bi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bi.c,v 1.22 2007/03/04 06:01:44 christos Exp $ */
+/* $NetBSD: bi.c,v 1.23 2007/10/19 11:59:37 ad Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -41,13 +41,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bi.c,v 1.22 2007/03/04 06:01:44 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bi.c,v 1.23 2007/10/19 11:59:37 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
-#include <machine/bus.h>
-#include <machine/cpu.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
#include <dev/bi/bireg.h>
#include <dev/bi/bivar.h>
diff --git a/sys/dev/bi/if_ni.c b/sys/dev/bi/if_ni.c
index be4fd3e71d9..200d6c20c45 100644
--- a/sys/dev/bi/if_ni.c
+++ b/sys/dev/bi/if_ni.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ni.c,v 1.32 2007/09/06 08:14:30 he Exp $ */
+/* $NetBSD: if_ni.c,v 1.33 2007/10/19 11:59:37 ad Exp $ */
/*
* Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved.
*
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ni.c,v 1.32 2007/09/06 08:14:30 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ni.c,v 1.33 2007/10/19 11:59:37 ad Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -63,7 +63,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_ni.c,v 1.32 2007/09/06 08:14:30 he Exp $");
#include <net/bpfdesc.h>
#endif
-#include <machine/bus.h>
+#include <sys/bus.h>
#ifdef __vax__
#include <machine/mtpr.h>
#include <machine/pte.h>
diff --git a/sys/dev/bi/kdb.c b/sys/dev/bi/kdb.c
index 9f3e16a0dd9..481d0e45d4c 100644
--- a/sys/dev/bi/kdb.c
+++ b/sys/dev/bi/kdb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: kdb.c,v 1.40 2007/03/04 06:01:45 christos Exp $ */
+/* $NetBSD: kdb.c,v 1.41 2007/10/19 11:59:37 ad Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kdb.c,v 1.40 2007/03/04 06:01:45 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kdb.c,v 1.41 2007/10/19 11:59:37 ad Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -59,7 +59,7 @@ __KERNEL_RCSID(0, "$NetBSD: kdb.c,v 1.40 2007/03/04 06:01:45 christos Exp $");
#include <machine/pte.h>
#include <machine/pcb.h>
#endif
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/bi/bireg.h>
#include <dev/bi/bivar.h>
diff --git a/sys/dev/bluetooth/btuart.c b/sys/dev/bluetooth/btuart.c
index ca1c4588af6..4b9c150300a 100644
--- a/sys/dev/bluetooth/btuart.c
+++ b/sys/dev/bluetooth/btuart.c
@@ -1,4 +1,4 @@
-/* $NetBSD: btuart.c,v 1.8 2007/09/03 12:38:27 kiyohara Exp $ */
+/* $NetBSD: btuart.c,v 1.9 2007/10/19 11:59:37 ad Exp $ */
/*
* Copyright (c) 2006, 2007 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: btuart.c,v 1.8 2007/09/03 12:38:27 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btuart.c,v 1.9 2007/10/19 11:59:37 ad Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -44,8 +44,8 @@ __KERNEL_RCSID(0, "$NetBSD: btuart.c,v 1.8 2007/09/03 12:38:27 kiyohara Exp $");
#include <sys/systm.h>
#include <sys/tty.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <netbt/bluetooth.h>
#include <netbt/hci.h>
diff --git a/sys/dev/cardbus/adv_cardbus.c b/sys/dev/cardbus/adv_cardbus.c
index 17b8d84200f..40ef84fde47 100644
--- a/sys/dev/cardbus/adv_cardbus.c
+++ b/sys/dev/cardbus/adv_cardbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: adv_cardbus.c,v 1.15 2006/11/16 01:32:48 christos Exp $ */
+/* $NetBSD: adv_cardbus.c,v 1.16 2007/10/19 11:59:37 ad Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adv_cardbus.c,v 1.15 2006/11/16 01:32:48 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adv_cardbus.c,v 1.16 2007/10/19 11:59:37 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -52,8 +52,8 @@ __KERNEL_RCSID(0, "$NetBSD: adv_cardbus.c,v 1.15 2006/11/16 01:32:48 christos Ex
#include <sys/queue.h>
#include <sys/device.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/scsipi/scsi_all.h>
#include <dev/scsipi/scsipi_all.h>
diff --git a/sys/dev/cardbus/ahc_cardbus.c b/sys/dev/cardbus/ahc_cardbus.c
index aade4bfa024..172483fbcf4 100644
--- a/sys/dev/cardbus/ahc_cardbus.c
+++ b/sys/dev/cardbus/ahc_cardbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ahc_cardbus.c,v 1.21 2006/11/16 01:32:48 christos Exp $ */
+/* $NetBSD: ahc_cardbus.c,v 1.22 2007/10/19 11:59:37 ad Exp $ */
/*-
* Copyright (c) 2000, 2005 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahc_cardbus.c,v 1.21 2006/11/16 01:32:48 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahc_cardbus.c,v 1.22 2007/10/19 11:59:37 ad Exp $");
#include "opt_ahc_cardbus.h"
@@ -56,8 +56,8 @@ __KERNEL_RCSID(0, "$NetBSD: ahc_cardbus.c,v 1.21 2006/11/16 01:32:48 christos Ex
#include <sys/queue.h>
#include <sys/device.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/scsipi/scsi_all.h>
#include <dev/scsipi/scsipi_all.h>
diff --git a/sys/dev/cardbus/cardbus.c b/sys/dev/cardbus/cardbus.c
index 1df504648fb..c884d2b4802 100644
--- a/sys/dev/cardbus/cardbus.c
+++ b/sys/dev/cardbus/cardbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cardbus.c,v 1.75 2007/02/17 20:20:08 dyoung Exp $ */
+/* $NetBSD: cardbus.c,v 1.76 2007/10/19 11:59:38 ad Exp $ */
/*
* Copyright (c) 1997, 1998, 1999 and 2000
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cardbus.c,v 1.75 2007/02/17 20:20:08 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cardbus.c,v 1.76 2007/10/19 11:59:38 ad Exp $");
#include "opt_cardbus.h"
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: cardbus.c,v 1.75 2007/02/17 20:20:08 dyoung Exp $");
#include <sys/proc.h>
#include <sys/reboot.h> /* for AB_* needed by bootverbose */
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/cardbus/cardbusvar.h>
#include <dev/pci/pcidevs.h>
diff --git a/sys/dev/cardbus/cardbus_exrom.c b/sys/dev/cardbus/cardbus_exrom.c
index c1ea0b85d13..6ab8a75cd99 100644
--- a/sys/dev/cardbus/cardbus_exrom.c
+++ b/sys/dev/cardbus/cardbus_exrom.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cardbus_exrom.c,v 1.9 2005/12/11 12:21:15 christos Exp $ */
+/* $NetBSD: cardbus_exrom.c,v 1.10 2007/10/19 11:59:38 ad Exp $ */
/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -36,14 +36,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cardbus_exrom.c,v 1.9 2005/12/11 12:21:15 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cardbus_exrom.c,v 1.10 2007/10/19 11:59:38 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/queue.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/cardbus/cardbus_exrom.h>
diff --git a/sys/dev/cardbus/cardbus_map.c b/sys/dev/cardbus/cardbus_map.c
index 6ac2cf1d388..a8c444162fe 100644
--- a/sys/dev/cardbus/cardbus_map.c
+++ b/sys/dev/cardbus/cardbus_map.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cardbus_map.c,v 1.24 2006/11/16 01:32:48 christos Exp $ */
+/* $NetBSD: cardbus_map.c,v 1.25 2007/10/19 11:59:38 ad Exp $ */
/*
* Copyright (c) 1999 and 2000
@@ -33,13 +33,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cardbus_map.c,v 1.24 2006/11/16 01:32:48 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cardbus_map.c,v 1.25 2007/10/19 11:59:38 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/cardbus/cardbusvar.h>
diff --git a/sys/dev/cardbus/cardslot.c b/sys/dev/cardbus/cardslot.c
index 9f68f858340..5cdeff0f908 100644
--- a/sys/dev/cardbus/cardslot.c
+++ b/sys/dev/cardbus/cardslot.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cardslot.c,v 1.35 2007/07/09 21:00:31 ad Exp $ */
+/* $NetBSD: cardslot.c,v 1.36 2007/10/19 11:59:38 ad Exp $ */
/*
* Copyright (c) 1999 and 2000
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cardslot.c,v 1.35 2007/07/09 21:00:31 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cardslot.c,v 1.36 2007/10/19 11:59:38 ad Exp $");
#include "opt_cardslot.h"
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: cardslot.c,v 1.35 2007/07/09 21:00:31 ad Exp $");
#include <sys/syslog.h>
#include <sys/kthread.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/cardbus/cardslotvar.h>
#include <dev/cardbus/cardbusvar.h>
diff --git a/sys/dev/cardbus/ehci_cardbus.c b/sys/dev/cardbus/ehci_cardbus.c
index 5b68cd00979..aa195650656 100644
--- a/sys/dev/cardbus/ehci_cardbus.c
+++ b/sys/dev/cardbus/ehci_cardbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci_cardbus.c,v 1.16 2006/11/16 01:32:48 christos Exp $ */
+/* $NetBSD: ehci_cardbus.c,v 1.17 2007/10/19 11:59:38 ad Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci_cardbus.c,v 1.16 2006/11/16 01:32:48 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci_cardbus.c,v 1.17 2007/10/19 11:59:38 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: ehci_cardbus.c,v 1.16 2006/11/16 01:32:48 christos E
#include <sys/device.h>
#include <sys/proc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#if defined pciinc
#include <dev/pci/pcidevs.h>
diff --git a/sys/dev/cardbus/fwohci_cardbus.c b/sys/dev/cardbus/fwohci_cardbus.c
index 1786c44a635..1298dbe9027 100644
--- a/sys/dev/cardbus/fwohci_cardbus.c
+++ b/sys/dev/cardbus/fwohci_cardbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fwohci_cardbus.c,v 1.19 2007/09/29 10:20:31 kiyohara Exp $ */
+/* $NetBSD: fwohci_cardbus.c,v 1.20 2007/10/19 11:59:38 ad Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fwohci_cardbus.c,v 1.19 2007/09/29 10:20:31 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fwohci_cardbus.c,v 1.20 2007/10/19 11:59:38 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: fwohci_cardbus.c,v 1.19 2007/09/29 10:20:31 kiyohara
#include <sys/device.h>
#include <sys/select.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#if defined pciinc
#include <dev/pci/pcidevs.h>
diff --git a/sys/dev/cardbus/if_ath_cardbus.c b/sys/dev/cardbus/if_ath_cardbus.c
index a0b2b6c8544..bd03f5a6155 100644
--- a/sys/dev/cardbus/if_ath_cardbus.c
+++ b/sys/dev/cardbus/if_ath_cardbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ath_cardbus.c,v 1.18 2006/11/16 01:32:48 christos Exp $ */
+/* $NetBSD: if_ath_cardbus.c,v 1.19 2007/10/19 11:59:38 ad Exp $ */
/*
* Copyright (c) 2003
* Ichiro FUKUHARA <ichiro@ichiro.org>.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ath_cardbus.c,v 1.18 2006/11/16 01:32:48 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ath_cardbus.c,v 1.19 2007/10/19 11:59:38 ad Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -71,8 +71,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_ath_cardbus.c,v 1.18 2006/11/16 01:32:48 christos
#endif
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/mii/miivar.h>
#include <dev/mii/mii_bitbang.h>
diff --git a/sys/dev/cardbus/if_atw_cardbus.c b/sys/dev/cardbus/if_atw_cardbus.c
index 3be1bd1856c..16f5338c082 100644
--- a/sys/dev/cardbus/if_atw_cardbus.c
+++ b/sys/dev/cardbus/if_atw_cardbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_atw_cardbus.c,v 1.17 2006/11/16 01:32:48 christos Exp $ */
+/* $NetBSD: if_atw_cardbus.c,v 1.18 2007/10/19 11:59:38 ad Exp $ */
/*-
* Copyright (c) 1999, 2000, 2003 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_atw_cardbus.c,v 1.17 2006/11/16 01:32:48 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_atw_cardbus.c,v 1.18 2007/10/19 11:59:38 ad Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -79,8 +79,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_atw_cardbus.c,v 1.17 2006/11/16 01:32:48 christos
#endif
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/ic/atwreg.h>
#include <dev/ic/rf3000reg.h>
diff --git a/sys/dev/cardbus/if_ex_cardbus.c b/sys/dev/cardbus/if_ex_cardbus.c
index 5e59c22389a..f9a7af5a51f 100644
--- a/sys/dev/cardbus/if_ex_cardbus.c
+++ b/sys/dev/cardbus/if_ex_cardbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ex_cardbus.c,v 1.39 2006/11/16 01:32:48 christos Exp $ */
+/* $NetBSD: if_ex_cardbus.c,v 1.40 2007/10/19 11:59:38 ad Exp $ */
/*
* CardBus specific routines for 3Com 3C575-family CardBus ethernet adapter
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ex_cardbus.c,v 1.39 2006/11/16 01:32:48 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ex_cardbus.c,v 1.40 2007/10/19 11:59:38 ad Exp $");
/* #define EX_DEBUG 4 */ /* define to report information for debugging */
@@ -56,8 +56,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_ex_cardbus.c,v 1.39 2006/11/16 01:32:48 christos
#include <net/if_ether.h>
#include <net/if_media.h>
-#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/cpu.h>
+#include <sys/bus.h>
#include <dev/cardbus/cardbusvar.h>
#include <dev/pci/pcidevs.h>
diff --git a/sys/dev/cardbus/if_fxp_cardbus.c b/sys/dev/cardbus/if_fxp_cardbus.c
index 24a741dc497..cbf36a73bd6 100644
--- a/sys/dev/cardbus/if_fxp_cardbus.c
+++ b/sys/dev/cardbus/if_fxp_cardbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fxp_cardbus.c,v 1.26 2006/11/16 01:32:48 christos Exp $ */
+/* $NetBSD: if_fxp_cardbus.c,v 1.27 2007/10/19 11:59:39 ad Exp $ */
/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_fxp_cardbus.c,v 1.26 2006/11/16 01:32:48 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fxp_cardbus.c,v 1.27 2007/10/19 11:59:39 ad Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -78,8 +78,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_fxp_cardbus.c,v 1.26 2006/11/16 01:32:48 christos
#endif
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/mii/miivar.h>
diff --git a/sys/dev/cardbus/if_ral_cardbus.c b/sys/dev/cardbus/if_ral_cardbus.c
index b47807daae9..1ed918966f9 100644
--- a/sys/dev/cardbus/if_ral_cardbus.c
+++ b/sys/dev/cardbus/if_ral_cardbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ral_cardbus.c,v 1.8 2006/11/16 01:32:48 christos Exp $ */
+/* $NetBSD: if_ral_cardbus.c,v 1.9 2007/10/19 11:59:39 ad Exp $ */
/* $OpenBSD: if_ral_cardbus.c,v 1.6 2006/01/09 20:03:31 damien Exp $ */
/*-
@@ -22,7 +22,7 @@
* CardBus front-end for the Ralink RT2560/RT2561/RT2561S/RT2661 driver.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ral_cardbus.c,v 1.8 2006/11/16 01:32:48 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ral_cardbus.c,v 1.9 2007/10/19 11:59:39 ad Exp $");
#include "bpfilter.h"
@@ -36,8 +36,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_ral_cardbus.c,v 1.8 2006/11/16 01:32:48 christos
#include <sys/callout.h>
#include <sys/device.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <net/if.h>
#include <net/if_dl.h>
diff --git a/sys/dev/cardbus/if_re_cardbus.c b/sys/dev/cardbus/if_re_cardbus.c
index f451fbeefd3..3b0724a50d4 100644
--- a/sys/dev/cardbus/if_re_cardbus.c
+++ b/sys/dev/cardbus/if_re_cardbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_re_cardbus.c,v 1.13 2007/03/21 12:17:31 tsutsui Exp $ */
+/* $NetBSD: if_re_cardbus.c,v 1.14 2007/10/19 11:59:39 ad Exp $ */
/*
* Copyright (c) 2004 Jonathan Stone
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_re_cardbus.c,v 1.13 2007/03/21 12:17:31 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_re_cardbus.c,v 1.14 2007/10/19 11:59:39 ad Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -69,7 +69,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_re_cardbus.c,v 1.13 2007/03/21 12:17:31 tsutsui E
#include <sys/rnd.h>
#endif
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
diff --git a/sys/dev/cardbus/if_rtk_cardbus.c b/sys/dev/cardbus/if_rtk_cardbus.c
index 7108ca3dd99..9e3f843a165 100644
--- a/sys/dev/cardbus/if_rtk_cardbus.c
+++ b/sys/dev/cardbus/if_rtk_cardbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_rtk_cardbus.c,v 1.32 2007/03/21 12:17:31 tsutsui Exp $ */
+/* $NetBSD: if_rtk_cardbus.c,v 1.33 2007/10/19 11:59:39 ad Exp $ */
/*
* Copyright (c) 2000 Masanori Kanaoka
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_rtk_cardbus.c,v 1.32 2007/03/21 12:17:31 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rtk_cardbus.c,v 1.33 2007/10/19 11:59:39 ad Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -69,7 +69,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_rtk_cardbus.c,v 1.32 2007/03/21 12:17:31 tsutsui
#include <sys/rnd.h>
#endif
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
diff --git a/sys/dev/cardbus/if_rtw_cardbus.c b/sys/dev/cardbus/if_rtw_cardbus.c
index 291c28eeaab..224c3894d37 100644
--- a/sys/dev/cardbus/if_rtw_cardbus.c
+++ b/sys/dev/cardbus/if_rtw_cardbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_rtw_cardbus.c,v 1.15 2006/11/16 01:32:48 christos Exp $ */
+/* $NetBSD: if_rtw_cardbus.c,v 1.16 2007/10/19 11:59:39 ad Exp $ */
/*-
* Copyright (c) 2004, 2005 David Young. All rights reserved.
@@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_rtw_cardbus.c,v 1.15 2006/11/16 01:32:48 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rtw_cardbus.c,v 1.16 2007/10/19 11:59:39 ad Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -110,8 +110,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_rtw_cardbus.c,v 1.15 2006/11/16 01:32:48 christos
#endif
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/ic/rtwreg.h>
#include <dev/ic/rtwvar.h>
diff --git a/sys/dev/cardbus/if_tlp_cardbus.c b/sys/dev/cardbus/if_tlp_cardbus.c
index c14c5030a38..e388c8150b5 100644
--- a/sys/dev/cardbus/if_tlp_cardbus.c
+++ b/sys/dev/cardbus/if_tlp_cardbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tlp_cardbus.c,v 1.53 2006/11/16 01:32:48 christos Exp $ */
+/* $NetBSD: if_tlp_cardbus.c,v 1.54 2007/10/19 11:59:39 ad Exp $ */
/*-
* Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tlp_cardbus.c,v 1.53 2006/11/16 01:32:48 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tlp_cardbus.c,v 1.54 2007/10/19 11:59:39 ad Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -75,8 +75,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_tlp_cardbus.c,v 1.53 2006/11/16 01:32:48 christos
#endif
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/mii/miivar.h>
#include <dev/mii/mii_bitbang.h>
diff --git a/sys/dev/cardbus/njata_cardbus.c b/sys/dev/cardbus/njata_cardbus.c
index 08d3b4ef958..49c79ac3cc7 100644
--- a/sys/dev/cardbus/njata_cardbus.c
+++ b/sys/dev/cardbus/njata_cardbus.c
@@ -1,4 +1,4 @@
-/* $Id: njata_cardbus.c,v 1.4 2006/12/31 12:50:19 ichiro Exp $ */
+/* $Id: njata_cardbus.c,v 1.5 2007/10/19 11:59:39 ad Exp $ */
/*
* Copyright (c) 2006 ITOH Yasufumi <itohy@NetBSD.org>.
@@ -27,15 +27,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: njata_cardbus.c,v 1.4 2006/12/31 12:50:19 ichiro Exp $");
+__KERNEL_RCSID(0, "$NetBSD: njata_cardbus.c,v 1.5 2007/10/19 11:59:39 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/cardbus/cardbusvar.h>
#include <dev/pci/pcidevs.h>
diff --git a/sys/dev/cardbus/njs_cardbus.c b/sys/dev/cardbus/njs_cardbus.c
index 7039d7bad0e..e1924c65cf6 100644
--- a/sys/dev/cardbus/njs_cardbus.c
+++ b/sys/dev/cardbus/njs_cardbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: njs_cardbus.c,v 1.5 2006/11/16 01:32:48 christos Exp $ */
+/* $NetBSD: njs_cardbus.c,v 1.6 2007/10/19 11:59:39 ad Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -37,15 +37,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: njs_cardbus.c,v 1.5 2006/11/16 01:32:48 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: njs_cardbus.c,v 1.6 2007/10/19 11:59:39 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/scsipi/scsi_all.h>
#include <dev/scsipi/scsipi_all.h>
diff --git a/sys/dev/cardbus/ohci_cardbus.c b/sys/dev/cardbus/ohci_cardbus.c
index 035818a0561..bd25c094690 100644
--- a/sys/dev/cardbus/ohci_cardbus.c
+++ b/sys/dev/cardbus/ohci_cardbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci_cardbus.c,v 1.23 2006/11/16 01:32:48 christos Exp $ */
+/* $NetBSD: ohci_cardbus.c,v 1.24 2007/10/19 11:59:39 ad Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci_cardbus.c,v 1.23 2006/11/16 01:32:48 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci_cardbus.c,v 1.24 2007/10/19 11:59:39 ad Exp $");
#include "ehci_cardbus.h"
@@ -55,7 +55,7 @@ __KERNEL_RCSID(0, "$NetBSD: ohci_cardbus.c,v 1.23 2006/11/16 01:32:48 christos E
#include <sys/device.h>
#include <sys/proc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#if defined pciinc
#include <dev/pci/pcidevs.h>
diff --git a/sys/dev/cardbus/rbus.c b/sys/dev/cardbus/rbus.c
index cdd59f48d9a..2047ba69103 100644
--- a/sys/dev/cardbus/rbus.c
+++ b/sys/dev/cardbus/rbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rbus.c,v 1.24 2006/04/14 22:32:14 christos Exp $ */
+/* $NetBSD: rbus.c,v 1.25 2007/10/19 11:59:39 ad Exp $ */
/*
* Copyright (c) 1999 and 2000
* HAYAKAWA Koichi. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rbus.c,v 1.24 2006/04/14 22:32:14 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rbus.c,v 1.25 2007/10/19 11:59:39 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: rbus.c,v 1.24 2006/04/14 22:32:14 christos Exp $");
#include <sys/malloc.h>
#include <sys/extent.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/cardbus/rbus.h>
diff --git a/sys/dev/cardbus/rbus.h b/sys/dev/cardbus/rbus.h
index ef272df89b3..a5bb708aac4 100644
--- a/sys/dev/cardbus/rbus.h
+++ b/sys/dev/cardbus/rbus.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rbus.h,v 1.9 2005/12/11 12:21:15 christos Exp $ */
+/* $NetBSD: rbus.h,v 1.10 2007/10/19 11:59:40 ad Exp $ */
/*
* Copyright (c) 1999
* HAYAKAWA Koichi. All rights reserved.
@@ -65,7 +65,7 @@
/* require sys/extent.h */
-/* require machine/bus.h */
+/* require sys/bus.h */
#define rbus 1
diff --git a/sys/dev/cardbus/rbus_ppb.c b/sys/dev/cardbus/rbus_ppb.c
index 0146231fe17..e3dce70a900 100644
--- a/sys/dev/cardbus/rbus_ppb.c
+++ b/sys/dev/cardbus/rbus_ppb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rbus_ppb.c,v 1.19 2006/03/29 06:22:38 thorpej Exp $ */
+/* $NetBSD: rbus_ppb.c,v 1.20 2007/10/19 11:59:40 ad Exp $ */
/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rbus_ppb.c,v 1.19 2006/03/29 06:22:38 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rbus_ppb.c,v 1.20 2007/10/19 11:59:40 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -59,8 +59,8 @@ __KERNEL_RCSID(0, "$NetBSD: rbus_ppb.c,v 1.19 2006/03/29 06:22:38 thorpej Exp $"
#include <machine/endian.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
diff --git a/sys/dev/cardbus/uhci_cardbus.c b/sys/dev/cardbus/uhci_cardbus.c
index 3c87faceee1..989e40e7c3a 100644
--- a/sys/dev/cardbus/uhci_cardbus.c
+++ b/sys/dev/cardbus/uhci_cardbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uhci_cardbus.c,v 1.5 2006/11/16 01:32:48 christos Exp $ */
+/* $NetBSD: uhci_cardbus.c,v 1.6 2007/10/19 11:59:40 ad Exp $ */
/*
* Copyright (c) 1998-2005 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhci_cardbus.c,v 1.5 2006/11/16 01:32:48 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci_cardbus.c,v 1.6 2007/10/19 11:59:40 ad Exp $");
#include "ehci_cardbus.h"
@@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: uhci_cardbus.c,v 1.5 2006/11/16 01:32:48 christos Ex
#include <sys/proc.h>
#include <sys/queue.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/cardbus/cardbusvar.h>
#include <dev/cardbus/usb_cardbus.h>
diff --git a/sys/dev/dec/dz.c b/sys/dev/dec/dz.c
index 3fde7eaaab3..8e3ff18effa 100644
--- a/sys/dev/dec/dz.c
+++ b/sys/dev/dec/dz.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dz.c,v 1.29 2007/10/08 16:52:49 ad Exp $ */
+/* $NetBSD: dz.c,v 1.30 2007/10/19 11:59:40 ad Exp $ */
/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dz.c,v 1.29 2007/10/08 16:52:49 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dz.c,v 1.30 2007/10/19 11:59:40 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -84,7 +84,7 @@ __KERNEL_RCSID(0, "$NetBSD: dz.c,v 1.29 2007/10/08 16:52:49 ad Exp $");
#include <sys/device.h>
#include <sys/kauth.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/dec/dzreg.h>
#include <dev/dec/dzvar.h>
diff --git a/sys/dev/dec/dzkbd.c b/sys/dev/dec/dzkbd.c
index 36f315738cc..fee15177aa8 100644
--- a/sys/dev/dec/dzkbd.c
+++ b/sys/dev/dec/dzkbd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dzkbd.c,v 1.18 2007/07/14 17:23:21 ad Exp $ */
+/* $NetBSD: dzkbd.c,v 1.19 2007/10/19 11:59:40 ad Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dzkbd.c,v 1.18 2007/07/14 17:23:21 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dzkbd.c,v 1.19 2007/10/19 11:59:40 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -60,7 +60,7 @@ __KERNEL_RCSID(0, "$NetBSD: dzkbd.c,v 1.18 2007/07/14 17:23:21 ad Exp $");
#include <dev/wscons/wsksymvar.h>
#include <dev/dec/wskbdmap_lk201.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/dec/dzreg.h>
#include <dev/dec/dzvar.h>
diff --git a/sys/dev/dec/dzms.c b/sys/dev/dec/dzms.c
index 7fff7869b5e..a28cf108b83 100644
--- a/sys/dev/dec/dzms.c
+++ b/sys/dev/dec/dzms.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dzms.c,v 1.16 2007/03/04 06:01:45 christos Exp $ */
+/* $NetBSD: dzms.c,v 1.17 2007/10/19 11:59:40 ad Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dzms.c,v 1.16 2007/03/04 06:01:45 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dzms.c,v 1.17 2007/10/19 11:59:40 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -56,7 +56,7 @@ __KERNEL_RCSID(0, "$NetBSD: dzms.c,v 1.16 2007/03/04 06:01:45 christos Exp $");
#include <sys/proc.h>
#include <sys/tty.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/dec/dzreg.h>
#include <dev/dec/dzvar.h>
diff --git a/sys/dev/dec/if_le_dec.c b/sys/dev/dec/if_le_dec.c
index a3aedcd3dca..449843efbfd 100644
--- a/sys/dev/dec/if_le_dec.c
+++ b/sys/dev/dec/if_le_dec.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le_dec.c,v 1.17 2005/12/24 20:27:29 perry Exp $ */
+/* $NetBSD: if_le_dec.c,v 1.18 2007/10/19 11:59:40 ad Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le_dec.c,v 1.17 2005/12/24 20:27:29 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le_dec.c,v 1.18 2007/10/19 11:59:40 ad Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -102,7 +102,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_le_dec.c,v 1.17 2005/12/24 20:27:29 perry Exp $")
#include <dev/tc/if_levar.h>
#include <dev/tc/tcvar.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
/* access LANCE registers */
void le_dec_writereg(volatile u_short *regptr, u_short val);
diff --git a/sys/dev/drm/drmP.h b/sys/dev/drm/drmP.h
index 445726f470f..c99ed3e40e5 100644
--- a/sys/dev/drm/drmP.h
+++ b/sys/dev/drm/drmP.h
@@ -84,7 +84,7 @@ typedef struct drm_file drm_file_t;
#include <machine/resource.h>
#endif
#include <machine/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#if !defined(DRM_NO_MTRR)
#include <machine/sysarch.h>
#endif
diff --git a/sys/dev/ebus/cs4231_ebus.c b/sys/dev/ebus/cs4231_ebus.c
index 087fdcdfe75..6f082bf7d32 100644
--- a/sys/dev/ebus/cs4231_ebus.c
+++ b/sys/dev/ebus/cs4231_ebus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cs4231_ebus.c,v 1.22 2006/10/15 19:43:45 martin Exp $ */
+/* $NetBSD: cs4231_ebus.c,v 1.23 2007/10/19 11:59:40 ad Exp $ */
/*
* Copyright (c) 2002 Valeriy E. Ushakov
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cs4231_ebus.c,v 1.22 2006/10/15 19:43:45 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cs4231_ebus.c,v 1.23 2007/10/19 11:59:40 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: cs4231_ebus.c,v 1.22 2006/10/15 19:43:45 martin Exp
#include <sys/malloc.h>
#include <machine/autoconf.h>
-#include <machine/cpu.h>
+#include <sys/cpu.h>
#include <dev/ebus/ebusreg.h>
#include <dev/ebus/ebusvar.h>
diff --git a/sys/dev/eisa/ahb.c b/sys/dev/eisa/ahb.c
index 61f95b7281f..d06f9df7163 100644
--- a/sys/dev/eisa/ahb.c
+++ b/sys/dev/eisa/ahb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ahb.c,v 1.48 2007/03/04 06:01:46 christos Exp $ */
+/* $NetBSD: ahb.c,v 1.49 2007/10/19 11:59:41 ad Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahb.c,v 1.48 2007/03/04 06:01:46 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahb.c,v 1.49 2007/10/19 11:59:41 ad Exp $");
#include "opt_ddb.h"
@@ -72,8 +72,8 @@ __KERNEL_RCSID(0, "$NetBSD: ahb.c,v 1.48 2007/03/04 06:01:46 christos Exp $");
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/scsipi/scsi_all.h>
#include <dev/scsipi/scsipi_all.h>
diff --git a/sys/dev/eisa/ahc_eisa.c b/sys/dev/eisa/ahc_eisa.c
index ba4e0f35272..75101985fce 100644
--- a/sys/dev/eisa/ahc_eisa.c
+++ b/sys/dev/eisa/ahc_eisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ahc_eisa.c,v 1.33 2006/11/16 01:32:50 christos Exp $ */
+/* $NetBSD: ahc_eisa.c,v 1.34 2007/10/19 11:59:41 ad Exp $ */
/*
* Product specific probe and attach routines for:
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahc_eisa.c,v 1.33 2006/11/16 01:32:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahc_eisa.c,v 1.34 2007/10/19 11:59:41 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -40,8 +40,8 @@ __KERNEL_RCSID(0, "$NetBSD: ahc_eisa.c,v 1.33 2006/11/16 01:32:50 christos Exp $
#include <sys/device.h>
#include <sys/reboot.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/scsipi/scsi_all.h>
#include <dev/scsipi/scsipi_all.h>
diff --git a/sys/dev/eisa/bha_eisa.c b/sys/dev/eisa/bha_eisa.c
index bfbafe5364d..d3464fa9a57 100644
--- a/sys/dev/eisa/bha_eisa.c
+++ b/sys/dev/eisa/bha_eisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bha_eisa.c,v 1.28 2006/11/16 01:32:50 christos Exp $ */
+/* $NetBSD: bha_eisa.c,v 1.29 2007/10/19 11:59:41 ad Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,14 +37,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bha_eisa.c,v 1.28 2006/11/16 01:32:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bha_eisa.c,v 1.29 2007/10/19 11:59:41 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/scsipi/scsipi_all.h>
#include <dev/scsipi/scsiconf.h>
diff --git a/sys/dev/eisa/cac_eisa.c b/sys/dev/eisa/cac_eisa.c
index e9630c0193a..0dd8f6dd00e 100644
--- a/sys/dev/eisa/cac_eisa.c
+++ b/sys/dev/eisa/cac_eisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cac_eisa.c,v 1.17 2007/03/04 06:01:46 christos Exp $ */
+/* $NetBSD: cac_eisa.c,v 1.18 2007/10/19 11:59:41 ad Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -68,14 +68,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cac_eisa.c,v 1.17 2007/03/04 06:01:46 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cac_eisa.c,v 1.18 2007/10/19 11:59:41 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/eisa/eisavar.h>
#include <dev/eisa/eisadevs.h>
diff --git a/sys/dev/eisa/depca_eisa.c b/sys/dev/eisa/depca_eisa.c
index 97c889228e2..f78c12d8db2 100644
--- a/sys/dev/eisa/depca_eisa.c
+++ b/sys/dev/eisa/depca_eisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: depca_eisa.c,v 1.9 2006/03/29 06:32:36 thorpej Exp $ */
+/* $NetBSD: depca_eisa.c,v 1.10 2007/10/19 11:59:41 ad Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: depca_eisa.c,v 1.9 2006/03/29 06:32:36 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: depca_eisa.c,v 1.10 2007/10/19 11:59:41 ad Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -62,8 +62,8 @@ __KERNEL_RCSID(0, "$NetBSD: depca_eisa.c,v 1.9 2006/03/29 06:32:36 thorpej Exp $
#include <netinet/if_inarp.h>
#endif
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/eisa/eisareg.h>
#include <dev/eisa/eisavar.h>
diff --git a/sys/dev/eisa/dpt_eisa.c b/sys/dev/eisa/dpt_eisa.c
index 6172d99f5de..32dab0c0219 100644
--- a/sys/dev/eisa/dpt_eisa.c
+++ b/sys/dev/eisa/dpt_eisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dpt_eisa.c,v 1.16 2006/11/16 01:32:50 christos Exp $ */
+/* $NetBSD: dpt_eisa.c,v 1.17 2007/10/19 11:59:41 ad Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Andrew Doran <ad@NetBSD.org>
@@ -32,15 +32,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dpt_eisa.c,v 1.16 2006/11/16 01:32:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dpt_eisa.c,v 1.17 2007/10/19 11:59:41 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/queue.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/scsipi/scsipi_all.h>
#include <dev/scsipi/scsiconf.h>
diff --git a/sys/dev/eisa/eisa.c b/sys/dev/eisa/eisa.c
index ee90d4288fe..10074a0b7bb 100644
--- a/sys/dev/eisa/eisa.c
+++ b/sys/dev/eisa/eisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: eisa.c,v 1.41 2006/11/16 01:32:50 christos Exp $ */
+/* $NetBSD: eisa.c,v 1.42 2007/10/19 11:59:41 ad Exp $ */
/*
* Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: eisa.c,v 1.41 2006/11/16 01:32:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eisa.c,v 1.42 2007/10/19 11:59:41 ad Exp $");
#include "opt_eisaverbose.h"
@@ -47,7 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: eisa.c,v 1.41 2006/11/16 01:32:50 christos Exp $");
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/eisa/eisareg.h>
#include <dev/eisa/eisavar.h>
diff --git a/sys/dev/eisa/eisavar.h b/sys/dev/eisa/eisavar.h
index b7832eab726..80dfd43da1e 100644
--- a/sys/dev/eisa/eisavar.h
+++ b/sys/dev/eisa/eisavar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: eisavar.h,v 1.22 2005/12/11 12:21:20 christos Exp $ */
+/* $NetBSD: eisavar.h,v 1.23 2007/10/19 11:59:41 ad Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -83,7 +83,7 @@ struct eisa_cfg_irq;
struct eisa_cfg_dma;
struct eisa_cfg_io;
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/eisa/eisareg.h> /* For ID register & string info. */
/*
diff --git a/sys/dev/eisa/if_ep_eisa.c b/sys/dev/eisa/if_ep_eisa.c
index 7592fc00a38..776e5c7fd5e 100644
--- a/sys/dev/eisa/if_ep_eisa.c
+++ b/sys/dev/eisa/if_ep_eisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ep_eisa.c,v 1.35 2006/11/16 01:32:50 christos Exp $ */
+/* $NetBSD: if_ep_eisa.c,v 1.36 2007/10/19 11:59:41 ad Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ep_eisa.c,v 1.35 2006/11/16 01:32:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ep_eisa.c,v 1.36 2007/10/19 11:59:41 ad Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -105,9 +105,9 @@ __KERNEL_RCSID(0, "$NetBSD: if_ep_eisa.c,v 1.35 2006/11/16 01:32:50 christos Exp
#include <net/bpfdesc.h>
#endif
-#include <machine/cpu.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/cpu.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/mii/miivar.h>
diff --git a/sys/dev/eisa/if_fea.c b/sys/dev/eisa/if_fea.c
index aa95cc8d0b9..035350aa732 100644
--- a/sys/dev/eisa/if_fea.c
+++ b/sys/dev/eisa/if_fea.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fea.c,v 1.34 2007/03/04 06:01:46 christos Exp $ */
+/* $NetBSD: if_fea.c,v 1.35 2007/10/19 11:59:41 ad Exp $ */
/*-
* Copyright (c) 1995, 1996 Matt Thomas <matt@3am-software.com>
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_fea.c,v 1.34 2007/03/04 06:01:46 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fea.c,v 1.35 2007/10/19 11:59:41 ad Exp $");
#include "opt_inet.h"
@@ -90,8 +90,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_fea.c,v 1.34 2007/03/04 06:01:46 christos Exp $")
#include <dev/pdq/pdqvar.h>
#include <dev/pdq/pdqreg.h>
#elif defined(__NetBSD__)
-#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/cpu.h>
+#include <sys/bus.h>
#include <dev/ic/pdqvar.h>
#include <dev/ic/pdqreg.h>
diff --git a/sys/dev/eisa/if_tlp_eisa.c b/sys/dev/eisa/if_tlp_eisa.c
index e42166fca7f..2fce103b6dc 100644
--- a/sys/dev/eisa/if_tlp_eisa.c
+++ b/sys/dev/eisa/if_tlp_eisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tlp_eisa.c,v 1.18 2006/11/16 01:32:50 christos Exp $ */
+/* $NetBSD: if_tlp_eisa.c,v 1.19 2007/10/19 11:59:42 ad Exp $ */
/*-
* Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tlp_eisa.c,v 1.18 2006/11/16 01:32:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tlp_eisa.c,v 1.19 2007/10/19 11:59:42 ad Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -75,8 +75,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_tlp_eisa.c,v 1.18 2006/11/16 01:32:50 christos Ex
#endif
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/mii/miivar.h>
#include <dev/mii/mii_bitbang.h>
diff --git a/sys/dev/eisa/mlx_eisa.c b/sys/dev/eisa/mlx_eisa.c
index 6e84f6db345..60da6f3ea70 100644
--- a/sys/dev/eisa/mlx_eisa.c
+++ b/sys/dev/eisa/mlx_eisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mlx_eisa.c,v 1.18 2006/11/16 01:32:50 christos Exp $ */
+/* $NetBSD: mlx_eisa.c,v 1.19 2007/10/19 11:59:42 ad Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -41,14 +41,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mlx_eisa.c,v 1.18 2006/11/16 01:32:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mlx_eisa.c,v 1.19 2007/10/19 11:59:42 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/eisa/eisavar.h>
#include <dev/eisa/eisadevs.h>
diff --git a/sys/dev/eisa/uha_eisa.c b/sys/dev/eisa/uha_eisa.c
index 3f21d8029f6..3e63276b062 100644
--- a/sys/dev/eisa/uha_eisa.c
+++ b/sys/dev/eisa/uha_eisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uha_eisa.c,v 1.26 2006/11/16 01:32:50 christos Exp $ */
+/* $NetBSD: uha_eisa.c,v 1.27 2007/10/19 11:59:42 ad Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uha_eisa.c,v 1.26 2006/11/16 01:32:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uha_eisa.c,v 1.27 2007/10/19 11:59:42 ad Exp $");
#include "opt_ddb.h"
@@ -48,8 +48,8 @@ __KERNEL_RCSID(0, "$NetBSD: uha_eisa.c,v 1.26 2006/11/16 01:32:50 christos Exp $
#include <sys/proc.h>
#include <sys/user.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/scsipi/scsi_all.h>
#include <dev/scsipi/scsipi_all.h>
diff --git a/sys/dev/hpc/bicons.c b/sys/dev/hpc/bicons.c
index 64394ba70ae..99535dcf6fc 100644
--- a/sys/dev/hpc/bicons.c
+++ b/sys/dev/hpc/bicons.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bicons.c,v 1.11 2006/08/31 18:31:59 matt Exp $ */
+/* $NetBSD: bicons.c,v 1.12 2007/10/19 11:59:42 ad Exp $ */
/*-
* Copyright (c) 1999-2001
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bicons.c,v 1.11 2006/08/31 18:31:59 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bicons.c,v 1.12 2007/10/19 11:59:42 ad Exp $");
#define HALF_FONT
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: bicons.c,v 1.11 2006/08/31 18:31:59 matt Exp $");
#include <dev/cons.h>
#include <machine/bootinfo.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/platid.h>
#include <machine/stdarg.h>
diff --git a/sys/dev/hpc/bivideo.c b/sys/dev/hpc/bivideo.c
index 91aeb04b002..cb2f2813df5 100644
--- a/sys/dev/hpc/bivideo.c
+++ b/sys/dev/hpc/bivideo.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bivideo.c,v 1.26 2007/03/04 06:01:46 christos Exp $ */
+/* $NetBSD: bivideo.c,v 1.27 2007/10/19 11:59:42 ad Exp $ */
/*-
* Copyright (c) 1999-2001
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bivideo.c,v 1.26 2007/03/04 06:01:46 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bivideo.c,v 1.27 2007/10/19 11:59:42 ad Exp $");
#ifdef _KERNEL_OPT
#include "opt_hpcfb.h"
@@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: bivideo.c,v 1.26 2007/03/04 06:01:46 christos Exp $"
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/bootinfo.h>
#include <machine/config_hook.h>
diff --git a/sys/dev/hpc/btnmgr.c b/sys/dev/hpc/btnmgr.c
index b5791cf27be..d948f6c689c 100644
--- a/sys/dev/hpc/btnmgr.c
+++ b/sys/dev/hpc/btnmgr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: btnmgr.c,v 1.21 2007/03/04 06:01:46 christos Exp $ */
+/* $NetBSD: btnmgr.c,v 1.22 2007/10/19 11:59:42 ad Exp $ */
/*-
* Copyright (c) 1999
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: btnmgr.c,v 1.21 2007/03/04 06:01:46 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btnmgr.c,v 1.22 2007/10/19 11:59:42 ad Exp $");
#ifdef _KERNEL_OPT
#include "opt_btnmgr.h"
@@ -57,7 +57,7 @@ __KERNEL_RCSID(0, "$NetBSD: btnmgr.c,v 1.21 2007/03/04 06:01:46 christos Exp $")
#include <dev/hpc/pckbd_encode.h>
#endif
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/config_hook.h>
diff --git a/sys/dev/hpc/button.c b/sys/dev/hpc/button.c
index cdba99225e3..f0f79d9ca81 100644
--- a/sys/dev/hpc/button.c
+++ b/sys/dev/hpc/button.c
@@ -1,4 +1,4 @@
-/* $NetBSD: button.c,v 1.12 2006/03/29 04:16:49 thorpej Exp $ */
+/* $NetBSD: button.c,v 1.13 2007/10/19 11:59:42 ad Exp $ */
/*-
* Copyright (c) 1999-2001
@@ -35,13 +35,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: button.c,v 1.12 2006/03/29 04:16:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: button.c,v 1.13 2007/10/19 11:59:42 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/config_hook.h>
#include <machine/platid.h>
diff --git a/sys/dev/hpc/hpcapm.c b/sys/dev/hpc/hpcapm.c
index 221dc9712b1..813ca6c1499 100644
--- a/sys/dev/hpc/hpcapm.c
+++ b/sys/dev/hpc/hpcapm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hpcapm.c,v 1.12 2006/11/16 01:32:50 christos Exp $ */
+/* $NetBSD: hpcapm.c,v 1.13 2007/10/19 11:59:42 ad Exp $ */
/*
* Copyright (c) 2000 Takemura Shin
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpcapm.c,v 1.12 2006/11/16 01:32:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpcapm.c,v 1.13 2007/10/19 11:59:42 ad Exp $");
#ifdef _KERNEL_OPT
#include "opt_hpcapm.h"
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: hpcapm.c,v 1.12 2006/11/16 01:32:50 christos Exp $")
#include <dev/hpc/apm/apmvar.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/config_hook.h>
#include <machine/platid.h>
#include <machine/platid_mask.h>
diff --git a/sys/dev/hpc/hpcfb.c b/sys/dev/hpc/hpcfb.c
index 7cafceccc3c..248894bdfcc 100644
--- a/sys/dev/hpc/hpcfb.c
+++ b/sys/dev/hpc/hpcfb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hpcfb.c,v 1.42 2007/07/09 21:00:32 ad Exp $ */
+/* $NetBSD: hpcfb.c,v 1.43 2007/10/19 11:59:42 ad Exp $ */
/*-
* Copyright (c) 1999
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpcfb.c,v 1.42 2007/07/09 21:00:32 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpcfb.c,v 1.43 2007/10/19 11:59:42 ad Exp $");
#ifdef _KERNEL_OPT
#include "opt_hpcfb.h"
@@ -65,7 +65,7 @@ __KERNEL_RCSID(0, "$NetBSD: hpcfb.c,v 1.42 2007/07/09 21:00:32 ad Exp $");
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/wscons/wsconsio.h>
#include <dev/wscons/wsdisplayvar.h>
diff --git a/sys/dev/hpc/hpcin.c b/sys/dev/hpc/hpcin.c
index 1eca97ff0e0..736ce0b56b1 100644
--- a/sys/dev/hpc/hpcin.c
+++ b/sys/dev/hpc/hpcin.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hpcin.c,v 1.9 2006/03/29 06:37:35 thorpej Exp $ */
+/* $NetBSD: hpcin.c,v 1.10 2007/10/19 11:59:43 ad Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -37,14 +37,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpcin.c,v 1.9 2006/03/29 06:37:35 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpcin.c,v 1.10 2007/10/19 11:59:43 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <machine/config_hook.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/hpc/hpciovar.h>
#include <dev/hpc/hpciomanvar.h>
diff --git a/sys/dev/hpc/hpcioman.c b/sys/dev/hpc/hpcioman.c
index f20fb657aba..34dc4d4607e 100644
--- a/sys/dev/hpc/hpcioman.c
+++ b/sys/dev/hpc/hpcioman.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hpcioman.c,v 1.14 2005/12/11 12:21:22 christos Exp $ */
+/* $NetBSD: hpcioman.c,v 1.15 2007/10/19 11:59:43 ad Exp $ */
/*-
* Copyright (c) 1999-2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpcioman.c,v 1.14 2005/12/11 12:21:22 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpcioman.c,v 1.15 2007/10/19 11:59:43 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -47,7 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: hpcioman.c,v 1.14 2005/12/11 12:21:22 christos Exp $
#include <machine/platid.h>
#include <machine/platid_mask.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/hpc/hpciovar.h>
#include <dev/hpc/hpciomanvar.h>
diff --git a/sys/dev/hpc/hpckbd.c b/sys/dev/hpc/hpckbd.c
index 35cf1dda792..ee5be5bff27 100644
--- a/sys/dev/hpc/hpckbd.c
+++ b/sys/dev/hpc/hpckbd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hpckbd.c,v 1.23 2007/09/23 12:21:47 kiyohara Exp $ */
+/* $NetBSD: hpckbd.c,v 1.24 2007/10/19 11:59:43 ad Exp $ */
/*-
* Copyright (c) 1999-2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpckbd.c,v 1.23 2007/09/23 12:21:47 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpckbd.c,v 1.24 2007/10/19 11:59:43 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -45,8 +45,8 @@ __KERNEL_RCSID(0, "$NetBSD: hpckbd.c,v 1.23 2007/09/23 12:21:47 kiyohara Exp $")
#include <sys/tty.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <machine/config_hook.h>
#include <machine/platid.h>
diff --git a/sys/dev/hpc/hpcout.c b/sys/dev/hpc/hpcout.c
index 4eca9a75d84..8e76fc33cd9 100644
--- a/sys/dev/hpc/hpcout.c
+++ b/sys/dev/hpc/hpcout.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hpcout.c,v 1.10 2006/03/29 06:37:35 thorpej Exp $ */
+/* $NetBSD: hpcout.c,v 1.11 2007/10/19 11:59:43 ad Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -37,14 +37,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpcout.c,v 1.10 2006/03/29 06:37:35 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpcout.c,v 1.11 2007/10/19 11:59:43 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <machine/config_hook.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/hpc/hpciovar.h>
#include <dev/hpc/hpciomanvar.h>
diff --git a/sys/dev/hpc/pwctl.c b/sys/dev/hpc/pwctl.c
index e6a6e46576d..519a5a60188 100644
--- a/sys/dev/hpc/pwctl.c
+++ b/sys/dev/hpc/pwctl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pwctl.c,v 1.16 2006/10/09 10:33:42 peter Exp $ */
+/* $NetBSD: pwctl.c,v 1.17 2007/10/19 11:59:43 ad Exp $ */
/*-
* Copyright (c) 1999-2001
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pwctl.c,v 1.16 2006/10/09 10:33:42 peter Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pwctl.c,v 1.17 2007/10/19 11:59:43 ad Exp $");
#ifdef _KERNEL_OPT
#include "opt_pwctl.h"
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: pwctl.c,v 1.16 2006/10/09 10:33:42 peter Exp $");
#include <sys/device.h>
#include <sys/reboot.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/config_hook.h>
#include <machine/platid.h>
#include <machine/platid_mask.h>
diff --git a/sys/dev/i2c/at24cxx.c b/sys/dev/i2c/at24cxx.c
index 74907a0bfb1..0a13132bc1a 100644
--- a/sys/dev/i2c/at24cxx.c
+++ b/sys/dev/i2c/at24cxx.c
@@ -1,4 +1,4 @@
-/* $NetBSD: at24cxx.c,v 1.7 2007/01/12 08:47:43 imp Exp $ */
+/* $NetBSD: at24cxx.c,v 1.8 2007/10/19 11:59:43 ad Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -45,7 +45,7 @@
#include <sys/proc.h>
#include <sys/event.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/i2c/i2cvar.h>
#include <dev/i2c/at24cxxvar.h>
diff --git a/sys/dev/i2c/ddc.c b/sys/dev/i2c/ddc.c
index eab1bfb1657..869254850e5 100644
--- a/sys/dev/i2c/ddc.c
+++ b/sys/dev/i2c/ddc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ddc.c,v 1.1 2006/04/25 21:18:16 gdamore Exp $ */
+/* $NetBSD: ddc.c,v 1.2 2007/10/19 11:59:43 ad Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -32,14 +32,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ddc.c,v 1.1 2006/04/25 21:18:16 gdamore Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ddc.c,v 1.2 2007/10/19 11:59:43 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/kernel.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/i2c/i2cvar.h>
#include <dev/i2c/ddcreg.h>
#include <dev/i2c/ddcvar.h>
diff --git a/sys/dev/i2c/m41t00.c b/sys/dev/i2c/m41t00.c
index 5c3bd1e43a2..85ed11c9653 100644
--- a/sys/dev/i2c/m41t00.c
+++ b/sys/dev/i2c/m41t00.c
@@ -1,4 +1,4 @@
-/* $NetBSD: m41t00.c,v 1.8 2007/01/12 19:33:21 cube Exp $ */
+/* $NetBSD: m41t00.c,v 1.9 2007/10/19 11:59:43 ad Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -45,7 +45,7 @@
#include <sys/proc.h>
#include <sys/event.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/clock_subr.h>
diff --git a/sys/dev/i2o/dpti.c b/sys/dev/i2o/dpti.c
index 50ad2422533..a9b885b4e01 100644
--- a/sys/dev/i2o/dpti.c
+++ b/sys/dev/i2o/dpti.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dpti.c,v 1.34 2007/06/16 12:32:12 ad Exp $ */
+/* $NetBSD: dpti.c,v 1.35 2007/10/19 11:59:43 ad Exp $ */
/*-
* Copyright (c) 2001, 2007 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dpti.c,v 1.34 2007/06/16 12:32:12 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dpti.c,v 1.35 2007/10/19 11:59:43 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -80,7 +80,7 @@ __KERNEL_RCSID(0, "$NetBSD: dpti.c,v 1.34 2007/06/16 12:32:12 ad Exp $");
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#ifdef __i386__
#include <machine/pio.h>
#endif
diff --git a/sys/dev/i2o/iop.c b/sys/dev/i2o/iop.c
index 9e6de436f41..46d47e26954 100644
--- a/sys/dev/i2o/iop.c
+++ b/sys/dev/i2o/iop.c
@@ -1,4 +1,4 @@
-/* $NetBSD: iop.c,v 1.66 2007/07/09 21:00:33 ad Exp $ */
+/* $NetBSD: iop.c,v 1.67 2007/10/19 11:59:43 ad Exp $ */
/*-
* Copyright (c) 2000, 2001, 2002, 2007 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iop.c,v 1.66 2007/07/09 21:00:33 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iop.c,v 1.67 2007/10/19 11:59:43 ad Exp $");
#include "iop.h"
@@ -57,11 +57,10 @@ __KERNEL_RCSID(0, "$NetBSD: iop.c,v 1.66 2007/07/09 21:00:33 ad Exp $");
#include <sys/conf.h>
#include <sys/kthread.h>
#include <sys/kauth.h>
+#include <sys/bus.h>
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
-
#include <dev/i2o/i2o.h>
#include <dev/i2o/iopio.h>
#include <dev/i2o/iopreg.h>
diff --git a/sys/dev/i2o/iopl.c b/sys/dev/i2o/iopl.c
index 070c44fb16b..b504564b19a 100644
--- a/sys/dev/i2o/iopl.c
+++ b/sys/dev/i2o/iopl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: iopl.c,v 1.28 2007/09/01 07:43:36 dyoung Exp $ */
+/* $NetBSD: iopl.c,v 1.29 2007/10/19 11:59:44 ad Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iopl.c,v 1.28 2007/09/01 07:43:36 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iopl.c,v 1.29 2007/10/19 11:59:44 ad Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -63,7 +63,7 @@ __KERNEL_RCSID(0, "$NetBSD: iopl.c,v 1.28 2007/09/01 07:43:36 dyoung Exp $");
#include <sys/sockio.h>
#include <sys/mbuf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <uvm/uvm_extern.h>
diff --git a/sys/dev/i2o/iopsp.c b/sys/dev/i2o/iopsp.c
index e080a074fb3..3cc3301974e 100644
--- a/sys/dev/i2o/iopsp.c
+++ b/sys/dev/i2o/iopsp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: iopsp.c,v 1.28 2007/06/16 12:32:12 ad Exp $ */
+/* $NetBSD: iopsp.c,v 1.29 2007/10/19 11:59:44 ad Exp $ */
/*-
* Copyright (c) 2000, 2001, 2007 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iopsp.c,v 1.28 2007/06/16 12:32:12 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iopsp.c,v 1.29 2007/10/19 11:59:44 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -56,7 +56,7 @@ __KERNEL_RCSID(0, "$NetBSD: iopsp.c,v 1.28 2007/06/16 12:32:12 ad Exp $");
#include <sys/scsiio.h>
#include <sys/bswap.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/scsipi/scsi_all.h>
#include <dev/scsipi/scsi_disk.h>
diff --git a/sys/dev/i2o/ld_iop.c b/sys/dev/i2o/ld_iop.c
index 26fc3672622..e4e81428863 100644
--- a/sys/dev/i2o/ld_iop.c
+++ b/sys/dev/i2o/ld_iop.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_iop.c,v 1.25 2007/07/29 12:50:20 ad Exp $ */
+/* $NetBSD: ld_iop.c,v 1.26 2007/10/19 11:59:44 ad Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_iop.c,v 1.25 2007/07/29 12:50:20 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_iop.c,v 1.26 2007/10/19 11:59:44 ad Exp $");
#include "rnd.h"
@@ -61,7 +61,7 @@ __KERNEL_RCSID(0, "$NetBSD: ld_iop.c,v 1.25 2007/07/29 12:50:20 ad Exp $");
#include <sys/rnd.h>
#endif
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ldvar.h>
diff --git a/sys/dev/ic/aac.c b/sys/dev/ic/aac.c
index d72d4cfbfd9..a7068d3d9ec 100644
--- a/sys/dev/ic/aac.c
+++ b/sys/dev/ic/aac.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aac.c,v 1.35 2007/07/09 21:00:33 ad Exp $ */
+/* $NetBSD: aac.c,v 1.36 2007/10/19 11:59:44 ad Exp $ */
/*-
* Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aac.c,v 1.35 2007/07/09 21:00:33 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aac.c,v 1.36 2007/10/19 11:59:44 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -87,7 +87,7 @@ __KERNEL_RCSID(0, "$NetBSD: aac.c,v 1.35 2007/07/09 21:00:33 ad Exp $");
#include <sys/malloc.h>
#include <sys/proc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <uvm/uvm_extern.h>
diff --git a/sys/dev/ic/acpipmtimer.c b/sys/dev/ic/acpipmtimer.c
index ff487362a85..4aeff06bf70 100644
--- a/sys/dev/ic/acpipmtimer.c
+++ b/sys/dev/ic/acpipmtimer.c
@@ -1,7 +1,7 @@
-/* $NetBSD: acpipmtimer.c,v 1.3 2007/08/27 06:18:55 xtraeme Exp $ */
+/* $NetBSD: acpipmtimer.c,v 1.4 2007/10/19 11:59:44 ad Exp $ */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpipmtimer.c,v 1.3 2007/08/27 06:18:55 xtraeme Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpipmtimer.c,v 1.4 2007/10/19 11:59:44 ad Exp $");
#include <sys/types.h>
@@ -10,7 +10,7 @@ __KERNEL_RCSID(0, "$NetBSD: acpipmtimer.c,v 1.3 2007/08/27 06:18:55 xtraeme Exp
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/time.h>
#include <sys/timetc.h>
diff --git a/sys/dev/ic/ad1848.c b/sys/dev/ic/ad1848.c
index 5cfb27782b1..5f63b5ee66d 100644
--- a/sys/dev/ic/ad1848.c
+++ b/sys/dev/ic/ad1848.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ad1848.c,v 1.25 2006/11/16 01:32:50 christos Exp $ */
+/* $NetBSD: ad1848.c,v 1.26 2007/10/19 11:59:44 ad Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -102,7 +102,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ad1848.c,v 1.25 2006/11/16 01:32:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ad1848.c,v 1.26 2007/10/19 11:59:44 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -113,8 +113,8 @@ __KERNEL_RCSID(0, "$NetBSD: ad1848.c,v 1.25 2006/11/16 01:32:50 christos Exp $")
/*#include <sys/syslog.h>*/
/*#include <sys/proc.h>*/
-#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/cpu.h>
+#include <sys/bus.h>
#include <sys/audioio.h>
diff --git a/sys/dev/ic/adv.c b/sys/dev/ic/adv.c
index c93efa269f6..a09a292b419 100644
--- a/sys/dev/ic/adv.c
+++ b/sys/dev/ic/adv.c
@@ -1,4 +1,4 @@
-/* $NetBSD: adv.c,v 1.40 2007/07/09 21:00:33 ad Exp $ */
+/* $NetBSD: adv.c,v 1.41 2007/10/19 11:59:45 ad Exp $ */
/*
* Generic driver for the Advanced Systems Inc. Narrow SCSI controllers
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adv.c,v 1.40 2007/07/09 21:00:33 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adv.c,v 1.41 2007/10/19 11:59:45 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -52,8 +52,8 @@ __KERNEL_RCSID(0, "$NetBSD: adv.c,v 1.40 2007/07/09 21:00:33 ad Exp $");
#include <sys/proc.h>
#include <sys/user.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <uvm/uvm_extern.h>
diff --git a/sys/dev/ic/advlib.c b/sys/dev/ic/advlib.c
index 8313f5a9c0c..56ac8f18792 100644
--- a/sys/dev/ic/advlib.c
+++ b/sys/dev/ic/advlib.c
@@ -1,4 +1,4 @@
-/* $NetBSD: advlib.c,v 1.25 2006/11/16 01:32:50 christos Exp $ */
+/* $NetBSD: advlib.c,v 1.26 2007/10/19 11:59:45 ad Exp $ */
/*
* Low level routines for the Advanced Systems Inc. SCSI controllers chips
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: advlib.c,v 1.25 2006/11/16 01:32:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: advlib.c,v 1.26 2007/10/19 11:59:45 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -62,8 +62,8 @@ __KERNEL_RCSID(0, "$NetBSD: advlib.c,v 1.25 2006/11/16 01:32:50 christos Exp $")
#include <sys/queue.h>
#include <sys/device.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/scsipi/scsi_all.h>
#include <dev/scsipi/scsipi_all.h>
diff --git a/sys/dev/ic/adw.c b/sys/dev/ic/adw.c
index f306b4044fc..0dea00a2cd9 100644
--- a/sys/dev/ic/adw.c
+++ b/sys/dev/ic/adw.c
@@ -1,4 +1,4 @@
-/* $NetBSD: adw.c,v 1.47 2007/03/04 06:01:48 christos Exp $ */
+/* $NetBSD: adw.c,v 1.48 2007/10/19 11:59:45 ad Exp $ */
/*
* Generic driver for the Advanced Systems Inc. SCSI controllers
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adw.c,v 1.47 2007/03/04 06:01:48 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adw.c,v 1.48 2007/10/19 11:59:45 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -52,8 +52,8 @@ __KERNEL_RCSID(0, "$NetBSD: adw.c,v 1.47 2007/03/04 06:01:48 christos Exp $");
#include <sys/proc.h>
#include <sys/user.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <uvm/uvm_extern.h>
diff --git a/sys/dev/ic/adwlib.c b/sys/dev/ic/adwlib.c
index 9e850f76125..e491501ee43 100644
--- a/sys/dev/ic/adwlib.c
+++ b/sys/dev/ic/adwlib.c
@@ -1,4 +1,4 @@
-/* $NetBSD: adwlib.c,v 1.37 2006/08/27 23:19:03 christos Exp $ */
+/* $NetBSD: adwlib.c,v 1.38 2007/10/19 11:59:45 ad Exp $ */
/*
* Low level routines for the Advanced Systems Inc. SCSI controllers chips
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adwlib.c,v 1.37 2006/08/27 23:19:03 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adwlib.c,v 1.38 2007/10/19 11:59:45 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -61,8 +61,8 @@ __KERNEL_RCSID(0, "$NetBSD: adwlib.c,v 1.37 2006/08/27 23:19:03 christos Exp $")
#include <sys/queue.h>
#include <sys/device.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/scsipi/scsi_all.h>
#include <dev/scsipi/scsipi_all.h>
diff --git a/sys/dev/ic/adwmcode.c b/sys/dev/ic/adwmcode.c
index ad8d833a89d..141df03ec29 100644
--- a/sys/dev/ic/adwmcode.c
+++ b/sys/dev/ic/adwmcode.c
@@ -1,4 +1,4 @@
-/* $NetBSD: adwmcode.c,v 1.14 2005/12/11 12:21:25 christos Exp $ */
+/* $NetBSD: adwmcode.c,v 1.15 2007/10/19 11:59:45 ad Exp $ */
/*
* Generic driver definitions and exported functions for the Advanced
@@ -54,7 +54,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adwmcode.c,v 1.14 2005/12/11 12:21:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adwmcode.c,v 1.15 2007/10/19 11:59:45 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -68,8 +68,8 @@ __KERNEL_RCSID(0, "$NetBSD: adwmcode.c,v 1.14 2005/12/11 12:21:25 christos Exp $
#include <sys/proc.h>
#include <sys/user.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include "adwmcode.h"
diff --git a/sys/dev/ic/aha.c b/sys/dev/ic/aha.c
index 1c34ca93996..bfff8af02b4 100644
--- a/sys/dev/ic/aha.c
+++ b/sys/dev/ic/aha.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aha.c,v 1.53 2007/03/04 06:01:48 christos Exp $ */
+/* $NetBSD: aha.c,v 1.54 2007/10/19 11:59:46 ad Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aha.c,v 1.53 2007/03/04 06:01:48 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aha.c,v 1.54 2007/10/19 11:59:46 ad Exp $");
#include "opt_ddb.h"
@@ -73,8 +73,8 @@ __KERNEL_RCSID(0, "$NetBSD: aha.c,v 1.53 2007/03/04 06:01:48 christos Exp $");
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/scsipi/scsi_all.h>
#include <dev/scsipi/scsipi_all.h>
diff --git a/sys/dev/ic/aic6360.c b/sys/dev/ic/aic6360.c
index 00feb364deb..a9ad8b69c19 100644
--- a/sys/dev/ic/aic6360.c
+++ b/sys/dev/ic/aic6360.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aic6360.c,v 1.92 2006/11/16 01:32:50 christos Exp $ */
+/* $NetBSD: aic6360.c,v 1.93 2007/10/19 11:59:46 ad Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Charles M. Hannum. All rights reserved.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aic6360.c,v 1.92 2006/11/16 01:32:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic6360.c,v 1.93 2007/10/19 11:59:46 ad Exp $");
#include "opt_ddb.h"
@@ -130,8 +130,8 @@ __KERNEL_RCSID(0, "$NetBSD: aic6360.c,v 1.92 2006/11/16 01:32:50 christos Exp $"
#include <sys/user.h>
#include <sys/queue.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/scsipi/scsi_spc.h>
#include <dev/scsipi/scsi_all.h>
diff --git a/sys/dev/ic/aic6915.c b/sys/dev/ic/aic6915.c
index c248cd9db7b..349ac4bad53 100644
--- a/sys/dev/ic/aic6915.c
+++ b/sys/dev/ic/aic6915.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aic6915.c,v 1.18 2007/08/26 22:36:35 dyoung Exp $ */
+/* $NetBSD: aic6915.c,v 1.19 2007/10/19 11:59:46 ad Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aic6915.c,v 1.18 2007/08/26 22:36:35 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic6915.c,v 1.19 2007/10/19 11:59:46 ad Exp $");
#include "bpfilter.h"
@@ -68,8 +68,8 @@ __KERNEL_RCSID(0, "$NetBSD: aic6915.c,v 1.18 2007/08/26 22:36:35 dyoung Exp $");
#include <net/bpf.h>
#endif
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/mii/miivar.h>
diff --git a/sys/dev/ic/aic77xx.c b/sys/dev/ic/aic77xx.c
index 5ca5b93bc3b..9b940402222 100644
--- a/sys/dev/ic/aic77xx.c
+++ b/sys/dev/ic/aic77xx.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aic77xx.c,v 1.6 2005/12/11 12:21:25 christos Exp $ */
+/* $NetBSD: aic77xx.c,v 1.7 2007/10/19 11:59:46 ad Exp $ */
/*
* Common routines for AHA-27/284X and aic7770 motherboard SCSI controllers.
@@ -31,14 +31,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aic77xx.c,v 1.6 2005/12/11 12:21:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic77xx.c,v 1.7 2007/10/19 11:59:46 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/scsipi/scsi_all.h>
#include <dev/scsipi/scsipi_all.h>
diff --git a/sys/dev/ic/aic79xx_osm.h b/sys/dev/ic/aic79xx_osm.h
index 59b62eafd0c..3b2f5de8c76 100644
--- a/sys/dev/ic/aic79xx_osm.h
+++ b/sys/dev/ic/aic79xx_osm.h
@@ -1,4 +1,4 @@
-/* $NetBSD: aic79xx_osm.h,v 1.13 2007/07/09 21:00:34 ad Exp $ */
+/* $NetBSD: aic79xx_osm.h,v 1.14 2007/10/19 11:59:46 ad Exp $ */
/*
* NetBSD platform specific driver option settings, data structures,
@@ -32,9 +32,9 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $NetBSD: aic79xx_osm.h,v 1.13 2007/07/09 21:00:34 ad Exp $
+ * $NetBSD: aic79xx_osm.h,v 1.14 2007/10/19 11:59:46 ad Exp $
*
- * //depot/aic7xxx/freebsd/dev/aic7xxx/aic79xx_osm.h#19 $$NetBSD: aic79xx_osm.h,v 1.13 2007/07/09 21:00:34 ad Exp $
+ * //depot/aic7xxx/freebsd/dev/aic7xxx/aic79xx_osm.h#19 $$NetBSD: aic79xx_osm.h,v 1.14 2007/10/19 11:59:46 ad Exp $
*
* $FreeBSD: src/sys/dev/aic7xxx/aic79xx_osm.h,v 1.9 2003/05/26 21:43:29 gibbs Exp $
*/
@@ -62,8 +62,8 @@
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/scsipi/scsi_all.h>
#include <dev/scsipi/scsipi_all.h>
diff --git a/sys/dev/ic/aic7xxx_osm.h b/sys/dev/ic/aic7xxx_osm.h
index 786c7dce966..9b2adf2bb8b 100644
--- a/sys/dev/ic/aic7xxx_osm.h
+++ b/sys/dev/ic/aic7xxx_osm.h
@@ -1,4 +1,4 @@
-/* $NetBSD: aic7xxx_osm.h,v 1.18 2007/07/09 21:00:34 ad Exp $ */
+/* $NetBSD: aic7xxx_osm.h,v 1.19 2007/10/19 11:59:46 ad Exp $ */
/*
* NetBSD platform specific driver option settings, data structures,
@@ -58,8 +58,8 @@
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/scsipi/scsi_all.h>
#include <dev/scsipi/scsipi_all.h>
diff --git a/sys/dev/ic/aic7xxx_seeprom.c b/sys/dev/ic/aic7xxx_seeprom.c
index 1661a1b06e7..6a06d28b9bf 100644
--- a/sys/dev/ic/aic7xxx_seeprom.c
+++ b/sys/dev/ic/aic7xxx_seeprom.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aic7xxx_seeprom.c,v 1.11 2005/12/11 12:21:25 christos Exp $ */
+/* $NetBSD: aic7xxx_seeprom.c,v 1.12 2007/10/19 11:59:46 ad Exp $ */
/*
* Product specific probe and attach routines for:
@@ -46,13 +46,13 @@
* from the FreeBSD source file aic7xxx_pci.c by Frank van der Linden
* <fvdl@NetBSD.org>
*
- * $Id: aic7xxx_seeprom.c,v 1.11 2005/12/11 12:21:25 christos Exp $
+ * $Id: aic7xxx_seeprom.c,v 1.12 2007/10/19 11:59:46 ad Exp $
*
* $FreeBSD: src/sys/dev/aic7xxx/aic7xxx_pci.c,v 1.22 2003/01/20 20:44:55 gibbs Exp $
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aic7xxx_seeprom.c,v 1.11 2005/12/11 12:21:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic7xxx_seeprom.c,v 1.12 2007/10/19 11:59:46 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -62,8 +62,8 @@ __KERNEL_RCSID(0, "$NetBSD: aic7xxx_seeprom.c,v 1.11 2005/12/11 12:21:25 christo
#include <sys/device.h>
#include <sys/reboot.h> /* for AB_* needed by bootverbose */
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/scsipi/scsi_all.h>
#include <dev/scsipi/scsipi_all.h>
diff --git a/sys/dev/ic/am7930.c b/sys/dev/ic/am7930.c
index 246970c5677..d1af7cef278 100644
--- a/sys/dev/ic/am7930.c
+++ b/sys/dev/ic/am7930.c
@@ -1,4 +1,4 @@
-/* $NetBSD: am7930.c,v 1.49 2005/12/11 12:21:25 christos Exp $ */
+/* $NetBSD: am7930.c,v 1.50 2007/10/19 11:59:46 ad Exp $ */
/*
* Copyright (c) 1995 Rolf Grossmann
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: am7930.c,v 1.49 2005/12/11 12:21:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: am7930.c,v 1.50 2007/10/19 11:59:46 ad Exp $");
#include "audio.h"
#if NAUDIO > 0
@@ -48,9 +48,9 @@ __KERNEL_RCSID(0, "$NetBSD: am7930.c,v 1.49 2005/12/11 12:21:25 christos Exp $")
#include <sys/device.h>
#include <sys/proc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
-#include <machine/cpu.h>
+#include <sys/cpu.h>
#include <sys/audioio.h>
#include <dev/audio_if.h>
diff --git a/sys/dev/ic/am79c930.c b/sys/dev/ic/am79c930.c
index 4f0526e195d..ac6ce55f9d4 100644
--- a/sys/dev/ic/am79c930.c
+++ b/sys/dev/ic/am79c930.c
@@ -1,4 +1,4 @@
-/* $NetBSD: am79c930.c,v 1.14 2005/12/11 12:21:25 christos Exp $ */
+/* $NetBSD: am79c930.c,v 1.15 2007/10/19 11:59:47 ad Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
#include <sys/cdefs.h>
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: am79c930.c,v 1.14 2005/12/11 12:21:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: am79c930.c,v 1.15 2007/10/19 11:59:47 ad Exp $");
#endif
#ifdef __FreeBSD__
__FBSDID("$FreeBSD$");
@@ -75,14 +75,14 @@ __FBSDID("$FreeBSD$");
#include <sys/device.h>
#endif
-#include <machine/cpu.h>
+#include <sys/cpu.h>
#ifdef __FreeBSD__
#include <machine/bus_pio.h>
#include <machine/bus_memio.h>
#endif
-#include <machine/bus.h>
+#include <sys/bus.h>
#ifdef __NetBSD__
-#include <machine/intr.h>
+#include <sys/intr.h>
#endif
#ifdef __NetBSD__
diff --git a/sys/dev/ic/an.c b/sys/dev/ic/an.c
index ee643a368db..85274e44824 100644
--- a/sys/dev/ic/an.c
+++ b/sys/dev/ic/an.c
@@ -1,4 +1,4 @@
-/* $NetBSD: an.c,v 1.48 2007/03/04 06:01:49 christos Exp $ */
+/* $NetBSD: an.c,v 1.49 2007/10/19 11:59:47 ad Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: an.c,v 1.48 2007/03/04 06:01:49 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: an.c,v 1.49 2007/10/19 11:59:47 ad Exp $");
#include "bpfilter.h"
@@ -96,7 +96,7 @@ __KERNEL_RCSID(0, "$NetBSD: an.c,v 1.48 2007/03/04 06:01:49 christos Exp $");
#include <sys/endian.h>
#include <sys/kauth.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <net/if.h>
#include <net/if_dl.h>
diff --git a/sys/dev/ic/ath.c b/sys/dev/ic/ath.c
index 09079b61df6..b0ba1dc723f 100644
--- a/sys/dev/ic/ath.c
+++ b/sys/dev/ic/ath.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ath.c,v 1.86 2007/09/01 07:32:25 dyoung Exp $ */
+/* $NetBSD: ath.c,v 1.87 2007/10/19 11:59:47 ad Exp $ */
/*-
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -41,7 +41,7 @@
__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.104 2005/09/16 10:09:23 ru Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: ath.c,v 1.86 2007/09/01 07:32:25 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ath.c,v 1.87 2007/10/19 11:59:47 ad Exp $");
#endif
/*
@@ -70,7 +70,7 @@ __KERNEL_RCSID(0, "$NetBSD: ath.c,v 1.86 2007/09/01 07:32:25 dyoung Exp $");
#include <sys/sockio.h>
#include <sys/errno.h>
#include <sys/callout.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/endian.h>
#include <net/if.h>
diff --git a/sys/dev/ic/ath_netbsd.c b/sys/dev/ic/ath_netbsd.c
index a5459a0588f..4bfd2c8275b 100644
--- a/sys/dev/ic/ath_netbsd.c
+++ b/sys/dev/ic/ath_netbsd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ath_netbsd.c,v 1.10 2007/03/04 06:01:49 christos Exp $ */
+/* $NetBSD: ath_netbsd.c,v 1.11 2007/10/19 11:59:47 ad Exp $ */
/*-
* Copyright (c) 2003, 2004 David Young
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ath_netbsd.c,v 1.10 2007/03/04 06:01:49 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ath_netbsd.c,v 1.11 2007/10/19 11:59:47 ad Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: ath_netbsd.c,v 1.10 2007/03/04 06:01:49 christos Exp
#include <sys/sockio.h>
#include <sys/sysctl.h>
#include <sys/callout.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/stdarg.h>
#include <sys/endian.h>
#include <sys/device.h>
diff --git a/sys/dev/ic/athrate-amrr.c b/sys/dev/ic/athrate-amrr.c
index 6e72f2f887e..c20210981fe 100644
--- a/sys/dev/ic/athrate-amrr.c
+++ b/sys/dev/ic/athrate-amrr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: athrate-amrr.c,v 1.8 2006/04/02 05:52:50 gdamore Exp $ */
+/* $NetBSD: athrate-amrr.c,v 1.9 2007/10/19 11:59:47 ad Exp $ */
/*-
* Copyright (c) 2004 INRIA
@@ -43,7 +43,7 @@
__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/amrr/amrr.c,v 1.10 2005/08/09 10:19:43 rwatson Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: athrate-amrr.c,v 1.8 2006/04/02 05:52:50 gdamore Exp $");
+__KERNEL_RCSID(0, "$NetBSD: athrate-amrr.c,v 1.9 2007/10/19 11:59:47 ad Exp $");
#endif
/*
@@ -61,7 +61,7 @@ __KERNEL_RCSID(0, "$NetBSD: athrate-amrr.c,v 1.8 2006/04/02 05:52:50 gdamore Exp
#include <sys/lock.h>
#include <sys/errno.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/socket.h>
diff --git a/sys/dev/ic/athrate-onoe.c b/sys/dev/ic/athrate-onoe.c
index 5e176bfbbbf..b665f3fee78 100644
--- a/sys/dev/ic/athrate-onoe.c
+++ b/sys/dev/ic/athrate-onoe.c
@@ -1,4 +1,4 @@
-/* $NetBSD: athrate-onoe.c,v 1.9 2006/04/02 05:52:50 gdamore Exp $ */
+/* $NetBSD: athrate-onoe.c,v 1.10 2007/10/19 11:59:47 ad Exp $ */
/*-
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -41,7 +41,7 @@
__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/onoe/onoe.c,v 1.10 2005/08/09 10:19:43 rwatson Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: athrate-onoe.c,v 1.9 2006/04/02 05:52:50 gdamore Exp $");
+__KERNEL_RCSID(0, "$NetBSD: athrate-onoe.c,v 1.10 2007/10/19 11:59:47 ad Exp $");
#endif
/*
@@ -57,7 +57,7 @@ __KERNEL_RCSID(0, "$NetBSD: athrate-onoe.c,v 1.9 2006/04/02 05:52:50 gdamore Exp
#include <sys/errno.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/socket.h>
diff --git a/sys/dev/ic/athrate-sample.c b/sys/dev/ic/athrate-sample.c
index 9d26bcb3980..4a0a75b95df 100644
--- a/sys/dev/ic/athrate-sample.c
+++ b/sys/dev/ic/athrate-sample.c
@@ -1,4 +1,4 @@
-/* $NetBSD: athrate-sample.c,v 1.12 2006/11/16 01:32:51 christos Exp $ */
+/* $NetBSD: athrate-sample.c,v 1.13 2007/10/19 11:59:47 ad Exp $ */
/*-
* Copyright (c) 2005 John Bicket
@@ -41,7 +41,7 @@
__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/sample/sample.c,v 1.9 2005/07/22 16:50:17 sam Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: athrate-sample.c,v 1.12 2006/11/16 01:32:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: athrate-sample.c,v 1.13 2007/10/19 11:59:47 ad Exp $");
#endif
@@ -58,7 +58,7 @@ __KERNEL_RCSID(0, "$NetBSD: athrate-sample.c,v 1.12 2006/11/16 01:32:51 christos
#include <sys/errno.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/socket.h>
diff --git a/sys/dev/ic/atppc.c b/sys/dev/ic/atppc.c
index 506f113f7bf..4f148fed6a8 100644
--- a/sys/dev/ic/atppc.c
+++ b/sys/dev/ic/atppc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: atppc.c,v 1.23 2007/03/04 06:01:50 christos Exp $ */
+/* $NetBSD: atppc.c,v 1.24 2007/10/19 11:59:48 ad Exp $ */
/*
* Copyright (c) 2001 Alcove - Nicolas Souchu
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atppc.c,v 1.23 2007/03/04 06:01:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atppc.c,v 1.24 2007/10/19 11:59:48 ad Exp $");
#include "opt_atppc.h"
@@ -45,8 +45,8 @@ __KERNEL_RCSID(0, "$NetBSD: atppc.c,v 1.23 2007/03/04 06:01:50 christos Exp $");
#include <sys/vnode.h>
#include <sys/syslog.h>
-#include <machine/bus.h>
-/*#include <machine/intr.h>*/
+#include <sys/bus.h>
+/*#include <sys/intr.h>*/
#include <dev/isa/isareg.h>
diff --git a/sys/dev/ic/atppcvar.h b/sys/dev/ic/atppcvar.h
index 600d2c446ea..f812346ac61 100644
--- a/sys/dev/ic/atppcvar.h
+++ b/sys/dev/ic/atppcvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: atppcvar.h,v 1.8 2007/03/04 06:01:50 christos Exp $ */
+/* $NetBSD: atppcvar.h,v 1.9 2007/10/19 11:59:48 ad Exp $ */
/*-
* Copyright (c) 2001 Alcove - Nicolas Souchu
@@ -32,7 +32,7 @@
#ifndef __ATPPCVAR_H
#define __ATPPCVAR_H
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/types.h>
#include <sys/device.h>
#include <sys/callout.h>
diff --git a/sys/dev/ic/attimer.c b/sys/dev/ic/attimer.c
index c74c56fc661..413a09b3603 100644
--- a/sys/dev/ic/attimer.c
+++ b/sys/dev/ic/attimer.c
@@ -1,4 +1,4 @@
-/* $NetBSD: attimer.c,v 1.3 2007/09/10 10:35:53 cube Exp $ */
+/* $NetBSD: attimer.c,v 1.4 2007/10/19 11:59:48 ad Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation.
@@ -36,14 +36,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: attimer.c,v 1.3 2007/09/10 10:35:53 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: attimer.c,v 1.4 2007/10/19 11:59:48 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isareg.h>
diff --git a/sys/dev/ic/atw.c b/sys/dev/ic/atw.c
index 4c79bfa93b1..bf0a74c3d83 100644
--- a/sys/dev/ic/atw.c
+++ b/sys/dev/ic/atw.c
@@ -1,4 +1,4 @@
-/* $NetBSD: atw.c,v 1.129 2007/09/29 18:32:50 scw Exp $ */
+/* $NetBSD: atw.c,v 1.130 2007/10/19 11:59:48 ad Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2002, 2003, 2004 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atw.c,v 1.129 2007/09/29 18:32:50 scw Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atw.c,v 1.130 2007/10/19 11:59:48 ad Exp $");
#include "bpfilter.h"
@@ -75,8 +75,8 @@ __KERNEL_RCSID(0, "$NetBSD: atw.c,v 1.129 2007/09/29 18:32:50 scw Exp $");
#include <net/bpf.h>
#endif
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/ic/atwreg.h>
#include <dev/ic/rf3000reg.h>
diff --git a/sys/dev/ic/awi.c b/sys/dev/ic/awi.c
index abe81fd42df..c69e31d46c8 100644
--- a/sys/dev/ic/awi.c
+++ b/sys/dev/ic/awi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: awi.c,v 1.76 2007/09/01 07:32:26 dyoung Exp $ */
+/* $NetBSD: awi.c,v 1.77 2007/10/19 11:59:48 ad Exp $ */
/*-
* Copyright (c) 1999,2000,2001 The NetBSD Foundation, Inc.
@@ -86,7 +86,7 @@
#include <sys/cdefs.h>
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: awi.c,v 1.76 2007/09/01 07:32:26 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: awi.c,v 1.77 2007/10/19 11:59:48 ad Exp $");
#endif
#ifdef __FreeBSD__
__FBSDID("$FreeBSD: src/sys/dev/awi/awi.c,v 1.30 2004/01/15 13:30:06 onoe Exp $");
@@ -136,8 +136,8 @@ __FBSDID("$FreeBSD: src/sys/dev/awi/awi.c,v 1.30 2004/01/15 13:30:06 onoe Exp $"
#include <net/bpf.h>
#endif
-#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/cpu.h>
+#include <sys/bus.h>
#ifdef __NetBSD__
#include <dev/ic/am79c930reg.h>
diff --git a/sys/dev/ic/ax88190.c b/sys/dev/ic/ax88190.c
index 2bb02963272..46729ae0dc0 100644
--- a/sys/dev/ic/ax88190.c
+++ b/sys/dev/ic/ax88190.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ax88190.c,v 1.7 2006/11/16 01:32:51 christos Exp $ */
+/* $NetBSD: ax88190.c,v 1.8 2007/10/19 11:59:48 ad Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ax88190.c,v 1.7 2006/11/16 01:32:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ax88190.c,v 1.8 2007/10/19 11:59:48 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: ax88190.c,v 1.7 2006/11/16 01:32:51 christos Exp $")
#include <net/if_media.h>
#include <net/if_ether.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/mii/miivar.h>
#include <dev/mii/mii.h>
diff --git a/sys/dev/ic/bha.c b/sys/dev/ic/bha.c
index e0941bbd482..e7622346921 100644
--- a/sys/dev/ic/bha.c
+++ b/sys/dev/ic/bha.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bha.c,v 1.68 2007/03/04 06:01:51 christos Exp $ */
+/* $NetBSD: bha.c,v 1.69 2007/10/19 11:59:48 ad Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bha.c,v 1.68 2007/03/04 06:01:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bha.c,v 1.69 2007/10/19 11:59:48 ad Exp $");
#include "opt_ddb.h"
@@ -71,8 +71,8 @@ __KERNEL_RCSID(0, "$NetBSD: bha.c,v 1.68 2007/03/04 06:01:51 christos Exp $");
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/scsipi/scsi_all.h>
#include <dev/scsipi/scsipi_all.h>
diff --git a/sys/dev/ic/cac.c b/sys/dev/ic/cac.c
index 62933a59e95..e284d15592b 100644
--- a/sys/dev/ic/cac.c
+++ b/sys/dev/ic/cac.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cac.c,v 1.41 2007/07/09 21:00:34 ad Exp $ */
+/* $NetBSD: cac.c,v 1.42 2007/10/19 11:59:49 ad Exp $ */
/*-
* Copyright (c) 2000, 2006, 2007 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cac.c,v 1.41 2007/07/09 21:00:34 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cac.c,v 1.42 2007/10/19 11:59:49 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -57,7 +57,7 @@ __KERNEL_RCSID(0, "$NetBSD: cac.c,v 1.41 2007/07/09 21:00:34 ad Exp $");
#include <uvm/uvm_extern.h>
#include <sys/bswap.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/cacreg.h>
#include <dev/ic/cacvar.h>
diff --git a/sys/dev/ic/cd18xx.c b/sys/dev/ic/cd18xx.c
index 90be8aca9bf..9c36ccb11df 100644
--- a/sys/dev/ic/cd18xx.c
+++ b/sys/dev/ic/cd18xx.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cd18xx.c,v 1.20 2007/10/08 16:18:03 ad Exp $ */
+/* $NetBSD: cd18xx.c,v 1.21 2007/10/19 11:59:49 ad Exp $ */
/* XXXad does this even compile? */
@@ -103,7 +103,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cd18xx.c,v 1.20 2007/10/08 16:18:03 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd18xx.c,v 1.21 2007/10/19 11:59:49 ad Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -117,7 +117,7 @@ __KERNEL_RCSID(0, "$NetBSD: cd18xx.c,v 1.20 2007/10/08 16:18:03 ad Exp $");
#include <sys/kauth.h>
#include <sys/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/cd18xxvar.h>
#include <dev/ic/cd18xxreg.h>
diff --git a/sys/dev/ic/ciss.c b/sys/dev/ic/ciss.c
index 766e48dc316..d4d8bd74038 100644
--- a/sys/dev/ic/ciss.c
+++ b/sys/dev/ic/ciss.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ciss.c,v 1.8 2007/07/09 21:00:35 ad Exp $ */
+/* $NetBSD: ciss.c,v 1.9 2007/10/19 11:59:49 ad Exp $ */
/* $OpenBSD: ciss.c,v 1.14 2006/03/13 16:02:23 mickey Exp $ */
/*
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ciss.c,v 1.8 2007/07/09 21:00:35 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ciss.c,v 1.9 2007/10/19 11:59:49 ad Exp $");
/* #define CISS_DEBUG */
@@ -35,7 +35,7 @@ __KERNEL_RCSID(0, "$NetBSD: ciss.c,v 1.8 2007/07/09 21:00:35 ad Exp $");
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/scsipi/scsi_all.h>
#include <dev/scsipi/scsi_disk.h>
diff --git a/sys/dev/ic/clmpcc.c b/sys/dev/ic/clmpcc.c
index c44a241fef1..4cd89b9a649 100644
--- a/sys/dev/ic/clmpcc.c
+++ b/sys/dev/ic/clmpcc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: clmpcc.c,v 1.34 2007/10/08 16:18:03 ad Exp $ */
+/* $NetBSD: clmpcc.c,v 1.35 2007/10/19 11:59:49 ad Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clmpcc.c,v 1.34 2007/10/08 16:18:03 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clmpcc.c,v 1.35 2007/10/19 11:59:49 ad Exp $");
#include "opt_ddb.h"
@@ -62,7 +62,7 @@ __KERNEL_RCSID(0, "$NetBSD: clmpcc.c,v 1.34 2007/10/08 16:18:03 ad Exp $");
#include <sys/kauth.h>
#include <sys/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/param.h>
#include <dev/ic/clmpccreg.h>
diff --git a/sys/dev/ic/com.c b/sys/dev/ic/com.c
index b41c0c39db9..ae4bc92687f 100644
--- a/sys/dev/ic/com.c
+++ b/sys/dev/ic/com.c
@@ -1,4 +1,4 @@
-/* $NetBSD: com.c,v 1.264 2007/10/17 17:20:41 ad Exp $ */
+/* $NetBSD: com.c,v 1.265 2007/10/19 11:59:49 ad Exp $ */
/*-
* Copyright (c) 1998, 1999, 2004 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.264 2007/10/17 17:20:41 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.265 2007/10/19 11:59:49 ad Exp $");
#include "opt_com.h"
#include "opt_ddb.h"
@@ -124,7 +124,7 @@ __KERNEL_RCSID(0, "$NetBSD: com.c,v 1.264 2007/10/17 17:20:41 ad Exp $");
#include <sys/kauth.h>
#include <sys/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/comreg.h>
#include <dev/ic/comvar.h>
diff --git a/sys/dev/ic/com_cpcbus.c b/sys/dev/ic/com_cpcbus.c
index 09fd256f7aa..de1ed4a8f09 100644
--- a/sys/dev/ic/com_cpcbus.c
+++ b/sys/dev/ic/com_cpcbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: com_cpcbus.c,v 1.8 2006/08/16 21:28:36 gdamore Exp $ */
+/* $NetBSD: com_cpcbus.c,v 1.9 2007/10/19 11:59:49 ad Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,14 +37,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_cpcbus.c,v 1.8 2006/08/16 21:28:36 gdamore Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_cpcbus.c,v 1.9 2007/10/19 11:59:49 ad Exp $");
#include <sys/param.h>
#include <sys/device.h>
#include <sys/tty.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/cpc700reg.h>
#include <dev/ic/cpc700var.h>
diff --git a/sys/dev/ic/com_upc.c b/sys/dev/ic/com_upc.c
index dd2f65e9d9e..f41304b1e0f 100644
--- a/sys/dev/ic/com_upc.c
+++ b/sys/dev/ic/com_upc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: com_upc.c,v 1.8 2006/07/13 22:56:02 gdamore Exp $ */
+/* $NetBSD: com_upc.c,v 1.9 2007/10/19 11:59:50 ad Exp $ */
/*-
* Copyright (c) 2000 Ben Harris
* All rights reserved.
@@ -28,14 +28,14 @@
/* This file is part of NetBSD/arm26 -- a port of NetBSD to ARM2/3 machines. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_upc.c,v 1.8 2006/07/13 22:56:02 gdamore Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_upc.c,v 1.9 2007/10/19 11:59:50 ad Exp $");
#include <sys/param.h>
#include <sys/device.h>
#include <sys/termios.h> /* XXX for tcflag_t in comvar.h */
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/ic/comreg.h>
#include <dev/ic/comvar.h>
diff --git a/sys/dev/ic/cpc700.c b/sys/dev/ic/cpc700.c
index d84614cb86e..7cd9f147d10 100644
--- a/sys/dev/ic/cpc700.c
+++ b/sys/dev/ic/cpc700.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cpc700.c,v 1.11 2005/12/11 12:21:26 christos Exp $ */
+/* $NetBSD: cpc700.c,v 1.12 2007/10/19 11:59:50 ad Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpc700.c,v 1.11 2005/12/11 12:21:26 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpc700.c,v 1.12 2007/10/19 11:59:50 ad Exp $");
#include "pci.h"
#include "opt_pci.h"
@@ -68,7 +68,7 @@ __KERNEL_RCSID(0, "$NetBSD: cpc700.c,v 1.11 2005/12/11 12:21:26 christos Exp $")
#include <sys/malloc.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include "locators.h"
#include <dev/pci/pcivar.h>
diff --git a/sys/dev/ic/cs4231.c b/sys/dev/ic/cs4231.c
index 8f7527ac425..89df54ca06d 100644
--- a/sys/dev/ic/cs4231.c
+++ b/sys/dev/ic/cs4231.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cs4231.c,v 1.18 2005/12/11 12:21:26 christos Exp $ */
+/* $NetBSD: cs4231.c,v 1.19 2007/10/19 11:59:50 ad Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cs4231.c,v 1.18 2005/12/11 12:21:26 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cs4231.c,v 1.19 2007/10/19 11:59:50 ad Exp $");
#include "audio.h"
#if NAUDIO > 0
@@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: cs4231.c,v 1.18 2005/12/11 12:21:26 christos Exp $")
#include <sys/malloc.h>
#include <machine/autoconf.h>
-#include <machine/cpu.h>
+#include <sys/cpu.h>
#include <sys/audioio.h>
#include <dev/audio_if.h>
diff --git a/sys/dev/ic/cs89x0.c b/sys/dev/ic/cs89x0.c
index e57f156c9ee..940757b5e07 100644
--- a/sys/dev/ic/cs89x0.c
+++ b/sys/dev/ic/cs89x0.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cs89x0.c,v 1.21 2007/03/04 06:01:53 christos Exp $ */
+/* $NetBSD: cs89x0.c,v 1.22 2007/10/19 11:59:50 ad Exp $ */
/*
* Copyright (c) 2004 Christopher Gilbert
@@ -212,7 +212,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cs89x0.c,v 1.21 2007/03/04 06:01:53 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cs89x0.c,v 1.22 2007/10/19 11:59:50 ad Exp $");
#include "opt_inet.h"
@@ -247,8 +247,8 @@ __KERNEL_RCSID(0, "$NetBSD: cs89x0.c,v 1.21 2007/03/04 06:01:53 christos Exp $")
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/ic/cs89x0reg.h>
#include <dev/ic/cs89x0var.h>
diff --git a/sys/dev/ic/cy.c b/sys/dev/ic/cy.c
index f6dbbc3c923..74fa6f2a905 100644
--- a/sys/dev/ic/cy.c
+++ b/sys/dev/ic/cy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cy.c,v 1.51 2007/07/09 21:00:35 ad Exp $ */
+/* $NetBSD: cy.c,v 1.52 2007/10/19 11:59:50 ad Exp $ */
/*
* cy.c
@@ -16,7 +16,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cy.c,v 1.51 2007/07/09 21:00:35 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cy.c,v 1.52 2007/10/19 11:59:50 ad Exp $");
#include <sys/param.h>
#include <sys/ioctl.h>
@@ -33,7 +33,7 @@ __KERNEL_RCSID(0, "$NetBSD: cy.c,v 1.51 2007/07/09 21:00:35 ad Exp $");
#include <sys/callout.h>
#include <sys/kauth.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/cd1400reg.h>
#include <dev/ic/cyreg.h>
diff --git a/sys/dev/ic/daic.c b/sys/dev/ic/daic.c
index 453e2da7526..7329051c6ec 100644
--- a/sys/dev/ic/daic.c
+++ b/sys/dev/ic/daic.c
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: daic.c,v 1.24 2007/02/25 21:06:57 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: daic.c,v 1.25 2007/10/19 11:59:50 ad Exp $");
/*
* daic.c: MI driver for Diehl active ISDN cards (S, SX, SXn, SCOM, QUADRO)
@@ -60,7 +60,7 @@ __KERNEL_RCSID(0, "$NetBSD: daic.c,v 1.24 2007/02/25 21:06:57 martin Exp $");
#include <netisdn/i4b_l3fsm.h>
#include <netisdn/i4b_l4.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/daicvar.h>
#include <dev/ic/daicreg.h>
#include <dev/microcode/daic/dnload.h>
diff --git a/sys/dev/ic/depca.c b/sys/dev/ic/depca.c
index 76b06230dfe..e63ac8ebce7 100644
--- a/sys/dev/ic/depca.c
+++ b/sys/dev/ic/depca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: depca.c,v 1.14 2006/11/16 01:32:51 christos Exp $ */
+/* $NetBSD: depca.c,v 1.15 2007/10/19 11:59:50 ad Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: depca.c,v 1.14 2006/11/16 01:32:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: depca.c,v 1.15 2007/10/19 11:59:50 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -85,9 +85,9 @@ __KERNEL_RCSID(0, "$NetBSD: depca.c,v 1.14 2006/11/16 01:32:51 christos Exp $");
#include <net/if_ether.h>
#include <net/if_media.h>
-#include <machine/cpu.h>
-#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/cpu.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
diff --git a/sys/dev/ic/dl10019.c b/sys/dev/ic/dl10019.c
index e62baf5615c..16dfbbf2877 100644
--- a/sys/dev/ic/dl10019.c
+++ b/sys/dev/ic/dl10019.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dl10019.c,v 1.7 2002/10/22 00:01:55 fair Exp $ */
+/* $NetBSD: dl10019.c,v 1.8 2007/10/19 11:59:50 ad Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dl10019.c,v 1.7 2002/10/22 00:01:55 fair Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dl10019.c,v 1.8 2007/10/19 11:59:50 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -50,8 +50,8 @@ __KERNEL_RCSID(0, "$NetBSD: dl10019.c,v 1.7 2002/10/22 00:01:55 fair Exp $");
#include <net/if_ether.h>
#include <net/if_media.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/mii/miivar.h>
#include <dev/mii/mii.h>
diff --git a/sys/dev/ic/dp8390.c b/sys/dev/ic/dp8390.c
index f26007b236e..32e0e4a9d6d 100644
--- a/sys/dev/ic/dp8390.c
+++ b/sys/dev/ic/dp8390.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dp8390.c,v 1.65 2007/09/01 07:32:26 dyoung Exp $ */
+/* $NetBSD: dp8390.c,v 1.66 2007/10/19 11:59:50 ad Exp $ */
/*
* Device driver for National Semiconductor DS8390/WD83C690 based ethernet
@@ -14,7 +14,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dp8390.c,v 1.65 2007/09/01 07:32:26 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dp8390.c,v 1.66 2007/10/19 11:59:50 ad Exp $");
#include "opt_ipkdb.h"
#include "opt_inet.h"
@@ -54,7 +54,7 @@ __KERNEL_RCSID(0, "$NetBSD: dp8390.c,v 1.65 2007/09/01 07:32:26 dyoung Exp $");
#include <net/bpfdesc.h>
#endif
-#include <machine/bus.h>
+#include <sys/bus.h>
#ifdef IPKDB_DP8390
#include <ipkdb/ipkdb.h>
diff --git a/sys/dev/ic/dp83905.c b/sys/dev/ic/dp83905.c
index aa98d9730e9..1db2d62978f 100644
--- a/sys/dev/ic/dp83905.c
+++ b/sys/dev/ic/dp83905.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dp83905.c,v 1.3 2005/12/11 12:21:26 christos Exp $ */
+/* $NetBSD: dp83905.c,v 1.4 2007/10/19 11:59:50 ad Exp $ */
/*-
* Copyright (c) 2001 Ben Harris
@@ -35,7 +35,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: dp83905.c,v 1.3 2005/12/11 12:21:26 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dp83905.c,v 1.4 2007/10/19 11:59:50 ad Exp $");
#include <sys/device.h>
#include <sys/mbuf.h>
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: dp83905.c,v 1.3 2005/12/11 12:21:26 christos Exp $")
#include <net/if_ether.h>
#include <net/if_media.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/dp8390reg.h>
#include <dev/ic/dp8390var.h>
diff --git a/sys/dev/ic/dp83932.c b/sys/dev/ic/dp83932.c
index b3754652c47..ecadb76b32a 100644
--- a/sys/dev/ic/dp83932.c
+++ b/sys/dev/ic/dp83932.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dp83932.c,v 1.18 2007/08/26 22:45:55 dyoung Exp $ */
+/* $NetBSD: dp83932.c,v 1.19 2007/10/19 11:59:50 ad Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dp83932.c,v 1.18 2007/08/26 22:45:55 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dp83932.c,v 1.19 2007/10/19 11:59:50 ad Exp $");
#include "bpfilter.h"
@@ -66,8 +66,8 @@ __KERNEL_RCSID(0, "$NetBSD: dp83932.c,v 1.18 2007/08/26 22:45:55 dyoung Exp $");
#include <net/bpf.h>
#endif
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/ic/dp83932reg.h>
#include <dev/ic/dp83932var.h>
diff --git a/sys/dev/ic/dpt.c b/sys/dev/ic/dpt.c
index 13333a501bd..ad0c9ed338e 100644
--- a/sys/dev/ic/dpt.c
+++ b/sys/dev/ic/dpt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dpt.c,v 1.57 2007/07/09 21:00:35 ad Exp $ */
+/* $NetBSD: dpt.c,v 1.58 2007/10/19 11:59:51 ad Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dpt.c,v 1.57 2007/07/09 21:00:35 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dpt.c,v 1.58 2007/10/19 11:59:51 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -92,7 +92,7 @@ __KERNEL_RCSID(0, "$NetBSD: dpt.c,v 1.57 2007/07/09 21:00:35 ad Exp $");
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#ifdef i386
#include <machine/pio.h>
#endif
diff --git a/sys/dev/ic/elink3.c b/sys/dev/ic/elink3.c
index 9ca19b309b5..c959edfa152 100644
--- a/sys/dev/ic/elink3.c
+++ b/sys/dev/ic/elink3.c
@@ -1,4 +1,4 @@
-/* $NetBSD: elink3.c,v 1.123 2007/08/27 14:48:54 dyoung Exp $ */
+/* $NetBSD: elink3.c,v 1.124 2007/10/19 11:59:51 ad Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: elink3.c,v 1.123 2007/08/27 14:48:54 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: elink3.c,v 1.124 2007/10/19 11:59:51 ad Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -100,9 +100,9 @@ __KERNEL_RCSID(0, "$NetBSD: elink3.c,v 1.123 2007/08/27 14:48:54 dyoung Exp $");
#include <net/bpfdesc.h>
#endif
-#include <machine/cpu.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/cpu.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
diff --git a/sys/dev/ic/elinkxl.c b/sys/dev/ic/elinkxl.c
index 0c1268c630c..de331185181 100644
--- a/sys/dev/ic/elinkxl.c
+++ b/sys/dev/ic/elinkxl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: elinkxl.c,v 1.98 2007/08/26 22:45:55 dyoung Exp $ */
+/* $NetBSD: elinkxl.c,v 1.99 2007/10/19 11:59:51 ad Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: elinkxl.c,v 1.98 2007/08/26 22:45:55 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: elinkxl.c,v 1.99 2007/10/19 11:59:51 ad Exp $");
#include "bpfilter.h"
#include "rnd.h"
@@ -69,9 +69,9 @@ __KERNEL_RCSID(0, "$NetBSD: elinkxl.c,v 1.98 2007/08/26 22:45:55 dyoung Exp $");
#include <net/bpfdesc.h>
#endif
-#include <machine/cpu.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/cpu.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <machine/endian.h>
#include <dev/mii/miivar.h>
diff --git a/sys/dev/ic/esiop.c b/sys/dev/ic/esiop.c
index c36358ddfa9..866e49af97a 100644
--- a/sys/dev/ic/esiop.c
+++ b/sys/dev/ic/esiop.c
@@ -1,4 +1,4 @@
-/* $NetBSD: esiop.c,v 1.40 2007/09/30 11:59:41 martin Exp $ */
+/* $NetBSD: esiop.c,v 1.41 2007/10/19 11:59:51 ad Exp $ */
/*
* Copyright (c) 2002 Manuel Bouyer.
@@ -33,7 +33,7 @@
/* SYM53c7/8xx PCI-SCSI I/O Processors driver */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esiop.c,v 1.40 2007/09/30 11:59:41 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esiop.c,v 1.41 2007/10/19 11:59:51 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: esiop.c,v 1.40 2007/09/30 11:59:41 martin Exp $");
#include <uvm/uvm_extern.h>
#include <machine/endian.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/microcode/siop/esiop.out>
diff --git a/sys/dev/ic/fmv.c b/sys/dev/ic/fmv.c
index 9ab8e2f0e88..a168b766b35 100644
--- a/sys/dev/ic/fmv.c
+++ b/sys/dev/ic/fmv.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fmv.c,v 1.7 2005/12/11 12:21:26 christos Exp $ */
+/* $NetBSD: fmv.c,v 1.8 2007/10/19 11:59:51 ad Exp $ */
/*
* All Rights Reserved, Copyright (C) Fujitsu Limited 1995
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fmv.c,v 1.7 2005/12/11 12:21:26 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fmv.c,v 1.8 2007/10/19 11:59:51 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: fmv.c,v 1.7 2005/12/11 12:21:26 christos Exp $");
#include <net/if_ether.h>
#include <net/if_media.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/mb86960reg.h>
#include <dev/ic/mb86960var.h>
diff --git a/sys/dev/ic/gem.c b/sys/dev/ic/gem.c
index 84616e10a63..1a9aea5dee1 100644
--- a/sys/dev/ic/gem.c
+++ b/sys/dev/ic/gem.c
@@ -1,4 +1,4 @@
-/* $NetBSD: gem.c,v 1.59 2007/09/29 18:32:50 scw Exp $ */
+/* $NetBSD: gem.c,v 1.60 2007/10/19 11:59:51 ad Exp $ */
/*
*
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gem.c,v 1.59 2007/09/29 18:32:50 scw Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gem.c,v 1.60 2007/10/19 11:59:51 ad Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -73,8 +73,8 @@ __KERNEL_RCSID(0, "$NetBSD: gem.c,v 1.59 2007/09/29 18:32:50 scw Exp $");
#include <net/bpf.h>
#endif
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
diff --git a/sys/dev/ic/hd44780_subr.c b/sys/dev/ic/hd44780_subr.c
index 71f4f80a8df..afd671b03b2 100644
--- a/sys/dev/ic/hd44780_subr.c
+++ b/sys/dev/ic/hd44780_subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hd44780_subr.c,v 1.11 2007/07/10 22:53:29 ad Exp $ */
+/* $NetBSD: hd44780_subr.c,v 1.12 2007/10/19 11:59:52 ad Exp $ */
/*
* Copyright (c) 2002 Dennis I. Chernoivanov
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hd44780_subr.c,v 1.11 2007/07/10 22:53:29 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hd44780_subr.c,v 1.12 2007/10/19 11:59:52 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -43,8 +43,8 @@ __KERNEL_RCSID(0, "$NetBSD: hd44780_subr.c,v 1.11 2007/07/10 22:53:29 ad Exp $")
#include <sys/ioccom.h>
#include <machine/autoconf.h>
-#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
#include <uvm/uvm_extern.h>
diff --git a/sys/dev/ic/hd64570.c b/sys/dev/ic/hd64570.c
index 9c2725511bd..110241a548b 100644
--- a/sys/dev/ic/hd64570.c
+++ b/sys/dev/ic/hd64570.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hd64570.c,v 1.37 2007/09/01 04:32:50 dyoung Exp $ */
+/* $NetBSD: hd64570.c,v 1.38 2007/10/19 11:59:52 ad Exp $ */
/*
* Copyright (c) 1999 Christian E. Hopps
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hd64570.c,v 1.37 2007/09/01 04:32:50 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hd64570.c,v 1.38 2007/10/19 11:59:52 ad Exp $");
#include "bpfilter.h"
#include "opt_inet.h"
@@ -103,9 +103,9 @@ __KERNEL_RCSID(0, "$NetBSD: hd64570.c,v 1.37 2007/09/01 04:32:50 dyoung Exp $");
#include <net/bpf.h>
#endif
-#include <machine/cpu.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/cpu.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
diff --git a/sys/dev/ic/hme.c b/sys/dev/ic/hme.c
index 58069cd8df9..76a0a811563 100644
--- a/sys/dev/ic/hme.c
+++ b/sys/dev/ic/hme.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hme.c,v 1.59 2007/09/01 07:32:26 dyoung Exp $ */
+/* $NetBSD: hme.c,v 1.60 2007/10/19 11:59:52 ad Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hme.c,v 1.59 2007/09/01 07:32:26 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hme.c,v 1.60 2007/10/19 11:59:52 ad Exp $");
/* #define HMEDEBUG */
@@ -87,7 +87,7 @@ __KERNEL_RCSID(0, "$NetBSD: hme.c,v 1.59 2007/09/01 07:32:26 dyoung Exp $");
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/hmereg.h>
#include <dev/ic/hmevar.h>
diff --git a/sys/dev/ic/hpet.c b/sys/dev/ic/hpet.c
index 28188ffc0d8..05e4b4a1e24 100644
--- a/sys/dev/ic/hpet.c
+++ b/sys/dev/ic/hpet.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hpet.c,v 1.1 2007/03/08 14:26:28 njoly Exp $ */
+/* $NetBSD: hpet.c,v 1.2 2007/10/19 11:59:52 ad Exp $ */
/*
* Copyright (c) 2006 Nicolas Joly
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpet.c,v 1.1 2007/03/08 14:26:28 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpet.c,v 1.2 2007/10/19 11:59:52 ad Exp $");
#include <sys/systm.h>
#include <sys/device.h>
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: hpet.c,v 1.1 2007/03/08 14:26:28 njoly Exp $");
#include <sys/time.h>
#include <sys/timetc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/hpetreg.h>
#include <dev/ic/hpetvar.h>
diff --git a/sys/dev/ic/hscx.c b/sys/dev/ic/hscx.c
index d2725096bca..69fb025008d 100644
--- a/sys/dev/ic/hscx.c
+++ b/sys/dev/ic/hscx.c
@@ -27,14 +27,14 @@
* i4b - Siemens HSCX chip (B-channel) handling
* --------------------------------------------
*
- * $Id: hscx.c,v 1.12 2005/12/11 12:21:26 christos Exp $
+ * $Id: hscx.c,v 1.13 2007/10/19 11:59:52 ad Exp $
*
* last edit-date: [Fri Jan 5 11:36:10 2001]
*
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hscx.c,v 1.12 2005/12/11 12:21:26 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hscx.c,v 1.13 2007/10/19 11:59:52 ad Exp $");
#include <sys/param.h>
#if defined(__FreeBSD_version) && __FreeBSD_version >= 300001
@@ -52,7 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: hscx.c,v 1.12 2005/12/11 12:21:26 christos Exp $");
#include <i386/isa/isa_device.h>
#else
#ifndef __bsdi__
-#include <machine/bus.h>
+#include <sys/bus.h>
#endif
#include <sys/device.h>
#endif
diff --git a/sys/dev/ic/i128.c b/sys/dev/ic/i128.c
index 1ae74977491..47db3160995 100644
--- a/sys/dev/ic/i128.c
+++ b/sys/dev/ic/i128.c
@@ -1,4 +1,4 @@
-/* $NetBSD: i128.c,v 1.1 2007/08/26 00:34:34 macallan Exp $ */
+/* $NetBSD: i128.c,v 1.2 2007/10/19 11:59:52 ad Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i128.c,v 1.1 2007/08/26 00:34:34 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i128.c,v 1.2 2007/10/19 11:59:52 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: i128.c,v 1.1 2007/08/26 00:34:34 macallan Exp $");
#include <sys/device.h>
#include <sys/conf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <dev/ic/i128reg.h>
diff --git a/sys/dev/ic/i82365.c b/sys/dev/ic/i82365.c
index ad6e6c70644..8df86ea75a1 100644
--- a/sys/dev/ic/i82365.c
+++ b/sys/dev/ic/i82365.c
@@ -1,4 +1,4 @@
-/* $NetBSD: i82365.c,v 1.99 2007/07/09 21:00:36 ad Exp $ */
+/* $NetBSD: i82365.c,v 1.100 2007/10/19 11:59:52 ad Exp $ */
/*
* Copyright (c) 2004 Charles M. Hannum. All rights reserved.
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i82365.c,v 1.99 2007/07/09 21:00:36 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i82365.c,v 1.100 2007/10/19 11:59:52 ad Exp $");
#define PCICDEBUG
@@ -61,8 +61,8 @@ __KERNEL_RCSID(0, "$NetBSD: i82365.c,v 1.99 2007/07/09 21:00:36 ad Exp $");
#include <sys/malloc.h>
#include <sys/kthread.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/pcmcia/pcmciareg.h>
#include <dev/pcmcia/pcmciavar.h>
diff --git a/sys/dev/ic/i82557.c b/sys/dev/ic/i82557.c
index bdd19fa69d5..dd06f54b8e7 100644
--- a/sys/dev/ic/i82557.c
+++ b/sys/dev/ic/i82557.c
@@ -1,4 +1,4 @@
-/* $NetBSD: i82557.c,v 1.103 2007/08/26 22:45:56 dyoung Exp $ */
+/* $NetBSD: i82557.c,v 1.104 2007/10/19 11:59:52 ad Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999, 2001, 2002 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i82557.c,v 1.103 2007/08/26 22:45:56 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i82557.c,v 1.104 2007/10/19 11:59:52 ad Exp $");
#include "bpfilter.h"
#include "rnd.h"
@@ -107,8 +107,8 @@ __KERNEL_RCSID(0, "$NetBSD: i82557.c,v 1.103 2007/08/26 22:45:56 dyoung Exp $");
#include <net/bpf.h>
#endif
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/mii/miivar.h>
diff --git a/sys/dev/ic/i82586.c b/sys/dev/ic/i82586.c
index f2d34c3667f..3c35c2a6e9b 100644
--- a/sys/dev/ic/i82586.c
+++ b/sys/dev/ic/i82586.c
@@ -1,4 +1,4 @@
-/* $NetBSD: i82586.c,v 1.59 2007/08/27 14:48:54 dyoung Exp $ */
+/* $NetBSD: i82586.c,v 1.60 2007/10/19 11:59:52 ad Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -144,7 +144,7 @@ Mode of operation:
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i82586.c,v 1.59 2007/08/27 14:48:54 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i82586.c,v 1.60 2007/10/19 11:59:52 ad Exp $");
#include "bpfilter.h"
@@ -168,7 +168,7 @@ __KERNEL_RCSID(0, "$NetBSD: i82586.c,v 1.59 2007/08/27 14:48:54 dyoung Exp $");
#include <net/bpfdesc.h>
#endif
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/i82586reg.h>
#include <dev/ic/i82586var.h>
diff --git a/sys/dev/ic/i82596.c b/sys/dev/ic/i82596.c
index 36b1db1cdbf..6a37ec4cb34 100644
--- a/sys/dev/ic/i82596.c
+++ b/sys/dev/ic/i82596.c
@@ -1,4 +1,4 @@
-/* $NetBSD: i82596.c,v 1.17 2007/08/26 22:45:56 dyoung Exp $ */
+/* $NetBSD: i82596.c,v 1.18 2007/10/19 11:59:53 ad Exp $ */
/*
* Copyright (c) 2003 Jochen Kunz.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i82596.c,v 1.17 2007/08/26 22:45:56 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i82596.c,v 1.18 2007/10/19 11:59:53 ad Exp $");
/* autoconfig and device stuff */
#include <sys/param.h>
@@ -53,8 +53,8 @@ __KERNEL_RCSID(0, "$NetBSD: i82596.c,v 1.17 2007/08/26 22:45:56 dyoung Exp $");
#include "ioconf.h"
/* bus_space / bus_dma etc. */
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
/* general system data and functions */
#include <sys/systm.h>
diff --git a/sys/dev/ic/iavc.c b/sys/dev/ic/iavc.c
index 8e1319485dc..e8b0076eb99 100644
--- a/sys/dev/ic/iavc.c
+++ b/sys/dev/ic/iavc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: iavc.c,v 1.5 2006/10/16 13:00:36 pooka Exp $ */
+/* $NetBSD: iavc.c,v 1.6 2007/10/19 11:59:53 ad Exp $ */
/*
* Copyright (c) 2001-2003 Cubical Solutions Ltd. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iavc.c,v 1.5 2006/10/16 13:00:36 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iavc.c,v 1.6 2007/10/19 11:59:53 ad Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: iavc.c,v 1.5 2006/10/16 13:00:36 pooka Exp $");
#include <sys/reboot.h>
#include <net/if.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <netisdn/i4b_debug.h>
#include <netisdn/i4b_ioctl.h>
diff --git a/sys/dev/ic/icp.c b/sys/dev/ic/icp.c
index 72044d9cccc..b980d3a36a1 100644
--- a/sys/dev/ic/icp.c
+++ b/sys/dev/ic/icp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: icp.c,v 1.25 2007/07/09 21:00:36 ad Exp $ */
+/* $NetBSD: icp.c,v 1.26 2007/10/19 11:59:53 ad Exp $ */
/*-
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -83,7 +83,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: icp.c,v 1.25 2007/07/09 21:00:36 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icp.c,v 1.26 2007/10/19 11:59:53 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -99,7 +99,7 @@ __KERNEL_RCSID(0, "$NetBSD: icp.c,v 1.25 2007/07/09 21:00:36 ad Exp $");
#include <uvm/uvm_extern.h>
#include <sys/bswap.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
diff --git a/sys/dev/ic/icp_ioctl.c b/sys/dev/ic/icp_ioctl.c
index 334d9f331bf..54355393d21 100644
--- a/sys/dev/ic/icp_ioctl.c
+++ b/sys/dev/ic/icp_ioctl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: icp_ioctl.c,v 1.16 2007/03/11 22:16:32 ad Exp $ */
+/* $NetBSD: icp_ioctl.c,v 1.17 2007/10/19 11:59:53 ad Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: icp_ioctl.c,v 1.16 2007/03/11 22:16:32 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icp_ioctl.c,v 1.17 2007/10/19 11:59:53 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -87,7 +87,7 @@ __KERNEL_RCSID(0, "$NetBSD: icp_ioctl.c,v 1.16 2007/03/11 22:16:32 ad Exp $");
#include <sys/ioctl.h>
#include <sys/kauth.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/icpreg.h>
#include <dev/ic/icpvar.h>
diff --git a/sys/dev/ic/icpsp.c b/sys/dev/ic/icpsp.c
index e8ee5da11c7..a22123e1008 100644
--- a/sys/dev/ic/icpsp.c
+++ b/sys/dev/ic/icpsp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: icpsp.c,v 1.17 2007/03/04 06:01:56 christos Exp $ */
+/* $NetBSD: icpsp.c,v 1.18 2007/10/19 11:59:53 ad Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: icpsp.c,v 1.17 2007/03/04 06:01:56 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icpsp.c,v 1.18 2007/10/19 11:59:53 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -52,7 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: icpsp.c,v 1.17 2007/03/04 06:01:56 christos Exp $");
#include <sys/lock.h>
#include <sys/bswap.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <uvm/uvm_extern.h>
diff --git a/sys/dev/ic/igsfb.c b/sys/dev/ic/igsfb.c
index 0d41827b3c6..66099ebe15e 100644
--- a/sys/dev/ic/igsfb.c
+++ b/sys/dev/ic/igsfb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: igsfb.c,v 1.42 2007/03/04 06:01:56 christos Exp $ */
+/* $NetBSD: igsfb.c,v 1.43 2007/10/19 11:59:53 ad Exp $ */
/*
* Copyright (c) 2002, 2003 Valeriy E. Ushakov
@@ -31,7 +31,7 @@
* Integraphics Systems IGA 168x and CyberPro series.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: igsfb.c,v 1.42 2007/03/04 06:01:56 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: igsfb.c,v 1.43 2007/10/19 11:59:53 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -40,7 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: igsfb.c,v 1.42 2007/03/04 06:01:56 christos Exp $");
#include <sys/malloc.h>
#include <sys/ioctl.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/wscons/wsdisplayvar.h>
#include <dev/wscons/wsconsio.h>
diff --git a/sys/dev/ic/igsfb_subr.c b/sys/dev/ic/igsfb_subr.c
index 12d5df62b11..900667cd3da 100644
--- a/sys/dev/ic/igsfb_subr.c
+++ b/sys/dev/ic/igsfb_subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: igsfb_subr.c,v 1.8 2006/04/05 01:13:50 uwe Exp $ */
+/* $NetBSD: igsfb_subr.c,v 1.9 2007/10/19 11:59:53 ad Exp $ */
/*
* Copyright (c) 2002 Valeriy E. Ushakov
@@ -31,14 +31,14 @@
* Integraphics Systems IGA 168x and CyberPro series.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: igsfb_subr.c,v 1.8 2006/04/05 01:13:50 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: igsfb_subr.c,v 1.9 2007/10/19 11:59:53 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/wscons/wsdisplayvar.h>
#include <dev/wscons/wsconsio.h>
diff --git a/sys/dev/ic/iha.c b/sys/dev/ic/iha.c
index 24345982a59..9724e32bedb 100644
--- a/sys/dev/ic/iha.c
+++ b/sys/dev/ic/iha.c
@@ -1,4 +1,4 @@
-/* $NetBSD: iha.c,v 1.35 2007/03/04 06:01:57 christos Exp $ */
+/* $NetBSD: iha.c,v 1.36 2007/10/19 11:59:53 ad Exp $ */
/*-
* Device driver for the INI-9XXXU/UW or INIC-940/950 PCI SCSI Controller.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iha.c,v 1.35 2007/03/04 06:01:57 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iha.c,v 1.36 2007/10/19 11:59:53 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -50,8 +50,8 @@ __KERNEL_RCSID(0, "$NetBSD: iha.c,v 1.35 2007/03/04 06:01:57 christos Exp $");
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/scsipi/scsi_spc.h>
#include <dev/scsipi/scsi_all.h>
diff --git a/sys/dev/ic/iic_cpcbus.c b/sys/dev/ic/iic_cpcbus.c
index 0d06ec79232..c596e21ecc4 100644
--- a/sys/dev/ic/iic_cpcbus.c
+++ b/sys/dev/ic/iic_cpcbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: iic_cpcbus.c,v 1.7 2005/12/11 12:21:27 christos Exp $ */
+/* $NetBSD: iic_cpcbus.c,v 1.8 2007/10/19 11:59:54 ad Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,13 +37,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iic_cpcbus.c,v 1.7 2005/12/11 12:21:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iic_cpcbus.c,v 1.8 2007/10/19 11:59:54 ad Exp $");
#include <sys/param.h>
#include <sys/device.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/cpc700reg.h>
#include <dev/ic/cpc700var.h>
diff --git a/sys/dev/ic/intersil7170.c b/sys/dev/ic/intersil7170.c
index fdcde1fe5f7..038db8466f9 100644
--- a/sys/dev/ic/intersil7170.c
+++ b/sys/dev/ic/intersil7170.c
@@ -1,4 +1,4 @@
-/* $NetBSD: intersil7170.c,v 1.8 2006/10/04 15:04:43 tsutsui Exp $ */
+/* $NetBSD: intersil7170.c,v 1.9 2007/10/19 11:59:54 ad Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intersil7170.c,v 1.8 2006/10/04 15:04:43 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intersil7170.c,v 1.9 2007/10/19 11:59:54 ad Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: intersil7170.c,v 1.8 2006/10/04 15:04:43 tsutsui Exp
#include <sys/device.h>
#include <sys/errno.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/clock_subr.h>
#include <dev/ic/intersil7170reg.h>
#include <dev/ic/intersil7170var.h>
diff --git a/sys/dev/ic/interwave.c b/sys/dev/ic/interwave.c
index 206d8b108cd..dbc9cea9ace 100644
--- a/sys/dev/ic/interwave.c
+++ b/sys/dev/ic/interwave.c
@@ -1,4 +1,4 @@
-/* $NetBSD: interwave.c,v 1.30 2006/11/16 01:32:51 christos Exp $ */
+/* $NetBSD: interwave.c,v 1.31 2007/10/19 11:59:54 ad Exp $ */
/*
* Copyright (c) 1997, 1999 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: interwave.c,v 1.30 2006/11/16 01:32:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: interwave.c,v 1.31 2007/10/19 11:59:54 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -50,8 +50,8 @@ __KERNEL_RCSID(0, "$NetBSD: interwave.c,v 1.30 2006/11/16 01:32:51 christos Exp
#include <sys/malloc.h>
#include <sys/kernel.h>
-#include <machine/cpu.h>
-#include <machine/intr.h>
+#include <sys/cpu.h>
+#include <sys/intr.h>
#include <machine/pio.h>
#include <sys/audioio.h>
#include <dev/audio_if.h>
diff --git a/sys/dev/ic/isac.c b/sys/dev/ic/isac.c
index 37aab8ab380..e4083c41ab2 100644
--- a/sys/dev/ic/isac.c
+++ b/sys/dev/ic/isac.c
@@ -27,14 +27,14 @@
* i4b_isac.c - i4b siemens isdn chipset driver ISAC handler
* ---------------------------------------------------------
*
- * $Id: isac.c,v 1.20 2005/12/11 12:21:27 christos Exp $
+ * $Id: isac.c,v 1.21 2007/10/19 11:59:54 ad Exp $
*
* last edit-date: [Fri Jan 5 11:36:10 2001]
*
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isac.c,v 1.20 2005/12/11 12:21:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isac.c,v 1.21 2007/10/19 11:59:54 ad Exp $");
#ifdef __FreeBSD__
#include "opt_i4b.h"
@@ -55,7 +55,7 @@ __KERNEL_RCSID(0, "$NetBSD: isac.c,v 1.20 2005/12/11 12:21:27 christos Exp $");
#include <i386/isa/isa_device.h>
#else
#ifndef __bsdi__
-#include <machine/bus.h>
+#include <sys/bus.h>
#endif
#include <sys/device.h>
#endif
diff --git a/sys/dev/ic/isacsx.c b/sys/dev/ic/isacsx.c
index aeb9d9a0682..ba40c08f1e4 100644
--- a/sys/dev/ic/isacsx.c
+++ b/sys/dev/ic/isacsx.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isacsx.c,v 1.4 2005/12/11 12:21:27 christos Exp $ */
+/* $NetBSD: isacsx.c,v 1.5 2007/10/19 11:59:54 ad Exp $ */
/*
* Copyright (c) 1997, 2000 Hellmuth Michaelis. All rights reserved.
* Copyright (c) 2001 Gary Jennejohn. All rights reserved.
@@ -29,7 +29,7 @@
* i4b_ifpi2_isac.c - i4b Fritz PCI Version 2 ISACSX handler
* --------------------------------------------
*
- * $Id: isacsx.c,v 1.4 2005/12/11 12:21:27 christos Exp $
+ * $Id: isacsx.c,v 1.5 2007/10/19 11:59:54 ad Exp $
*
* $FreeBSD: src/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c,v 1.3 2002/09/02 00:52:07 brooks Exp $
*
@@ -37,7 +37,7 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isacsx.c,v 1.4 2005/12/11 12:21:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isacsx.c,v 1.5 2007/10/19 11:59:54 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -67,7 +67,7 @@ __KERNEL_RCSID(0, "$NetBSD: isacsx.c,v 1.4 2005/12/11 12:21:27 christos Exp $");
#include <i4b/include/i4b_global.h>
#include <i4b/include/i4b_mbuf.h>
#else
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <netisdn/i4b_debug.h>
#include <netisdn/i4b_ioctl.h>
diff --git a/sys/dev/ic/isic.c b/sys/dev/ic/isic.c
index d62f993f8da..7ead6cec434 100644
--- a/sys/dev/ic/isic.c
+++ b/sys/dev/ic/isic.c
@@ -27,14 +27,14 @@
* i4b_isic.c - global isic stuff
* ==============================
*
- * $Id: isic.c,v 1.22 2005/12/11 12:21:27 christos Exp $
+ * $Id: isic.c,v 1.23 2007/10/19 11:59:54 ad Exp $
*
* last edit-date: [Fri Jan 5 11:36:10 2001]
*
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic.c,v 1.22 2005/12/11 12:21:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic.c,v 1.23 2007/10/19 11:59:54 ad Exp $");
#include <sys/param.h>
#include <sys/ioccom.h>
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: isic.c,v 1.22 2005/12/11 12:21:27 christos Exp $");
#include <net/if.h>
#include <sys/callout.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <netisdn/i4b_debug.h>
#include <netisdn/i4b_ioctl.h>
diff --git a/sys/dev/ic/isic_bchan.c b/sys/dev/ic/isic_bchan.c
index 14b66dde45b..b4bffebd3dd 100644
--- a/sys/dev/ic/isic_bchan.c
+++ b/sys/dev/ic/isic_bchan.c
@@ -27,14 +27,14 @@
* i4b_bchan.c - B channel handling L1 procedures
* ----------------------------------------------
*
- * $Id: isic_bchan.c,v 1.11 2005/12/11 12:21:27 christos Exp $
+ * $Id: isic_bchan.c,v 1.12 2007/10/19 11:59:54 ad Exp $
*
* last edit-date: [Fri Jan 5 11:36:11 2001]
*
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_bchan.c,v 1.11 2005/12/11 12:21:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_bchan.c,v 1.12 2007/10/19 11:59:54 ad Exp $");
#include <sys/param.h>
#if defined(__FreeBSD__) && __FreeBSD__ >= 3
@@ -52,7 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: isic_bchan.c,v 1.11 2005/12/11 12:21:27 christos Exp
#include <i386/isa/isa_device.h>
#else
#ifndef __bsdi__
-#include <machine/bus.h>
+#include <sys/bus.h>
#endif
#include <sys/device.h>
#endif
diff --git a/sys/dev/ic/isic_l1.c b/sys/dev/ic/isic_l1.c
index ef548d299f5..1f67db5c875 100644
--- a/sys/dev/ic/isic_l1.c
+++ b/sys/dev/ic/isic_l1.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isic_l1.c,v 1.16 2005/12/11 12:21:27 christos Exp $ */
+/* $NetBSD: isic_l1.c,v 1.17 2007/10/19 11:59:54 ad Exp $ */
/*
* Copyright (c) 1997, 2000 Hellmuth Michaelis. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_l1.c,v 1.16 2005/12/11 12:21:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_l1.c,v 1.17 2007/10/19 11:59:54 ad Exp $");
#include <sys/param.h>
#include <sys/ioctl.h>
@@ -35,7 +35,7 @@ __KERNEL_RCSID(0, "$NetBSD: isic_l1.c,v 1.16 2005/12/11 12:21:27 christos Exp $"
#include <sys/systm.h>
#include <sys/mbuf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/device.h>
#include <sys/socket.h>
diff --git a/sys/dev/ic/isic_l1fsm.c b/sys/dev/ic/isic_l1fsm.c
index cd4e05f424f..cf27fbe39c2 100644
--- a/sys/dev/ic/isic_l1fsm.c
+++ b/sys/dev/ic/isic_l1fsm.c
@@ -27,14 +27,14 @@
* i4b_l1fsm.c - isdn4bsd layer 1 I.430 state machine
* --------------------------------------------------
*
- * $Id: isic_l1fsm.c,v 1.12 2005/12/11 12:21:27 christos Exp $
+ * $Id: isic_l1fsm.c,v 1.13 2007/10/19 11:59:54 ad Exp $
*
* last edit-date: [Fri Jan 5 11:36:11 2001]
*
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_l1fsm.c,v 1.12 2005/12/11 12:21:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_l1fsm.c,v 1.13 2007/10/19 11:59:54 ad Exp $");
#include <sys/param.h>
#if defined(__FreeBSD__) && __FreeBSD__ >= 3
@@ -53,7 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: isic_l1fsm.c,v 1.12 2005/12/11 12:21:27 christos Exp
#include <i386/isa/isa_device.h>
#else
#ifndef __bsdi__
-#include <machine/bus.h>
+#include <sys/bus.h>
#endif
#include <sys/device.h>
#endif
diff --git a/sys/dev/ic/isp_netbsd.h b/sys/dev/ic/isp_netbsd.h
index c608ee7529d..1a960a131b4 100644
--- a/sys/dev/ic/isp_netbsd.h
+++ b/sys/dev/ic/isp_netbsd.h
@@ -1,4 +1,4 @@
-/* $NetBSD: isp_netbsd.h,v 1.62 2007/07/09 21:00:37 ad Exp $ */
+/* $NetBSD: isp_netbsd.h,v 1.63 2007/10/19 11:59:54 ad Exp $ */
/*
* NetBSD Specific definitions for the Qlogic ISP Host Adapter
*/
@@ -47,7 +47,7 @@
#include <sys/user.h>
#include <sys/kthread.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/scsipi/scsi_all.h>
#include <dev/scsipi/scsipi_all.h>
diff --git a/sys/dev/ic/joy.c b/sys/dev/ic/joy.c
index a66be5095db..51d8e15ff95 100644
--- a/sys/dev/ic/joy.c
+++ b/sys/dev/ic/joy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: joy.c,v 1.14 2007/03/04 06:01:57 christos Exp $ */
+/* $NetBSD: joy.c,v 1.15 2007/10/19 11:59:54 ad Exp $ */
/*-
* Copyright (c) 1995 Jean-Marc Zucconi
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: joy.c,v 1.14 2007/03/04 06:01:57 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: joy.c,v 1.15 2007/10/19 11:59:54 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: joy.c,v 1.14 2007/03/04 06:01:57 christos Exp $");
#include <sys/conf.h>
#include <sys/event.h>
#include <sys/vnode.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/joystick.h>
#include <dev/ic/joyvar.h>
diff --git a/sys/dev/ic/lcdkp_subr.c b/sys/dev/ic/lcdkp_subr.c
index cfe8e249d99..d2f3648b87d 100644
--- a/sys/dev/ic/lcdkp_subr.c
+++ b/sys/dev/ic/lcdkp_subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lcdkp_subr.c,v 1.4 2005/12/11 12:21:27 christos Exp $ */
+/* $NetBSD: lcdkp_subr.c,v 1.5 2007/10/19 11:59:54 ad Exp $ */
/*
* Copyright (c) 2002 Dennis I. Chernoivanov
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lcdkp_subr.c,v 1.4 2005/12/11 12:21:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lcdkp_subr.c,v 1.5 2007/10/19 11:59:54 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -42,8 +42,8 @@ __KERNEL_RCSID(0, "$NetBSD: lcdkp_subr.c,v 1.4 2005/12/11 12:21:27 christos Exp
#include <sys/types.h>
#include <machine/autoconf.h>
-#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
#include <dev/ic/lcdkp_subr.h>
diff --git a/sys/dev/ic/ld_aac.c b/sys/dev/ic/ld_aac.c
index 8ff28debe41..3c453db7139 100644
--- a/sys/dev/ic/ld_aac.c
+++ b/sys/dev/ic/ld_aac.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_aac.c,v 1.16 2007/07/29 12:50:20 ad Exp $ */
+/* $NetBSD: ld_aac.c,v 1.17 2007/10/19 11:59:55 ad Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_aac.c,v 1.16 2007/07/29 12:50:20 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_aac.c,v 1.17 2007/10/19 11:59:55 ad Exp $");
#include "rnd.h"
@@ -54,7 +54,7 @@ __KERNEL_RCSID(0, "$NetBSD: ld_aac.c,v 1.16 2007/07/29 12:50:20 ad Exp $");
#include <sys/rnd.h>
#endif
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <uvm/uvm_extern.h>
diff --git a/sys/dev/ic/ld_cac.c b/sys/dev/ic/ld_cac.c
index 6c81c9b70b3..49f1c51ab1d 100644
--- a/sys/dev/ic/ld_cac.c
+++ b/sys/dev/ic/ld_cac.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_cac.c,v 1.18 2007/07/29 12:50:20 ad Exp $ */
+/* $NetBSD: ld_cac.c,v 1.19 2007/10/19 11:59:55 ad Exp $ */
/*-
* Copyright (c) 2000, 2006 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_cac.c,v 1.18 2007/07/29 12:50:20 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_cac.c,v 1.19 2007/10/19 11:59:55 ad Exp $");
#include "rnd.h"
@@ -58,7 +58,7 @@ __KERNEL_RCSID(0, "$NetBSD: ld_cac.c,v 1.18 2007/07/29 12:50:20 ad Exp $");
#include <sys/rnd.h>
#endif
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ldvar.h>
diff --git a/sys/dev/ic/ld_icp.c b/sys/dev/ic/ld_icp.c
index 711b3e30099..e8fb50b30a1 100644
--- a/sys/dev/ic/ld_icp.c
+++ b/sys/dev/ic/ld_icp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_icp.c,v 1.17 2007/07/29 12:50:20 ad Exp $ */
+/* $NetBSD: ld_icp.c,v 1.18 2007/10/19 11:59:55 ad Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_icp.c,v 1.17 2007/07/29 12:50:20 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_icp.c,v 1.18 2007/10/19 11:59:55 ad Exp $");
#include "rnd.h"
@@ -60,7 +60,7 @@ __KERNEL_RCSID(0, "$NetBSD: ld_icp.c,v 1.17 2007/07/29 12:50:20 ad Exp $");
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ldvar.h>
diff --git a/sys/dev/ic/ld_mlx.c b/sys/dev/ic/ld_mlx.c
index 3104d33ac31..d3e2eb88099 100644
--- a/sys/dev/ic/ld_mlx.c
+++ b/sys/dev/ic/ld_mlx.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_mlx.c,v 1.14 2007/07/29 12:50:20 ad Exp $ */
+/* $NetBSD: ld_mlx.c,v 1.15 2007/10/19 11:59:55 ad Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_mlx.c,v 1.14 2007/07/29 12:50:20 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_mlx.c,v 1.15 2007/10/19 11:59:55 ad Exp $");
#include "rnd.h"
@@ -59,7 +59,7 @@ __KERNEL_RCSID(0, "$NetBSD: ld_mlx.c,v 1.14 2007/07/29 12:50:20 ad Exp $");
#endif
#include <machine/vmparam.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ldvar.h>
diff --git a/sys/dev/ic/lemac.c b/sys/dev/ic/lemac.c
index fdc8c62a061..265c83b9e2e 100644
--- a/sys/dev/ic/lemac.c
+++ b/sys/dev/ic/lemac.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lemac.c,v 1.33 2007/09/01 07:32:26 dyoung Exp $ */
+/* $NetBSD: lemac.c,v 1.34 2007/10/19 11:59:55 ad Exp $ */
/*-
* Copyright (c) 1994, 1995, 1997 Matt Thomas <matt@3am-software.com>
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lemac.c,v 1.33 2007/09/01 07:32:26 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lemac.c,v 1.34 2007/10/19 11:59:55 ad Exp $");
#include "opt_inet.h"
#include "rnd.h"
@@ -68,7 +68,7 @@ __KERNEL_RCSID(0, "$NetBSD: lemac.c,v 1.33 2007/09/01 07:32:26 dyoung Exp $");
#endif
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/lemacreg.h>
#include <dev/ic/lemacvar.h>
diff --git a/sys/dev/ic/lm700x.h b/sys/dev/ic/lm700x.h
index f9f13e268a0..1d27938df32 100644
--- a/sys/dev/ic/lm700x.h
+++ b/sys/dev/ic/lm700x.h
@@ -1,4 +1,4 @@
-/* $NetBSD: lm700x.h,v 1.1 2002/01/01 21:51:40 augustss Exp $ */
+/* $NetBSD: lm700x.h,v 1.2 2007/10/19 11:59:55 ad Exp $ */
/* $OpenBSD: lm700x.h,v 1.2 2001/12/06 16:28:18 mickey Exp $ */
/* $RuOBSD: lm700x.h,v 1.2 2001/10/18 16:51:36 pva Exp $ */
@@ -32,7 +32,7 @@
#include <sys/types.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#define LM700X_REGISTER_LENGTH 24
diff --git a/sys/dev/ic/lpt.c b/sys/dev/ic/lpt.c
index 06c6c8d37c8..94448b00496 100644
--- a/sys/dev/ic/lpt.c
+++ b/sys/dev/ic/lpt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lpt.c,v 1.71 2007/10/09 12:45:27 ad Exp $ */
+/* $NetBSD: lpt.c,v 1.72 2007/10/19 11:59:55 ad Exp $ */
/*
* Copyright (c) 1993, 1994 Charles M. Hannum.
@@ -54,7 +54,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lpt.c,v 1.71 2007/10/09 12:45:27 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lpt.c,v 1.72 2007/10/19 11:59:55 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -69,7 +69,7 @@ __KERNEL_RCSID(0, "$NetBSD: lpt.c,v 1.71 2007/10/09 12:45:27 ad Exp $");
#include <sys/syslog.h>
#include <sys/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/lptreg.h>
#include <dev/ic/lptvar.h>
diff --git a/sys/dev/ic/lpt_upc.c b/sys/dev/ic/lpt_upc.c
index 98ae8ccffcf..5c6fe660065 100644
--- a/sys/dev/ic/lpt_upc.c
+++ b/sys/dev/ic/lpt_upc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lpt_upc.c,v 1.7 2005/12/11 12:21:27 christos Exp $ */
+/* $NetBSD: lpt_upc.c,v 1.8 2007/10/19 11:59:55 ad Exp $ */
/*-
* Copyright (c) 2000 Ben Harris
* All rights reserved.
@@ -28,14 +28,14 @@
/* This file is part of NetBSD/arm26 -- a port of NetBSD to ARM2/3 machines. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lpt_upc.c,v 1.7 2005/12/11 12:21:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lpt_upc.c,v 1.8 2007/10/19 11:59:55 ad Exp $");
#include <sys/param.h>
#include <sys/device.h>
#include <sys/systm.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/ic/lptvar.h>
#include <dev/ic/upcvar.h>
diff --git a/sys/dev/ic/lsi64854.c b/sys/dev/ic/lsi64854.c
index 2814e2ce92b..cec1d3ba09a 100644
--- a/sys/dev/ic/lsi64854.c
+++ b/sys/dev/ic/lsi64854.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lsi64854.c,v 1.29 2007/03/04 07:54:11 christos Exp $ */
+/* $NetBSD: lsi64854.c,v 1.30 2007/10/19 11:59:55 ad Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lsi64854.c,v 1.29 2007/03/04 07:54:11 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lsi64854.c,v 1.30 2007/10/19 11:59:55 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -48,9 +48,9 @@ __KERNEL_RCSID(0, "$NetBSD: lsi64854.c,v 1.29 2007/03/04 07:54:11 christos Exp $
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
-#include <machine/cpu.h>
+#include <sys/cpu.h>
#include <dev/scsipi/scsi_all.h>
#include <dev/scsipi/scsipi_all.h>
diff --git a/sys/dev/ic/matrixkp_subr.c b/sys/dev/ic/matrixkp_subr.c
index 087396f61d7..2c33ae78a56 100644
--- a/sys/dev/ic/matrixkp_subr.c
+++ b/sys/dev/ic/matrixkp_subr.c
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: matrixkp_subr.c,v 1.6 2007/07/09 21:00:37 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: matrixkp_subr.c,v 1.7 2007/10/19 11:59:55 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -57,8 +57,8 @@ __KERNEL_RCSID(0, "$NetBSD: matrixkp_subr.c,v 1.6 2007/07/09 21:00:37 ad Exp $")
#include <sys/types.h>
#include <machine/autoconf.h>
-#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
#include <dev/wscons/wsconsio.h>
#include <dev/wscons/wskbdvar.h>
diff --git a/sys/dev/ic/mb86950.c b/sys/dev/ic/mb86950.c
index 96e8a461b59..79619f78269 100644
--- a/sys/dev/ic/mb86950.c
+++ b/sys/dev/ic/mb86950.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mb86950.c,v 1.9 2007/03/04 06:01:58 christos Exp $ */
+/* $NetBSD: mb86950.c,v 1.10 2007/10/19 11:59:55 ad Exp $ */
/*
* All Rights Reserved, Copyright (C) Fujitsu Limited 1995
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mb86950.c,v 1.9 2007/03/04 06:01:58 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mb86950.c,v 1.10 2007/10/19 11:59:55 ad Exp $");
/*
* Device driver for Fujitsu mb86950 based Ethernet cards.
@@ -155,7 +155,7 @@ __KERNEL_RCSID(0, "$NetBSD: mb86950.c,v 1.9 2007/03/04 06:01:58 christos Exp $")
#include <net/bpfdesc.h>
#endif
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/mb86950reg.h>
#include <dev/ic/mb86950var.h>
diff --git a/sys/dev/ic/mb86960.c b/sys/dev/ic/mb86960.c
index dae0e90e1ae..236932bb95c 100644
--- a/sys/dev/ic/mb86960.c
+++ b/sys/dev/ic/mb86960.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mb86960.c,v 1.67 2007/09/01 07:32:27 dyoung Exp $ */
+/* $NetBSD: mb86960.c,v 1.68 2007/10/19 11:59:56 ad Exp $ */
/*
* All Rights Reserved, Copyright (C) Fujitsu Limited 1995
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mb86960.c,v 1.67 2007/09/01 07:32:27 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mb86960.c,v 1.68 2007/10/19 11:59:56 ad Exp $");
/*
* Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
@@ -83,7 +83,7 @@ __KERNEL_RCSID(0, "$NetBSD: mb86960.c,v 1.67 2007/09/01 07:32:27 dyoung Exp $");
#include <net/bpfdesc.h>
#endif
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/mb86960reg.h>
#include <dev/ic/mb86960var.h>
diff --git a/sys/dev/ic/mb89352.c b/sys/dev/ic/mb89352.c
index 02fe42e9dd9..a14e99985ac 100644
--- a/sys/dev/ic/mb89352.c
+++ b/sys/dev/ic/mb89352.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mb89352.c,v 1.45 2006/11/16 01:32:51 christos Exp $ */
+/* $NetBSD: mb89352.c,v 1.46 2007/10/19 11:59:56 ad Exp $ */
/* NecBSD: mb89352.c,v 1.4 1998/03/14 07:31:20 kmatsuda Exp */
/*-
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mb89352.c,v 1.45 2006/11/16 01:32:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mb89352.c,v 1.46 2007/10/19 11:59:56 ad Exp $");
#ifdef DDB
#define integrate
@@ -144,8 +144,8 @@ __KERNEL_RCSID(0, "$NetBSD: mb89352.c,v 1.45 2006/11/16 01:32:51 christos Exp $"
#include <sys/user.h>
#include <sys/queue.h>
-#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
#include <dev/scsipi/scsi_all.h>
#include <dev/scsipi/scsipi_all.h>
diff --git a/sys/dev/ic/mc146818.c b/sys/dev/ic/mc146818.c
index 5b36ca142ec..3e50eb740d4 100644
--- a/sys/dev/ic/mc146818.c
+++ b/sys/dev/ic/mc146818.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mc146818.c,v 1.12 2006/09/10 06:39:00 tsutsui Exp $ */
+/* $NetBSD: mc146818.c,v 1.13 2007/10/19 11:59:56 ad Exp $ */
/*
* Copyright (c) 2003 Izumi Tsutsui. All rights reserved.
@@ -31,14 +31,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mc146818.c,v 1.12 2006/09/10 06:39:00 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mc146818.c,v 1.13 2007/10/19 11:59:56 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/errno.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/clock_subr.h>
diff --git a/sys/dev/ic/mfi.c b/sys/dev/ic/mfi.c
index b3d4baa9ee4..e83919ff241 100644
--- a/sys/dev/ic/mfi.c
+++ b/sys/dev/ic/mfi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mfi.c,v 1.9 2007/09/04 20:46:00 xtraeme Exp $ */
+/* $NetBSD: mfi.c,v 1.10 2007/10/19 11:59:56 ad Exp $ */
/* $OpenBSD: mfi.c,v 1.66 2006/11/28 23:59:45 dlg Exp $ */
/*
* Copyright (c) 2006 Marco Peereboom <marco@peereboom.us>
@@ -17,7 +17,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mfi.c,v 1.9 2007/09/04 20:46:00 xtraeme Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfi.c,v 1.10 2007/10/19 11:59:56 ad Exp $");
#include "bio.h"
@@ -32,7 +32,7 @@ __KERNEL_RCSID(0, "$NetBSD: mfi.c,v 1.9 2007/09/04 20:46:00 xtraeme Exp $");
#include <uvm/uvm_param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/scsipi/scsipi_all.h>
#include <dev/scsipi/scsi_all.h>
diff --git a/sys/dev/ic/midway.c b/sys/dev/ic/midway.c
index a32e1f0fc40..9ab95bd7411 100644
--- a/sys/dev/ic/midway.c
+++ b/sys/dev/ic/midway.c
@@ -1,4 +1,4 @@
-/* $NetBSD: midway.c,v 1.76 2007/09/01 04:32:50 dyoung Exp $ */
+/* $NetBSD: midway.c,v 1.77 2007/10/19 11:59:56 ad Exp $ */
/* (sync'd to midway.c 1.68) */
/*
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: midway.c,v 1.76 2007/09/01 04:32:50 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: midway.c,v 1.77 2007/10/19 11:59:56 ad Exp $");
#include "opt_natm.h"
@@ -189,7 +189,7 @@ __KERNEL_RCSID(0, "$NetBSD: midway.c,v 1.76 2007/09/01 04:32:50 dyoung Exp $");
#if !defined(__FreeBSD__)
-#include <machine/bus.h>
+#include <sys/bus.h>
#endif
diff --git a/sys/dev/ic/mk48txx.c b/sys/dev/ic/mk48txx.c
index 022adfd27a0..bc4b21dbfa5 100644
--- a/sys/dev/ic/mk48txx.c
+++ b/sys/dev/ic/mk48txx.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mk48txx.c,v 1.21 2006/10/01 06:02:53 tsutsui Exp $ */
+/* $NetBSD: mk48txx.c,v 1.22 2007/10/19 11:59:56 ad Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -40,14 +40,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mk48txx.c,v 1.21 2006/10/01 06:02:53 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mk48txx.c,v 1.22 2007/10/19 11:59:56 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/errno.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/clock_subr.h>
#include <dev/ic/mk48txxreg.h>
#include <dev/ic/mk48txxvar.h>
diff --git a/sys/dev/ic/mlx.c b/sys/dev/ic/mlx.c
index 67c944357f4..1537d74d1d4 100644
--- a/sys/dev/ic/mlx.c
+++ b/sys/dev/ic/mlx.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mlx.c,v 1.52 2007/07/09 21:00:37 ad Exp $ */
+/* $NetBSD: mlx.c,v 1.53 2007/10/19 11:59:56 ad Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mlx.c,v 1.52 2007/07/09 21:00:37 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mlx.c,v 1.53 2007/10/19 11:59:56 ad Exp $");
#include "ld.h"
@@ -94,7 +94,7 @@ __KERNEL_RCSID(0, "$NetBSD: mlx.c,v 1.52 2007/07/09 21:00:37 ad Exp $");
#include <sys/kauth.h>
#include <machine/vmparam.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <uvm/uvm_extern.h>
diff --git a/sys/dev/ic/mm58167.c b/sys/dev/ic/mm58167.c
index a36d40ba6c0..5b2412c3123 100644
--- a/sys/dev/ic/mm58167.c
+++ b/sys/dev/ic/mm58167.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mm58167.c,v 1.8 2006/09/04 23:45:30 gdamore Exp $ */
+/* $NetBSD: mm58167.c,v 1.9 2007/10/19 11:59:57 ad Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mm58167.c,v 1.8 2006/09/04 23:45:30 gdamore Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mm58167.c,v 1.9 2007/10/19 11:59:57 ad Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: mm58167.c,v 1.8 2006/09/04 23:45:30 gdamore Exp $");
#include <sys/errno.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/clock_subr.h>
#include <dev/ic/mm58167var.h>
diff --git a/sys/dev/ic/mpt_netbsd.h b/sys/dev/ic/mpt_netbsd.h
index 36bb0323e69..af5aab72298 100644
--- a/sys/dev/ic/mpt_netbsd.h
+++ b/sys/dev/ic/mpt_netbsd.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mpt_netbsd.h,v 1.6 2007/07/27 13:06:51 tron Exp $ */
+/* $NetBSD: mpt_netbsd.h,v 1.7 2007/10/19 11:59:57 ad Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -88,8 +88,8 @@
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/scsipi/scsi_all.h>
#include <dev/scsipi/scsipi_all.h>
diff --git a/sys/dev/ic/mpu.c b/sys/dev/ic/mpu.c
index 7647fa3d229..d9aaa05c974 100644
--- a/sys/dev/ic/mpu.c
+++ b/sys/dev/ic/mpu.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mpu.c,v 1.14 2006/11/16 01:32:51 christos Exp $ */
+/* $NetBSD: mpu.c,v 1.15 2007/10/19 11:59:57 ad Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpu.c,v 1.14 2006/11/16 01:32:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpu.c,v 1.15 2007/10/19 11:59:57 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -48,9 +48,9 @@ __KERNEL_RCSID(0, "$NetBSD: mpu.c,v 1.14 2006/11/16 01:32:51 christos Exp $");
#include <sys/proc.h>
#include <sys/buf.h>
-#include <machine/cpu.h>
-#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/cpu.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
#include <dev/midi_if.h>
diff --git a/sys/dev/ic/mtd803.c b/sys/dev/ic/mtd803.c
index 46a8e0e3c54..17917196bfb 100644
--- a/sys/dev/ic/mtd803.c
+++ b/sys/dev/ic/mtd803.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mtd803.c,v 1.14 2007/09/01 07:32:27 dyoung Exp $ */
+/* $NetBSD: mtd803.c,v 1.15 2007/10/19 11:59:57 ad Exp $ */
/*-
*
@@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mtd803.c,v 1.14 2007/09/01 07:32:27 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mtd803.c,v 1.15 2007/10/19 11:59:57 ad Exp $");
#include "bpfilter.h"
@@ -80,7 +80,7 @@ __KERNEL_RCSID(0, "$NetBSD: mtd803.c,v 1.14 2007/09/01 07:32:27 dyoung Exp $");
#include <net/bpfdesc.h>
#endif
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/mtd803reg.h>
#include <dev/ic/mtd803var.h>
diff --git a/sys/dev/ic/mx98905.c b/sys/dev/ic/mx98905.c
index c17dd49af28..73a82fd3d07 100644
--- a/sys/dev/ic/mx98905.c
+++ b/sys/dev/ic/mx98905.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mx98905.c,v 1.9 2007/03/04 06:01:59 christos Exp $ */
+/* $NetBSD: mx98905.c,v 1.10 2007/10/19 11:59:57 ad Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: mx98905.c,v 1.9 2007/03/04 06:01:59 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mx98905.c,v 1.10 2007/10/19 11:59:57 ad Exp $");
#include <sys/device.h>
#include <sys/mbuf.h>
@@ -78,7 +78,7 @@ __KERNEL_RCSID(0, "$NetBSD: mx98905.c,v 1.9 2007/03/04 06:01:59 christos Exp $")
#include <net/if_ether.h>
#include <net/if_media.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/dp8390reg.h>
#include <dev/ic/dp8390var.h>
diff --git a/sys/dev/ic/ncr5380var.h b/sys/dev/ic/ncr5380var.h
index c3a75f5e11a..467bd159092 100644
--- a/sys/dev/ic/ncr5380var.h
+++ b/sys/dev/ic/ncr5380var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ncr5380var.h,v 1.30 2006/08/17 17:11:28 christos Exp $ */
+/* $NetBSD: ncr5380var.h,v 1.31 2007/10/19 11:59:57 ad Exp $ */
/*
* Copyright (c) 1995 David Jones, Gordon W. Ross
@@ -61,7 +61,7 @@
* Handy read/write macros
*/
#ifdef NCR5380_USE_BUS_SPACE
-# include <machine/bus.h>
+# include <sys/bus.h>
/* bus_space() variety */
# define NCR5380_READ(sc, reg) bus_space_read_1(sc->sc_regt, \
sc->sc_regh, sc->reg)
diff --git a/sys/dev/ic/ne2000.c b/sys/dev/ic/ne2000.c
index 764735a09da..3d4c2d11211 100644
--- a/sys/dev/ic/ne2000.c
+++ b/sys/dev/ic/ne2000.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ne2000.c,v 1.54 2007/03/04 06:01:59 christos Exp $ */
+/* $NetBSD: ne2000.c,v 1.55 2007/10/19 11:59:57 ad Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ne2000.c,v 1.54 2007/03/04 06:01:59 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ne2000.c,v 1.55 2007/10/19 11:59:57 ad Exp $");
#include "opt_ipkdb.h"
@@ -74,7 +74,7 @@ __KERNEL_RCSID(0, "$NetBSD: ne2000.c,v 1.54 2007/03/04 06:01:59 christos Exp $")
#include <net/if_ether.h>
#include <sys/bswap.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#ifndef __BUS_SPACE_HAS_STREAM_METHODS
#define bus_space_write_stream_2 bus_space_write_2
diff --git a/sys/dev/ic/ninjaata32.c b/sys/dev/ic/ninjaata32.c
index bea94864ca3..e4b3fb9399d 100644
--- a/sys/dev/ic/ninjaata32.c
+++ b/sys/dev/ic/ninjaata32.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ninjaata32.c,v 1.8 2007/07/09 21:00:37 ad Exp $ */
+/* $NetBSD: ninjaata32.c,v 1.9 2007/10/19 11:59:57 ad Exp $ */
/*
* Copyright (c) 2006 ITOH Yasufumi <itohy@NetBSD.org>.
@@ -27,15 +27,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ninjaata32.c,v 1.8 2007/07/09 21:00:37 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ninjaata32.c,v 1.9 2007/10/19 11:59:57 ad Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/device.h>
#include <sys/proc.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <uvm/uvm_extern.h>
diff --git a/sys/dev/ic/ninjascsi32.c b/sys/dev/ic/ninjascsi32.c
index 310ae769471..227fbca0693 100644
--- a/sys/dev/ic/ninjascsi32.c
+++ b/sys/dev/ic/ninjascsi32.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ninjascsi32.c,v 1.11 2007/07/09 21:00:37 ad Exp $ */
+/* $NetBSD: ninjascsi32.c,v 1.12 2007/10/19 11:59:57 ad Exp $ */
/*-
* Copyright (c) 2004, 2006 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ninjascsi32.c,v 1.11 2007/07/09 21:00:37 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ninjascsi32.c,v 1.12 2007/10/19 11:59:57 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -48,8 +48,8 @@ __KERNEL_RCSID(0, "$NetBSD: ninjascsi32.c,v 1.11 2007/07/09 21:00:37 ad Exp $");
#include <sys/scsiio.h>
#include <sys/proc.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <uvm/uvm_extern.h>
diff --git a/sys/dev/ic/nslm7x.c b/sys/dev/ic/nslm7x.c
index 1c28879df2c..2eed3d58b14 100644
--- a/sys/dev/ic/nslm7x.c
+++ b/sys/dev/ic/nslm7x.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nslm7x.c,v 1.42 2007/09/08 03:42:20 xtraeme Exp $ */
+/* $NetBSD: nslm7x.c,v 1.43 2007/10/19 11:59:58 ad Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nslm7x.c,v 1.42 2007/09/08 03:42:20 xtraeme Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nslm7x.c,v 1.43 2007/10/19 11:59:58 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -47,7 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: nslm7x.c,v 1.42 2007/09/08 03:42:20 xtraeme Exp $");
#include <sys/conf.h>
#include <sys/time.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
@@ -56,7 +56,7 @@ __KERNEL_RCSID(0, "$NetBSD: nslm7x.c,v 1.42 2007/09/08 03:42:20 xtraeme Exp $");
#include <dev/ic/nslm7xvar.h>
-#include <machine/intr.h>
+#include <sys/intr.h>
#if defined(LMDEBUG)
#define DPRINTF(x) do { printf x; } while (0)
diff --git a/sys/dev/ic/oosiop.c b/sys/dev/ic/oosiop.c
index a498ee650bf..fa461bac8a9 100644
--- a/sys/dev/ic/oosiop.c
+++ b/sys/dev/ic/oosiop.c
@@ -1,4 +1,4 @@
-/* $NetBSD: oosiop.c,v 1.10 2007/03/04 06:01:59 christos Exp $ */
+/* $NetBSD: oosiop.c,v 1.11 2007/10/19 11:59:58 ad Exp $ */
/*
* Copyright (c) 2001 Shuichiro URATA. All rights reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: oosiop.c,v 1.10 2007/03/04 06:01:59 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: oosiop.c,v 1.11 2007/10/19 11:59:58 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -53,8 +53,8 @@ __KERNEL_RCSID(0, "$NetBSD: oosiop.c,v 1.10 2007/03/04 06:01:59 christos Exp $")
#include <dev/scsipi/scsiconf.h>
#include <dev/scsipi/scsi_message.h>
-#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/cpu.h>
+#include <sys/bus.h>
#include <dev/ic/oosiopreg.h>
#include <dev/ic/oosiopvar.h>
diff --git a/sys/dev/ic/opl.c b/sys/dev/ic/opl.c
index cedf0e0dff6..8ed23a16189 100644
--- a/sys/dev/ic/opl.c
+++ b/sys/dev/ic/opl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: opl.c,v 1.31 2006/11/16 01:32:52 christos Exp $ */
+/* $NetBSD: opl.c,v 1.32 2007/10/19 11:59:58 ad Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opl.c,v 1.31 2006/11/16 01:32:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opl.c,v 1.32 2007/10/19 11:59:58 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -53,8 +53,8 @@ __KERNEL_RCSID(0, "$NetBSD: opl.c,v 1.31 2006/11/16 01:32:52 christos Exp $");
#include <sys/select.h>
#include <sys/malloc.h>
-#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/cpu.h>
+#include <sys/bus.h>
#include <sys/audioio.h>
#include <sys/midiio.h>
diff --git a/sys/dev/ic/oplinstrs.c b/sys/dev/ic/oplinstrs.c
index 186d3fcceee..00f872c5b33 100644
--- a/sys/dev/ic/oplinstrs.c
+++ b/sys/dev/ic/oplinstrs.c
@@ -1,7 +1,7 @@
-/* $NetBSD: oplinstrs.c,v 1.6 2005/12/11 12:21:28 christos Exp $ */
+/* $NetBSD: oplinstrs.c,v 1.7 2007/10/19 11:59:58 ad Exp $ */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: oplinstrs.c,v 1.6 2005/12/11 12:21:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: oplinstrs.c,v 1.7 2007/10/19 11:59:58 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -11,7 +11,7 @@ __KERNEL_RCSID(0, "$NetBSD: oplinstrs.c,v 1.6 2005/12/11 12:21:28 christos Exp $
#include <sys/device.h>
#include <sys/select.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/midivar.h>
#include <dev/midisynvar.h>
diff --git a/sys/dev/ic/osiop.c b/sys/dev/ic/osiop.c
index 765a125ca9c..f57421a4f72 100644
--- a/sys/dev/ic/osiop.c
+++ b/sys/dev/ic/osiop.c
@@ -1,4 +1,4 @@
-/* $NetBSD: osiop.c,v 1.32 2007/06/30 19:35:08 tsutsui Exp $ */
+/* $NetBSD: osiop.c,v 1.33 2007/10/19 11:59:58 ad Exp $ */
/*
* Copyright (c) 2001 Izumi Tsutsui. All rights reserved.
@@ -100,7 +100,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: osiop.c,v 1.32 2007/06/30 19:35:08 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: osiop.c,v 1.33 2007/10/19 11:59:58 ad Exp $");
/* #define OSIOP_DEBUG */
@@ -120,8 +120,8 @@ __KERNEL_RCSID(0, "$NetBSD: osiop.c,v 1.32 2007/06/30 19:35:08 tsutsui Exp $");
#include <dev/scsipi/scsiconf.h>
#include <dev/scsipi/scsi_message.h>
-#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/cpu.h>
+#include <sys/bus.h>
#include <dev/ic/osiopreg.h>
#include <dev/ic/osiopvar.h>
diff --git a/sys/dev/ic/pcdisplay_chars.c b/sys/dev/ic/pcdisplay_chars.c
index 992a1334b2c..2d3ab09b520 100644
--- a/sys/dev/ic/pcdisplay_chars.c
+++ b/sys/dev/ic/pcdisplay_chars.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pcdisplay_chars.c,v 1.12 2006/11/16 01:32:52 christos Exp $ */
+/* $NetBSD: pcdisplay_chars.c,v 1.13 2007/10/19 11:59:58 ad Exp $ */
/*
* Copyright (c) 1998
@@ -27,12 +27,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcdisplay_chars.c,v 1.12 2006/11/16 01:32:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcdisplay_chars.c,v 1.13 2007/10/19 11:59:58 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/mc6845reg.h>
#include <dev/ic/pcdisplayvar.h>
diff --git a/sys/dev/ic/pcdisplay_subr.c b/sys/dev/ic/pcdisplay_subr.c
index 21db8e5f4e8..6f23f030300 100644
--- a/sys/dev/ic/pcdisplay_subr.c
+++ b/sys/dev/ic/pcdisplay_subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pcdisplay_subr.c,v 1.33 2007/07/28 20:28:56 mjf Exp $ */
+/* $NetBSD: pcdisplay_subr.c,v 1.34 2007/10/19 11:59:58 ad Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,14 +28,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcdisplay_subr.c,v 1.33 2007/07/28 20:28:56 mjf Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcdisplay_subr.c,v 1.34 2007/10/19 11:59:58 ad Exp $");
#include "opt_wsmsgattrs.h" /* for WSDISPLAY_CUSTOM_OUTPUT */
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/mc6845reg.h>
#include <dev/ic/pcdisplayvar.h>
diff --git a/sys/dev/ic/pcf8584.c b/sys/dev/ic/pcf8584.c
index 507c8981668..d492dc71949 100644
--- a/sys/dev/ic/pcf8584.c
+++ b/sys/dev/ic/pcf8584.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pcf8584.c,v 1.1 2007/04/14 19:33:29 tnn Exp $ */
+/* $NetBSD: pcf8584.c,v 1.2 2007/10/19 11:59:58 ad Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcf8584.c,v 1.1 2007/04/14 19:33:29 tnn Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcf8584.c,v 1.2 2007/10/19 11:59:58 ad Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -53,7 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: pcf8584.c,v 1.1 2007/04/14 19:33:29 tnn Exp $");
#include <sys/systm.h>
#include <sys/condvar.h>
#include <sys/mutex.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/param.h>
#include <dev/i2c/i2cvar.h>
#include <dev/ic/pcf8584reg.h>
diff --git a/sys/dev/ic/pckbc.c b/sys/dev/ic/pckbc.c
index f3f5e170c04..bf1ce784220 100644
--- a/sys/dev/ic/pckbc.c
+++ b/sys/dev/ic/pckbc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbc.c,v 1.37 2007/07/09 21:00:38 ad Exp $ */
+/* $NetBSD: pckbc.c,v 1.38 2007/10/19 11:59:59 ad Exp $ */
/*
* Copyright (c) 2004 Ben Harris.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pckbc.c,v 1.37 2007/07/09 21:00:38 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbc.c,v 1.38 2007/10/19 11:59:59 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -40,7 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: pckbc.c,v 1.37 2007/07/09 21:00:38 ad Exp $");
#include <sys/queue.h>
#include <sys/lock.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/i8042reg.h>
#include <dev/ic/pckbcvar.h>
diff --git a/sys/dev/ic/pdqvar.h b/sys/dev/ic/pdqvar.h
index 429eae82ff1..215611d89f3 100644
--- a/sys/dev/ic/pdqvar.h
+++ b/sys/dev/ic/pdqvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pdqvar.h,v 1.37 2007/03/04 06:02:00 christos Exp $ */
+/* $NetBSD: pdqvar.h,v 1.38 2007/10/19 11:59:59 ad Exp $ */
/*-
* Copyright (c) 1995, 1996 Matt Thomas <matt@3am-software.com>
@@ -139,8 +139,8 @@ typedef pdq_bus_memaddr_t pdq_bus_memoffset_t;
#if !defined(PDQ_HWSUPPORT)
#include <net/if_media.h>
#endif
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#define PDQ_OS_HDR_OFFSET (PDQ_RX_FC_OFFSET-3)
#define PDQ_OS_PTR_FMT "%p"
#define PDQ_OS_CSR_FMT "0x%lx"
diff --git a/sys/dev/ic/rrunner.c b/sys/dev/ic/rrunner.c
index 4a3cb660028..b2c41516969 100644
--- a/sys/dev/ic/rrunner.c
+++ b/sys/dev/ic/rrunner.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rrunner.c,v 1.63 2007/07/29 12:50:20 ad Exp $ */
+/* $NetBSD: rrunner.c,v 1.64 2007/10/19 11:59:59 ad Exp $ */
/*
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rrunner.c,v 1.63 2007/07/29 12:50:20 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rrunner.c,v 1.64 2007/10/19 11:59:59 ad Exp $");
#include "opt_inet.h"
@@ -88,9 +88,9 @@ __KERNEL_RCSID(0, "$NetBSD: rrunner.c,v 1.63 2007/07/29 12:50:20 ad Exp $");
#include <net/bpfdesc.h>
#endif
-#include <machine/cpu.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/cpu.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/ic/rrunnerreg.h>
#include <dev/ic/rrunnervar.h>
diff --git a/sys/dev/ic/rt2560.c b/sys/dev/ic/rt2560.c
index d5a520ea898..2cae00fd3b1 100644
--- a/sys/dev/ic/rt2560.c
+++ b/sys/dev/ic/rt2560.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rt2560.c,v 1.12 2007/09/01 07:34:03 dyoung Exp $ */
+/* $NetBSD: rt2560.c,v 1.13 2007/10/19 11:59:59 ad Exp $ */
/* $OpenBSD: rt2560.c,v 1.15 2006/04/20 20:31:12 miod Exp $ */
/* $FreeBSD: rt2560.c,v 1.3 2006/03/21 21:15:43 damien Exp $*/
@@ -24,7 +24,7 @@
* http://www.ralinktech.com/
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rt2560.c,v 1.12 2007/09/01 07:34:03 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rt2560.c,v 1.13 2007/10/19 11:59:59 ad Exp $");
#include "bpfilter.h"
@@ -39,9 +39,9 @@ __KERNEL_RCSID(0, "$NetBSD: rt2560.c,v 1.12 2007/09/01 07:34:03 dyoung Exp $");
#include <sys/conf.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/endian.h>
-#include <machine/intr.h>
+#include <sys/intr.h>
#if NBPFILTER > 0
#include <net/bpf.h>
diff --git a/sys/dev/ic/rt2661.c b/sys/dev/ic/rt2661.c
index 5b3039b8725..efe08fea791 100644
--- a/sys/dev/ic/rt2661.c
+++ b/sys/dev/ic/rt2661.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rt2661.c,v 1.18 2007/09/29 18:30:22 scw Exp $ */
+/* $NetBSD: rt2661.c,v 1.19 2007/10/19 11:59:59 ad Exp $ */
/* $OpenBSD: rt2661.c,v 1.17 2006/05/01 08:41:11 damien Exp $ */
/* $FreeBSD: rt2560.c,v 1.5 2006/06/02 19:59:31 csjp Exp $ */
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rt2661.c,v 1.18 2007/09/29 18:30:22 scw Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rt2661.c,v 1.19 2007/10/19 11:59:59 ad Exp $");
#include "bpfilter.h"
@@ -41,9 +41,9 @@ __KERNEL_RCSID(0, "$NetBSD: rt2661.c,v 1.18 2007/09/29 18:30:22 scw Exp $");
#include <sys/conf.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/endian.h>
-#include <machine/intr.h>
+#include <sys/intr.h>
#if NBPFILTER > 0
#include <net/bpf.h>
diff --git a/sys/dev/ic/rtl80x9.c b/sys/dev/ic/rtl80x9.c
index 46ac5784566..15721b1e53c 100644
--- a/sys/dev/ic/rtl80x9.c
+++ b/sys/dev/ic/rtl80x9.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rtl80x9.c,v 1.11 2005/12/11 12:21:28 christos Exp $ */
+/* $NetBSD: rtl80x9.c,v 1.12 2007/10/19 11:59:59 ad Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtl80x9.c,v 1.11 2005/12/11 12:21:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtl80x9.c,v 1.12 2007/10/19 11:59:59 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -51,8 +51,8 @@ __KERNEL_RCSID(0, "$NetBSD: rtl80x9.c,v 1.11 2005/12/11 12:21:28 christos Exp $"
#include <net/if_ether.h>
#include <net/if_media.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/ic/dp8390reg.h>
#include <dev/ic/dp8390var.h>
diff --git a/sys/dev/ic/rtl8169.c b/sys/dev/ic/rtl8169.c
index f636c2763b4..1b6286e83b7 100644
--- a/sys/dev/ic/rtl8169.c
+++ b/sys/dev/ic/rtl8169.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rtl8169.c,v 1.88 2007/08/27 14:48:54 dyoung Exp $ */
+/* $NetBSD: rtl8169.c,v 1.89 2007/10/19 11:59:59 ad Exp $ */
/*
* Copyright (c) 1997, 1998-2003
@@ -138,7 +138,7 @@
#include <net/bpf.h>
#endif
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
diff --git a/sys/dev/ic/rtl81x9.c b/sys/dev/ic/rtl81x9.c
index 42e09138c3d..e58ebc7140c 100644
--- a/sys/dev/ic/rtl81x9.c
+++ b/sys/dev/ic/rtl81x9.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rtl81x9.c,v 1.76 2007/08/26 22:45:56 dyoung Exp $ */
+/* $NetBSD: rtl81x9.c,v 1.77 2007/10/19 11:59:59 ad Exp $ */
/*
* Copyright (c) 1997, 1998
@@ -86,7 +86,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtl81x9.c,v 1.76 2007/08/26 22:45:56 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtl81x9.c,v 1.77 2007/10/19 11:59:59 ad Exp $");
#include "bpfilter.h"
#include "rnd.h"
@@ -116,7 +116,7 @@ __KERNEL_RCSID(0, "$NetBSD: rtl81x9.c,v 1.76 2007/08/26 22:45:56 dyoung Exp $");
#include <sys/rnd.h>
#endif
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/endian.h>
#include <dev/mii/mii.h>
diff --git a/sys/dev/ic/rtw.c b/sys/dev/ic/rtw.c
index d3250e4c032..7c908f67f8e 100644
--- a/sys/dev/ic/rtw.c
+++ b/sys/dev/ic/rtw.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rtw.c,v 1.90 2007/09/29 18:32:51 scw Exp $ */
+/* $NetBSD: rtw.c,v 1.91 2007/10/19 12:00:00 ad Exp $ */
/*-
* Copyright (c) 2004, 2005 David Young. All rights reserved.
*
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtw.c,v 1.90 2007/09/29 18:32:51 scw Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtw.c,v 1.91 2007/10/19 12:00:00 ad Exp $");
#include "bpfilter.h"
@@ -49,8 +49,8 @@ __KERNEL_RCSID(0, "$NetBSD: rtw.c,v 1.90 2007/09/29 18:32:51 scw Exp $");
#include <sys/types.h>
#include <machine/endian.h>
-#include <machine/bus.h>
-#include <machine/intr.h> /* splnet */
+#include <sys/bus.h>
+#include <sys/intr.h> /* splnet */
#include <uvm/uvm_extern.h>
diff --git a/sys/dev/ic/rtwphy.c b/sys/dev/ic/rtwphy.c
index 1684df63c44..6b45f97358e 100644
--- a/sys/dev/ic/rtwphy.c
+++ b/sys/dev/ic/rtwphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rtwphy.c,v 1.12 2006/11/16 01:32:52 christos Exp $ */
+/* $NetBSD: rtwphy.c,v 1.13 2007/10/19 12:00:00 ad Exp $ */
/*-
* Copyright (c) 2004, 2005 David Young. All rights reserved.
*
@@ -35,13 +35,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtwphy.c,v 1.12 2006/11/16 01:32:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtwphy.c,v 1.13 2007/10/19 12:00:00 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/types.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <net/if.h>
#include <net/if_media.h>
diff --git a/sys/dev/ic/rtwphyio.c b/sys/dev/ic/rtwphyio.c
index 8d047afe7a4..dbc0985c831 100644
--- a/sys/dev/ic/rtwphyio.c
+++ b/sys/dev/ic/rtwphyio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rtwphyio.c,v 1.14 2006/11/16 01:32:52 christos Exp $ */
+/* $NetBSD: rtwphyio.c,v 1.15 2007/10/19 12:00:00 ad Exp $ */
/*-
* Copyright (c) 2004, 2005 David Young. All rights reserved.
*
@@ -35,13 +35,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtwphyio.c,v 1.14 2006/11/16 01:32:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtwphyio.c,v 1.15 2007/10/19 12:00:00 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/types.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <net/if.h>
#include <net/if_media.h>
diff --git a/sys/dev/ic/seeq8005.c b/sys/dev/ic/seeq8005.c
index 8edb53097fd..3159cc56467 100644
--- a/sys/dev/ic/seeq8005.c
+++ b/sys/dev/ic/seeq8005.c
@@ -1,4 +1,4 @@
-/* $NetBSD: seeq8005.c,v 1.41 2007/08/26 22:45:56 dyoung Exp $ */
+/* $NetBSD: seeq8005.c,v 1.42 2007/10/19 12:00:00 ad Exp $ */
/*
* Copyright (c) 2000, 2001 Ben Harris
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: seeq8005.c,v 1.41 2007/08/26 22:45:56 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: seeq8005.c,v 1.42 2007/10/19 12:00:00 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -90,8 +90,8 @@ __KERNEL_RCSID(0, "$NetBSD: seeq8005.c,v 1.41 2007/08/26 22:45:56 dyoung Exp $")
#include <sys/rnd.h>
#endif
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/ic/seeq8005reg.h>
#include <dev/ic/seeq8005var.h>
diff --git a/sys/dev/ic/sgec.c b/sys/dev/ic/sgec.c
index 9fb4238acbe..1e22ad61469 100644
--- a/sys/dev/ic/sgec.c
+++ b/sys/dev/ic/sgec.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sgec.c,v 1.33 2007/09/06 08:57:52 he Exp $ */
+/* $NetBSD: sgec.c,v 1.34 2007/10/19 12:00:00 ad Exp $ */
/*
* Copyright (c) 1999 Ludd, University of Lule}, Sweden. All rights reserved.
*
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sgec.c,v 1.33 2007/09/06 08:57:52 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sgec.c,v 1.34 2007/10/19 12:00:00 ad Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -71,7 +71,7 @@ __KERNEL_RCSID(0, "$NetBSD: sgec.c,v 1.33 2007/09/06 08:57:52 he Exp $");
#include <net/bpfdesc.h>
#endif
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/sgecreg.h>
#include <dev/ic/sgecvar.h>
diff --git a/sys/dev/ic/siop.c b/sys/dev/ic/siop.c
index e7fdd54fe64..0794b663729 100644
--- a/sys/dev/ic/siop.c
+++ b/sys/dev/ic/siop.c
@@ -1,4 +1,4 @@
-/* $NetBSD: siop.c,v 1.84 2007/09/30 11:59:42 martin Exp $ */
+/* $NetBSD: siop.c,v 1.85 2007/10/19 12:00:00 ad Exp $ */
/*
* Copyright (c) 2000 Manuel Bouyer.
@@ -33,7 +33,7 @@
/* SYM53c7/8xx PCI-SCSI I/O Processors driver */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: siop.c,v 1.84 2007/09/30 11:59:42 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siop.c,v 1.85 2007/10/19 12:00:00 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: siop.c,v 1.84 2007/09/30 11:59:42 martin Exp $");
#include <uvm/uvm_extern.h>
#include <machine/endian.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/microcode/siop/siop.out>
diff --git a/sys/dev/ic/siop_common.c b/sys/dev/ic/siop_common.c
index 74ea16a13bc..534d9d8e1d7 100644
--- a/sys/dev/ic/siop_common.c
+++ b/sys/dev/ic/siop_common.c
@@ -1,4 +1,4 @@
-/* $NetBSD: siop_common.c,v 1.42 2007/03/04 06:02:01 christos Exp $ */
+/* $NetBSD: siop_common.c,v 1.43 2007/10/19 12:00:01 ad Exp $ */
/*
* Copyright (c) 2000, 2002 Manuel Bouyer.
@@ -33,7 +33,7 @@
/* SYM53c7/8xx PCI-SCSI I/O Processors driver */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: siop_common.c,v 1.42 2007/03/04 06:02:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siop_common.c,v 1.43 2007/10/19 12:00:01 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: siop_common.c,v 1.42 2007/03/04 06:02:01 christos Ex
#include <uvm/uvm_extern.h>
#include <machine/endian.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/scsipi/scsi_all.h>
#include <dev/scsipi/scsi_message.h>
diff --git a/sys/dev/ic/sl811hs.c b/sys/dev/ic/sl811hs.c
index 01370c0d912..c790a8cc606 100644
--- a/sys/dev/ic/sl811hs.c
+++ b/sys/dev/ic/sl811hs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sl811hs.c,v 1.14 2007/08/24 01:49:08 kiyohara Exp $ */
+/* $NetBSD: sl811hs.c,v 1.15 2007/10/19 12:00:01 ad Exp $ */
/*
* Not (c) 2007 Matthew Orgass
@@ -86,7 +86,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.14 2007/08/24 01:49:08 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.15 2007/10/19 12:00:01 ad Exp $");
#include <sys/cdefs.h>
#include <sys/param.h>
@@ -99,8 +99,8 @@ __KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.14 2007/08/24 01:49:08 kiyohara Exp $"
#include <sys/gcq.h>
#include <sys/lock.h>
-#include <machine/bus.h>
-#include <machine/cpu.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
diff --git a/sys/dev/ic/smc83c170.c b/sys/dev/ic/smc83c170.c
index df22a47af19..f719a37fbbb 100644
--- a/sys/dev/ic/smc83c170.c
+++ b/sys/dev/ic/smc83c170.c
@@ -1,4 +1,4 @@
-/* $NetBSD: smc83c170.c,v 1.66 2007/08/27 14:48:55 dyoung Exp $ */
+/* $NetBSD: smc83c170.c,v 1.67 2007/10/19 12:00:01 ad Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smc83c170.c,v 1.66 2007/08/27 14:48:55 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smc83c170.c,v 1.67 2007/10/19 12:00:01 ad Exp $");
#include "bpfilter.h"
@@ -69,8 +69,8 @@ __KERNEL_RCSID(0, "$NetBSD: smc83c170.c,v 1.66 2007/08/27 14:48:55 dyoung Exp $"
#include <net/bpf.h>
#endif
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/mii/miivar.h>
#include <dev/mii/lxtphyreg.h>
diff --git a/sys/dev/ic/smc90cx6.c b/sys/dev/ic/smc90cx6.c
index 0402c31d450..35c6e318f07 100644
--- a/sys/dev/ic/smc90cx6.c
+++ b/sys/dev/ic/smc90cx6.c
@@ -1,4 +1,4 @@
-/* $NetBSD: smc90cx6.c,v 1.51 2007/10/08 16:18:03 ad Exp $ */
+/* $NetBSD: smc90cx6.c,v 1.52 2007/10/19 12:00:01 ad Exp $ */
/*-
* Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smc90cx6.c,v 1.51 2007/10/08 16:18:03 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smc90cx6.c,v 1.52 2007/10/19 12:00:01 ad Exp $");
/* #define BAHSOFTCOPY */
#define BAHRETRANSMIT /**/
@@ -81,8 +81,8 @@ __KERNEL_RCSID(0, "$NetBSD: smc90cx6.c,v 1.51 2007/10/08 16:18:03 ad Exp $");
#include <net/bpfdesc.h>
#endif
-#include <machine/bus.h>
-#include <machine/cpu.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
#include <machine/mtpr.h>
#include <dev/ic/smc90cx6reg.h>
diff --git a/sys/dev/ic/smc91cxx.c b/sys/dev/ic/smc91cxx.c
index df33cd9e8fe..15b86d363c6 100644
--- a/sys/dev/ic/smc91cxx.c
+++ b/sys/dev/ic/smc91cxx.c
@@ -1,4 +1,4 @@
-/* $NetBSD: smc91cxx.c,v 1.62 2007/09/01 07:32:27 dyoung Exp $ */
+/* $NetBSD: smc91cxx.c,v 1.63 2007/10/19 12:00:01 ad Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smc91cxx.c,v 1.62 2007/09/01 07:32:27 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smc91cxx.c,v 1.63 2007/10/19 12:00:01 ad Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -98,8 +98,8 @@ __KERNEL_RCSID(0, "$NetBSD: smc91cxx.c,v 1.62 2007/09/01 07:32:27 dyoung Exp $")
#include <sys/rnd.h>
#endif
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <net/if.h>
#include <net/if_dl.h>
diff --git a/sys/dev/ic/smc93cx6.c b/sys/dev/ic/smc93cx6.c
index c1e0738d382..6e630f1a2a6 100644
--- a/sys/dev/ic/smc93cx6.c
+++ b/sys/dev/ic/smc93cx6.c
@@ -1,4 +1,4 @@
-/* $NetBSD: smc93cx6.c,v 1.13 2007/01/29 01:52:45 hubertf Exp $ */
+/* $NetBSD: smc93cx6.c,v 1.14 2007/10/19 12:00:02 ad Exp $ */
/*
* Interface for the 93C66/56/46/26/06 serial eeprom parts.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smc93cx6.c,v 1.13 2007/01/29 01:52:45 hubertf Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smc93cx6.c,v 1.14 2007/10/19 12:00:02 ad Exp $");
#ifndef __NetBSD__
#include "opt_aic7xxx.h"
@@ -66,7 +66,7 @@ __KERNEL_RCSID(0, "$NetBSD: smc93cx6.c,v 1.13 2007/01/29 01:52:45 hubertf Exp $"
#include <sys/param.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#ifdef __NetBSD__
#include <dev/ic/smc93cx6var.h>
#else
diff --git a/sys/dev/ic/spic.c b/sys/dev/ic/spic.c
index 79c9fddb2f1..f169291355c 100644
--- a/sys/dev/ic/spic.c
+++ b/sys/dev/ic/spic.c
@@ -1,4 +1,4 @@
-/* $NetBSD: spic.c,v 1.8 2007/07/09 21:00:39 ad Exp $ */
+/* $NetBSD: spic.c,v 1.9 2007/10/19 12:00:02 ad Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -56,7 +56,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spic.c,v 1.8 2007/07/09 21:00:39 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spic.c,v 1.9 2007/10/19 12:00:02 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -65,7 +65,7 @@ __KERNEL_RCSID(0, "$NetBSD: spic.c,v 1.8 2007/07/09 21:00:39 ad Exp $");
#include <sys/kernel.h>
#include <sys/callout.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/sysmon/sysmonvar.h>
diff --git a/sys/dev/ic/sti.c b/sys/dev/ic/sti.c
index 35d2cbb2532..909de0d6c2d 100644
--- a/sys/dev/ic/sti.c
+++ b/sys/dev/ic/sti.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sti.c,v 1.7 2007/03/04 06:02:02 christos Exp $ */
+/* $NetBSD: sti.c,v 1.8 2007/10/19 12:00:02 ad Exp $ */
/* $OpenBSD: sti.c,v 1.35 2003/12/16 06:07:13 mickey Exp $ */
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sti.c,v 1.7 2007/03/04 06:02:02 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sti.c,v 1.8 2007/10/19 12:00:02 ad Exp $");
#include "wsdisplay.h"
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: sti.c,v 1.7 2007/03/04 06:02:02 christos Exp $");
#include <uvm/uvm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/wscons/wsdisplayvar.h>
#include <dev/wscons/wsconsio.h>
diff --git a/sys/dev/ic/sunscpalvar.h b/sys/dev/ic/sunscpalvar.h
index ef04a7a7951..21d78cf40d6 100644
--- a/sys/dev/ic/sunscpalvar.h
+++ b/sys/dev/ic/sunscpalvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: sunscpalvar.h,v 1.7 2005/12/11 12:21:28 christos Exp $ */
+/* $NetBSD: sunscpalvar.h,v 1.8 2007/10/19 12:00:02 ad Exp $ */
/*
* Copyright (c) 2001 Matthew Fredette
@@ -55,7 +55,7 @@
* Handy read/write macros
*/
#ifdef SUNSCPAL_USE_BUS_SPACE
-# include <machine/bus.h>
+# include <sys/bus.h>
/* bus_space() variety */
#define SUNSCPAL_READ_1(sc, reg) bus_space_read_1(sc->sunscpal_regt, \
sc->sunscpal_regh, sc->reg)
diff --git a/sys/dev/ic/tcic2.c b/sys/dev/ic/tcic2.c
index eff9d4ec03a..61b12beb05c 100644
--- a/sys/dev/ic/tcic2.c
+++ b/sys/dev/ic/tcic2.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tcic2.c,v 1.27 2007/07/09 21:00:39 ad Exp $ */
+/* $NetBSD: tcic2.c,v 1.28 2007/10/19 12:00:02 ad Exp $ */
/*
* Copyright (c) 1998, 1999 Christoph Badura. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcic2.c,v 1.27 2007/07/09 21:00:39 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcic2.c,v 1.28 2007/10/19 12:00:02 ad Exp $");
#undef TCICDEBUG
@@ -42,8 +42,8 @@ __KERNEL_RCSID(0, "$NetBSD: tcic2.c,v 1.27 2007/07/09 21:00:39 ad Exp $");
#include <sys/malloc.h>
#include <sys/kthread.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/pcmcia/pcmciareg.h>
#include <dev/pcmcia/pcmciavar.h>
diff --git a/sys/dev/ic/tea5757.h b/sys/dev/ic/tea5757.h
index bc1e95768e5..df46ff03546 100644
--- a/sys/dev/ic/tea5757.h
+++ b/sys/dev/ic/tea5757.h
@@ -1,4 +1,4 @@
-/* $NetBSD: tea5757.h,v 1.2 2002/09/03 18:53:40 augustss Exp $ */
+/* $NetBSD: tea5757.h,v 1.3 2007/10/19 12:00:03 ad Exp $ */
/* $OpenBSD: tea5757.h,v 1.3 2002/01/07 18:32:19 mickey Exp $ */
/* $RuOBSD: tea5757.h,v 1.2 2001/10/18 16:51:36 pva Exp $ */
@@ -31,7 +31,7 @@
#include <sys/types.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#define TEA5757_REGISTER_LENGTH 25
#define TEA5757_FREQ 0x0007FFF
diff --git a/sys/dev/ic/timer_cpcbus.c b/sys/dev/ic/timer_cpcbus.c
index 9dedeb8a5bd..4bbfbd47db5 100644
--- a/sys/dev/ic/timer_cpcbus.c
+++ b/sys/dev/ic/timer_cpcbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: timer_cpcbus.c,v 1.7 2005/12/11 12:21:28 christos Exp $ */
+/* $NetBSD: timer_cpcbus.c,v 1.8 2007/10/19 12:00:03 ad Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,13 +37,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: timer_cpcbus.c,v 1.7 2005/12/11 12:21:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: timer_cpcbus.c,v 1.8 2007/10/19 12:00:03 ad Exp $");
#include <sys/param.h>
#include <sys/device.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/cpc700var.h>
struct cpctim_softc {
diff --git a/sys/dev/ic/tms320av110.c b/sys/dev/ic/tms320av110.c
index 095a5728efb..9d1d335284c 100644
--- a/sys/dev/ic/tms320av110.c
+++ b/sys/dev/ic/tms320av110.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tms320av110.c,v 1.18 2005/12/11 12:21:28 christos Exp $ */
+/* $NetBSD: tms320av110.c,v 1.19 2007/10/19 12:00:03 ad Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tms320av110.c,v 1.18 2005/12/11 12:21:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tms320av110.c,v 1.19 2007/10/19 12:00:03 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -58,7 +58,7 @@ __KERNEL_RCSID(0, "$NetBSD: tms320av110.c,v 1.18 2005/12/11 12:21:28 christos Ex
#include <dev/ic/tms320av110reg.h>
#include <dev/ic/tms320av110var.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
int tav_open(void *, int);
void tav_close(void *);
diff --git a/sys/dev/ic/tms320av110var.h b/sys/dev/ic/tms320av110var.h
index adc09c84272..823e6b3e624 100644
--- a/sys/dev/ic/tms320av110var.h
+++ b/sys/dev/ic/tms320av110var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: tms320av110var.h,v 1.8 2006/02/16 20:17:16 perry Exp $ */
+/* $NetBSD: tms320av110var.h,v 1.9 2007/10/19 12:00:03 ad Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
#ifndef _TMS320AV110_VAR_H_
#define _TMS320AV110_VAR_H_
-#include <machine/bus.h>
+#include <sys/bus.h>
/* softc */
diff --git a/sys/dev/ic/tropic.c b/sys/dev/ic/tropic.c
index 7d39ff78dca..f1e9ea6a1d1 100644
--- a/sys/dev/ic/tropic.c
+++ b/sys/dev/ic/tropic.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tropic.c,v 1.31 2007/07/09 21:00:39 ad Exp $ */
+/* $NetBSD: tropic.c,v 1.32 2007/10/19 12:00:03 ad Exp $ */
/*
* Ported to NetBSD by Onno van der Linden
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tropic.c,v 1.31 2007/07/09 21:00:39 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tropic.c,v 1.32 2007/10/19 12:00:03 ad Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -74,8 +74,8 @@ __KERNEL_RCSID(0, "$NetBSD: tropic.c,v 1.31 2007/07/09 21:00:39 ad Exp $");
#include <net/bpfdesc.h>
#endif
-#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/cpu.h>
+#include <sys/bus.h>
#include <dev/ic/tropicreg.h>
#include <dev/ic/tropicvar.h>
diff --git a/sys/dev/ic/tulip.c b/sys/dev/ic/tulip.c
index 34a5bbd29e3..9e8dbbcc671 100644
--- a/sys/dev/ic/tulip.c
+++ b/sys/dev/ic/tulip.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tulip.c,v 1.153 2007/09/29 18:32:51 scw Exp $ */
+/* $NetBSD: tulip.c,v 1.154 2007/10/19 12:00:03 ad Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2002 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tulip.c,v 1.153 2007/09/29 18:32:51 scw Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tulip.c,v 1.154 2007/10/19 12:00:03 ad Exp $");
#include "bpfilter.h"
@@ -71,8 +71,8 @@ __KERNEL_RCSID(0, "$NetBSD: tulip.c,v 1.153 2007/09/29 18:32:51 scw Exp $");
#include <net/bpf.h>
#endif
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
diff --git a/sys/dev/ic/ug.c b/sys/dev/ic/ug.c
index a3892210bdd..0d139864550 100644
--- a/sys/dev/ic/ug.c
+++ b/sys/dev/ic/ug.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ug.c,v 1.7 2007/07/03 09:40:28 xtraeme Exp $ */
+/* $NetBSD: ug.c,v 1.8 2007/10/19 12:00:03 ad Exp $ */
/*
* Copyright (c) 2007 Mihai Chelaru <kefren@netbsd.ro>
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ug.c,v 1.7 2007/07/03 09:40:28 xtraeme Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ug.c,v 1.8 2007/10/19 12:00:03 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -39,8 +39,8 @@ __KERNEL_RCSID(0, "$NetBSD: ug.c,v 1.7 2007/07/03 09:40:28 xtraeme Exp $");
#include <sys/envsys.h>
#include <sys/time.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
diff --git a/sys/dev/ic/uha.c b/sys/dev/ic/uha.c
index 8cc09373183..477aa8cd442 100644
--- a/sys/dev/ic/uha.c
+++ b/sys/dev/ic/uha.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uha.c,v 1.39 2007/03/04 06:02:02 christos Exp $ */
+/* $NetBSD: uha.c,v 1.40 2007/10/19 12:00:04 ad Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uha.c,v 1.39 2007/03/04 06:02:02 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uha.c,v 1.40 2007/10/19 12:00:04 ad Exp $");
#undef UHADEBUG
#ifdef DDB
@@ -82,8 +82,8 @@ __KERNEL_RCSID(0, "$NetBSD: uha.c,v 1.39 2007/03/04 06:02:02 christos Exp $");
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/scsipi/scsi_all.h>
#include <dev/scsipi/scsipi_all.h>
diff --git a/sys/dev/ic/upc.c b/sys/dev/ic/upc.c
index 01931be7f2e..ee78a15324e 100644
--- a/sys/dev/ic/upc.c
+++ b/sys/dev/ic/upc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: upc.c,v 1.12 2005/12/11 12:21:29 christos Exp $ */
+/* $NetBSD: upc.c,v 1.13 2007/10/19 12:00:04 ad Exp $ */
/*-
* Copyright (c) 2000, 2003 Ben Harris
* All rights reserved.
@@ -39,13 +39,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: upc.c,v 1.12 2005/12/11 12:21:29 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: upc.c,v 1.13 2007/10/19 12:00:04 ad Exp $");
#include <sys/param.h>
#include <sys/device.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ata/atavar.h> /* XXX needed by wdcvar.h */
#include <dev/ic/comreg.h>
diff --git a/sys/dev/ic/upcvar.h b/sys/dev/ic/upcvar.h
index 5cb52eb0605..de6f089ba67 100644
--- a/sys/dev/ic/upcvar.h
+++ b/sys/dev/ic/upcvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: upcvar.h,v 1.4 2005/12/11 12:21:29 christos Exp $ */
+/* $NetBSD: upcvar.h,v 1.5 2007/10/19 12:00:04 ad Exp $ */
/*-
* Copyright (c) 2000, 2003 Ben Harris
* All rights reserved.
@@ -29,7 +29,7 @@
#ifndef __UPCVAR_H
#define __UPCVAR_H
-#include <machine/bus.h>
+#include <sys/bus.h>
struct upc_irqhandle {
int (*uih_func)(void *);
diff --git a/sys/dev/ic/vga.c b/sys/dev/ic/vga.c
index 73d608c24bb..2fe1cef7466 100644
--- a/sys/dev/ic/vga.c
+++ b/sys/dev/ic/vga.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vga.c,v 1.95 2007/07/28 20:28:56 mjf Exp $ */
+/* $NetBSD: vga.c,v 1.96 2007/10/19 12:00:04 ad Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vga.c,v 1.95 2007/07/28 20:28:56 mjf Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vga.c,v 1.96 2007/10/19 12:00:04 ad Exp $");
/* for WSCONS_SUPPORT_PCVTFONTS */
#include "opt_wsdisplay_compat.h"
@@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: vga.c,v 1.95 2007/07/28 20:28:56 mjf Exp $");
#include <sys/device.h>
#include <sys/malloc.h>
#include <sys/queue.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/mc6845reg.h>
#include <dev/ic/pcdisplayvar.h>
diff --git a/sys/dev/ic/vga_common.c b/sys/dev/ic/vga_common.c
index ac3c22a193f..3874fb65f97 100644
--- a/sys/dev/ic/vga_common.c
+++ b/sys/dev/ic/vga_common.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vga_common.c,v 1.7 2006/02/19 15:16:53 jmcneill Exp $ */
+/* $NetBSD: vga_common.c,v 1.8 2007/10/19 12:00:04 ad Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,11 +28,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vga_common.c,v 1.7 2006/02/19 15:16:53 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vga_common.c,v 1.8 2007/10/19 12:00:04 ad Exp $");
#include <sys/param.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/mc6845reg.h>
#include <dev/ic/pcdisplayvar.h>
diff --git a/sys/dev/ic/vga_raster.c b/sys/dev/ic/vga_raster.c
index c30560051dc..f1b58a61aa4 100644
--- a/sys/dev/ic/vga_raster.c
+++ b/sys/dev/ic/vga_raster.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vga_raster.c,v 1.29 2007/07/28 20:28:57 mjf Exp $ */
+/* $NetBSD: vga_raster.c,v 1.30 2007/10/19 12:00:04 ad Exp $ */
/*
* Copyright (c) 2001, 2002 Bang Jun-Young
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vga_raster.c,v 1.29 2007/07/28 20:28:57 mjf Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vga_raster.c,v 1.30 2007/10/19 12:00:04 ad Exp $");
#include "opt_wsmsgattrs.h" /* for WSDISPLAY_CUSTOM_OUTPUT */
@@ -67,7 +67,7 @@ __KERNEL_RCSID(0, "$NetBSD: vga_raster.c,v 1.29 2007/07/28 20:28:57 mjf Exp $");
#include <sys/device.h>
#include <sys/malloc.h>
#include <sys/queue.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/mc6845reg.h>
#include <dev/ic/pcdisplayvar.h>
diff --git a/sys/dev/ic/vga_subr.c b/sys/dev/ic/vga_subr.c
index 85160b73b2b..45f4b4e5807 100644
--- a/sys/dev/ic/vga_subr.c
+++ b/sys/dev/ic/vga_subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vga_subr.c,v 1.21 2007/07/19 22:24:07 dsl Exp $ */
+/* $NetBSD: vga_subr.c,v 1.22 2007/10/19 12:00:04 ad Exp $ */
/*
* Copyright (c) 1998
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vga_subr.c,v 1.21 2007/07/19 22:24:07 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vga_subr.c,v 1.22 2007/10/19 12:00:04 ad Exp $");
/* for WSDISPLAY_BORDER_COLOR */
#include "opt_wsdisplay_border.h"
@@ -36,7 +36,7 @@ __KERNEL_RCSID(0, "$NetBSD: vga_subr.c,v 1.21 2007/07/19 22:24:07 dsl Exp $");
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/queue.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/mc6845reg.h>
#include <dev/ic/pcdisplay.h>
diff --git a/sys/dev/ic/wd33c93.c b/sys/dev/ic/wd33c93.c
index 14b88a70aa5..6fc186fa592 100644
--- a/sys/dev/ic/wd33c93.c
+++ b/sys/dev/ic/wd33c93.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wd33c93.c,v 1.17 2007/07/09 21:00:40 ad Exp $ */
+/* $NetBSD: wd33c93.c,v 1.18 2007/10/19 12:00:04 ad Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wd33c93.c,v 1.17 2007/07/09 21:00:40 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wd33c93.c,v 1.18 2007/10/19 12:00:04 ad Exp $");
#include "opt_ddb.h"
@@ -97,7 +97,7 @@ __KERNEL_RCSID(0, "$NetBSD: wd33c93.c,v 1.17 2007/07/09 21:00:40 ad Exp $");
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/wd33c93reg.h>
#include <dev/ic/wd33c93var.h>
diff --git a/sys/dev/ic/wdc.c b/sys/dev/ic/wdc.c
index 8de86600096..82e0327b76e 100644
--- a/sys/dev/ic/wdc.c
+++ b/sys/dev/ic/wdc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc.c,v 1.248 2007/04/16 05:25:36 dyoung Exp $ */
+/* $NetBSD: wdc.c,v 1.249 2007/10/19 12:00:04 ad Exp $ */
/*
* Copyright (c) 1998, 2001, 2003 Manuel Bouyer. All rights reserved.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc.c,v 1.248 2007/04/16 05:25:36 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc.c,v 1.249 2007/10/19 12:00:04 ad Exp $");
#include "opt_ata.h"
@@ -84,8 +84,8 @@ __KERNEL_RCSID(0, "$NetBSD: wdc.c,v 1.248 2007/04/16 05:25:36 dyoung Exp $");
#include <sys/syslog.h>
#include <sys/proc.h>
-#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
#ifndef __BUS_SPACE_HAS_STREAM_METHODS
#define bus_space_write_multi_stream_2 bus_space_write_multi_2
diff --git a/sys/dev/ic/wdc_upc.c b/sys/dev/ic/wdc_upc.c
index 56f81578c0d..93d9babe8ec 100644
--- a/sys/dev/ic/wdc_upc.c
+++ b/sys/dev/ic/wdc_upc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc_upc.c,v 1.23 2006/10/01 21:50:33 bjh21 Exp $ */
+/* $NetBSD: wdc_upc.c,v 1.24 2007/10/19 12:00:05 ad Exp $ */
/*-
* Copyright (c) 2000 Ben Harris
* All rights reserved.
@@ -28,15 +28,15 @@
/* This file is part of NetBSD/arm26 -- a port of NetBSD to ARM2/3 machines. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_upc.c,v 1.23 2006/10/01 21:50:33 bjh21 Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_upc.c,v 1.24 2007/10/19 12:00:05 ad Exp $");
#include <sys/param.h>
#include <sys/device.h>
#include <sys/malloc.h>
#include <sys/systm.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/ata/atavar.h> /* XXX needed by wdcvar.h */
diff --git a/sys/dev/ic/we.c b/sys/dev/ic/we.c
index 13fbb346de7..e3a43deb1f3 100644
--- a/sys/dev/ic/we.c
+++ b/sys/dev/ic/we.c
@@ -1,4 +1,4 @@
-/* $NetBSD: we.c,v 1.12 2007/03/04 06:02:03 christos Exp $ */
+/* $NetBSD: we.c,v 1.13 2007/10/19 12:00:05 ad Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: we.c,v 1.12 2007/03/04 06:02:03 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: we.c,v 1.13 2007/10/19 12:00:05 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -72,9 +72,9 @@ __KERNEL_RCSID(0, "$NetBSD: we.c,v 1.12 2007/03/04 06:02:03 christos Exp $");
#include <net/if_ether.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/bswap.h>
-#include <machine/intr.h>
+#include <sys/intr.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
diff --git a/sys/dev/ic/wi.c b/sys/dev/ic/wi.c
index 0e38994c28e..23c90e2ab32 100644
--- a/sys/dev/ic/wi.c
+++ b/sys/dev/ic/wi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wi.c,v 1.221 2007/09/01 07:32:28 dyoung Exp $ */
+/* $NetBSD: wi.c,v 1.222 2007/10/19 12:00:05 ad Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -106,7 +106,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wi.c,v 1.221 2007/09/01 07:32:28 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wi.c,v 1.222 2007/10/19 12:00:05 ad Exp $");
#define WI_HERMES_AUTOINC_WAR /* Work around data write autoinc bug. */
#define WI_HERMES_STATS_WAR /* Work around stats counter bug. */
@@ -146,7 +146,7 @@ __KERNEL_RCSID(0, "$NetBSD: wi.c,v 1.221 2007/09/01 07:32:28 dyoung Exp $");
#include <net/bpfdesc.h>
#endif
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/wi_ieee.h>
#include <dev/ic/wireg.h>
diff --git a/sys/dev/ieee1394/firewire.c b/sys/dev/ieee1394/firewire.c
index 7156d667d58..fc679f12ea3 100644
--- a/sys/dev/ieee1394/firewire.c
+++ b/sys/dev/ieee1394/firewire.c
@@ -1,4 +1,4 @@
-/* $NetBSD: firewire.c,v 1.14 2007/07/09 21:00:41 ad Exp $ */
+/* $NetBSD: firewire.c,v 1.15 2007/10/19 12:00:12 ad Exp $ */
/*-
* Copyright (c) 2003 Hidetoshi Shimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
@@ -53,7 +53,7 @@
#endif
#include <sys/bus.h> /* used by smbus and newbus */
-#include <machine/bus.h>
+#include <sys/bus.h>
#ifdef __DragonFly__
#include "fw_port.h"
@@ -82,7 +82,7 @@
#include <sys/sysctl.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ieee1394/fw_port.h>
#include <dev/ieee1394/firewire.h>
diff --git a/sys/dev/ieee1394/fw_port.h b/sys/dev/ieee1394/fw_port.h
index 5333c843b2c..3755299fc36 100644
--- a/sys/dev/ieee1394/fw_port.h
+++ b/sys/dev/ieee1394/fw_port.h
@@ -1,4 +1,4 @@
-/* $NetBSD: fw_port.h,v 1.24 2007/08/05 01:19:17 rmind Exp $ */
+/* $NetBSD: fw_port.h,v 1.25 2007/10/19 12:00:13 ad Exp $ */
/*
* Copyright (c) 2004 KIYOHARA Takashi
* All rights reserved.
@@ -1136,7 +1136,7 @@ struct fw_hwaddr {
/*
* bus_dma macros for NetBSD
*/
-#include <machine/bus.h>
+#include <sys/bus.h>
struct fw_bus_dma_tag {
bus_dma_tag_t tag;
bus_size_t alignment;
diff --git a/sys/dev/ieee1394/fwdev.c b/sys/dev/ieee1394/fwdev.c
index 29d628ae4d8..24f51fba82e 100644
--- a/sys/dev/ieee1394/fwdev.c
+++ b/sys/dev/ieee1394/fwdev.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fwdev.c,v 1.11 2007/07/29 13:31:08 ad Exp $ */
+/* $NetBSD: fwdev.c,v 1.12 2007/10/19 12:00:13 ad Exp $ */
/*-
* Copyright (c) 2003 Hidetoshi Shimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
@@ -54,7 +54,7 @@
#include <sys/bus.h>
#include <sys/ctype.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/ioccom.h>
@@ -85,7 +85,7 @@
#include <sys/poll.h>
#include <sys/proc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ieee1394/fw_port.h>
#include <dev/ieee1394/firewire.h>
diff --git a/sys/dev/ieee1394/fwdma.c b/sys/dev/ieee1394/fwdma.c
index 0d673bc1991..d4bb8db5d5e 100644
--- a/sys/dev/ieee1394/fwdma.c
+++ b/sys/dev/ieee1394/fwdma.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fwdma.c,v 1.8 2007/03/11 22:11:02 ad Exp $ */
+/* $NetBSD: fwdma.c,v 1.9 2007/10/19 12:00:13 ad Exp $ */
/*-
* Copyright (c) 2003
* Hidetoshi Shimokawa. All rights reserved.
@@ -52,7 +52,7 @@ __FBSDID("$FreeBSD: /repoman/r/ncvs/src/sys/dev/firewire/fwdma.c,v 1.7 2005/01/0
#endif
#include <sys/bus.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#ifdef __DragonFly__
#include <bus/firewire/fw_port.h>
@@ -73,7 +73,7 @@ __FBSDID("$FreeBSD: /repoman/r/ncvs/src/sys/dev/firewire/fwdma.c,v 1.7 2005/01/0
#include <sys/kernel.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ieee1394/fw_port.h>
#include <dev/ieee1394/firewire.h>
diff --git a/sys/dev/ieee1394/fwmem.c b/sys/dev/ieee1394/fwmem.c
index c46e5db1493..aa4283ba40d 100644
--- a/sys/dev/ieee1394/fwmem.c
+++ b/sys/dev/ieee1394/fwmem.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fwmem.c,v 1.5 2007/07/29 13:31:08 ad Exp $ */
+/* $NetBSD: fwmem.c,v 1.6 2007/10/19 12:00:13 ad Exp $ */
/*-
* Copyright (c) 2002-2003
* Hidetoshi Shimokawa. All rights reserved.
@@ -55,7 +55,7 @@ __FBSDID("$FreeBSD: /repoman/r/ncvs/src/sys/dev/firewire/fwmem.c,v 1.32 2007/03/
#endif
#include <sys/bus.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/signal.h>
#include <sys/mman.h>
@@ -84,7 +84,7 @@ __FBSDID("$FreeBSD: /repoman/r/ncvs/src/sys/dev/firewire/fwmem.c,v 1.32 2007/03/
#include <sys/malloc.h>
#include <sys/sysctl.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ieee1394/fw_port.h>
#include <dev/ieee1394/firewire.h>
diff --git a/sys/dev/ieee1394/fwohci.c b/sys/dev/ieee1394/fwohci.c
index 7ab09633913..1b186f7b10d 100644
--- a/sys/dev/ieee1394/fwohci.c
+++ b/sys/dev/ieee1394/fwohci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fwohci.c,v 1.108 2007/09/25 14:13:34 ad Exp $ */
+/* $NetBSD: fwohci.c,v 1.109 2007/10/19 12:00:13 ad Exp $ */
/*-
* Copyright (c) 2003 Hidetoshi Shimokawa
@@ -58,7 +58,7 @@
#include <sys/ktr.h>
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fwohci.c,v 1.108 2007/09/25 14:13:34 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fwohci.c,v 1.109 2007/10/19 12:00:13 ad Exp $");
#if defined(__DragonFly__) || __FreeBSD_version < 500000
#include <machine/clock.h> /* for DELAY() */
@@ -94,7 +94,7 @@ __KERNEL_RCSID(0, "$NetBSD: fwohci.c,v 1.108 2007/09/25 14:13:34 ad Exp $");
#include <sys/sysctl.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ieee1394/fw_port.h>
#include <dev/ieee1394/firewire.h>
diff --git a/sys/dev/ieee1394/if_fwip.c b/sys/dev/ieee1394/if_fwip.c
index 9704e1c3c2d..c773501f6ad 100644
--- a/sys/dev/ieee1394/if_fwip.c
+++ b/sys/dev/ieee1394/if_fwip.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fwip.c,v 1.8 2007/04/21 15:27:44 kiyohara Exp $ */
+/* $NetBSD: if_fwip.c,v 1.9 2007/10/19 12:00:13 ad Exp $ */
/*-
* Copyright (c) 2004
* Doug Rabson
@@ -54,7 +54,7 @@
#include <sys/taskqueue.h>
#include <sys/module.h>
#include <sys/bus.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <net/bpf.h>
#include <net/if.h>
@@ -81,7 +81,7 @@
#include <sys/mbuf.h>
#include <sys/sysctl.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <net/if.h>
#include <net/if_ieee1394.h>
diff --git a/sys/dev/ieee1394/sbp.c b/sys/dev/ieee1394/sbp.c
index 0e778d4643e..3473593d47a 100644
--- a/sys/dev/ieee1394/sbp.c
+++ b/sys/dev/ieee1394/sbp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sbp.c,v 1.17 2007/07/09 21:00:41 ad Exp $ */
+/* $NetBSD: sbp.c,v 1.18 2007/10/19 12:00:13 ad Exp $ */
/*-
* Copyright (c) 2003 Hidetoshi Shimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
@@ -44,7 +44,7 @@
#include <sys/bus.h>
#include <sys/kernel.h>
#include <sys/sysctl.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/malloc.h>
#if defined(__FreeBSD__) && __FreeBSD_version >= 501102
#include <sys/lock.h>
@@ -97,7 +97,7 @@
#include <sys/proc.h>
#include <sys/sysctl.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/scsipi/scsi_spc.h>
#include <dev/scsipi/scsi_all.h>
diff --git a/sys/dev/if_ndis/if_ndis.c b/sys/dev/if_ndis/if_ndis.c
index 835374dd1ba..e0f089e9799 100644
--- a/sys/dev/if_ndis/if_ndis.c
+++ b/sys/dev/if_ndis/if_ndis.c
@@ -35,7 +35,7 @@
__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.69.2.6 2005/03/31 04:24:36 wpaul Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: if_ndis.c,v 1.14 2007/08/26 22:45:57 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ndis.c,v 1.15 2007/10/19 12:00:13 ad Exp $");
#endif
#ifdef __FreeBSD__
@@ -88,7 +88,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_ndis.c,v 1.14 2007/08/26 22:45:57 dyoung Exp $");
#include <machine/resource.h>
#endif
-#include <machine/bus.h>
+#include <sys/bus.h>
#ifdef __FreeBSD__
#include <sys/bus.h>
diff --git a/sys/dev/if_ndis/if_ndis_pccard.c b/sys/dev/if_ndis/if_ndis_pccard.c
index 2afc8fe8380..f89e66f0ea4 100644
--- a/sys/dev/if_ndis/if_ndis_pccard.c
+++ b/sys/dev/if_ndis/if_ndis_pccard.c
@@ -46,7 +46,7 @@ __FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis_pccard.c,v 1.6.2.3 2005/03/31 04
#include <net/if_arp.h>
#include <net/if_media.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/resource.h>
#include <sys/bus.h>
#include <sys/rman.h>
diff --git a/sys/dev/if_ndis/if_ndis_pci.c b/sys/dev/if_ndis/if_ndis_pci.c
index c0d66cb6b96..1aa32189ae8 100644
--- a/sys/dev/if_ndis/if_ndis_pci.c
+++ b/sys/dev/if_ndis/if_ndis_pci.c
@@ -51,7 +51,7 @@ __FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis_pci.c,v 1.8.2.3 2005/03/31 04:24
#include <net/if_arp.h>
#include <net/if_media.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#ifdef __FreeBSD__
#include <machine/resource.h>
#include <sys/bus.h>
diff --git a/sys/dev/isa/ad1848_isa.c b/sys/dev/isa/ad1848_isa.c
index 2cde43bdc9e..bb3da0db51e 100644
--- a/sys/dev/isa/ad1848_isa.c
+++ b/sys/dev/isa/ad1848_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ad1848_isa.c,v 1.32 2006/11/16 01:33:00 christos Exp $ */
+/* $NetBSD: ad1848_isa.c,v 1.33 2007/10/19 12:00:14 ad Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -102,7 +102,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ad1848_isa.c,v 1.32 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ad1848_isa.c,v 1.33 2007/10/19 12:00:14 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -113,8 +113,8 @@ __KERNEL_RCSID(0, "$NetBSD: ad1848_isa.c,v 1.32 2006/11/16 01:33:00 christos Exp
#include <sys/proc.h>
#include <sys/buf.h>
-#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/cpu.h>
+#include <sys/bus.h>
#include <sys/audioio.h>
diff --git a/sys/dev/isa/addcom_isa.c b/sys/dev/isa/addcom_isa.c
index 47e553a297c..bbf44e96c56 100644
--- a/sys/dev/isa/addcom_isa.c
+++ b/sys/dev/isa/addcom_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: addcom_isa.c,v 1.15 2006/11/16 01:33:00 christos Exp $ */
+/* $NetBSD: addcom_isa.c,v 1.16 2007/10/19 12:00:14 ad Exp $ */
/*
* Copyright (c) 2000 Michael Graff. All rights reserved.
@@ -55,15 +55,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: addcom_isa.c,v 1.15 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: addcom_isa.c,v 1.16 2007/10/19 12:00:14 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/termios.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/ic/comreg.h>
#include <dev/ic/comvar.h>
diff --git a/sys/dev/isa/adv_isa.c b/sys/dev/isa/adv_isa.c
index 6923dfb1944..61d094de14c 100644
--- a/sys/dev/isa/adv_isa.c
+++ b/sys/dev/isa/adv_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: adv_isa.c,v 1.13 2006/11/16 01:33:00 christos Exp $ */
+/* $NetBSD: adv_isa.c,v 1.14 2007/10/19 12:00:14 ad Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adv_isa.c,v 1.13 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adv_isa.c,v 1.14 2007/10/19 12:00:14 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -71,7 +71,7 @@ __KERNEL_RCSID(0, "$NetBSD: adv_isa.c,v 1.13 2006/11/16 01:33:00 christos Exp $"
#include <sys/user.h>
#include <sys/queue.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/scsipi/scsi_all.h>
#include <dev/scsipi/scsipi_all.h>
diff --git a/sys/dev/isa/aha_isa.c b/sys/dev/isa/aha_isa.c
index 699b0175418..0d431fbb94b 100644
--- a/sys/dev/isa/aha_isa.c
+++ b/sys/dev/isa/aha_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aha_isa.c,v 1.22 2006/11/16 01:33:00 christos Exp $ */
+/* $NetBSD: aha_isa.c,v 1.23 2007/10/19 12:00:14 ad Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,14 +37,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aha_isa.c,v 1.22 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aha_isa.c,v 1.23 2007/10/19 12:00:14 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/scsipi/scsi_all.h>
#include <dev/scsipi/scsipi_all.h>
diff --git a/sys/dev/isa/aic_isa.c b/sys/dev/isa/aic_isa.c
index b064993ef3c..efa3d872847 100644
--- a/sys/dev/isa/aic_isa.c
+++ b/sys/dev/isa/aic_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aic_isa.c,v 1.19 2006/11/16 01:33:00 christos Exp $ */
+/* $NetBSD: aic_isa.c,v 1.20 2007/10/19 12:00:14 ad Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Charles M. Hannum. All rights reserved.
@@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aic_isa.c,v 1.19 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic_isa.c,v 1.20 2007/10/19 12:00:14 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -64,8 +64,8 @@ __KERNEL_RCSID(0, "$NetBSD: aic_isa.c,v 1.19 2006/11/16 01:33:00 christos Exp $"
#include <sys/user.h>
#include <sys/queue.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/scsipi/scsi_all.h>
#include <dev/scsipi/scsipi_all.h>
diff --git a/sys/dev/isa/aps.c b/sys/dev/isa/aps.c
index 812958616f4..791a89af126 100644
--- a/sys/dev/isa/aps.c
+++ b/sys/dev/isa/aps.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aps.c,v 1.1 2007/09/11 21:46:52 xtraeme Exp $ */
+/* $NetBSD: aps.c,v 1.2 2007/10/19 12:00:14 ad Exp $ */
/* $OpenBSD: aps.c,v 1.15 2007/05/19 19:14:11 tedu Exp $ */
/*
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aps.c,v 1.1 2007/09/11 21:46:52 xtraeme Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aps.c,v 1.2 2007/10/19 12:00:14 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -31,7 +31,7 @@ __KERNEL_RCSID(0, "$NetBSD: aps.c,v 1.1 2007/09/11 21:46:52 xtraeme Exp $");
#include <sys/kernel.h>
#include <sys/callout.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/sysmon/sysmonvar.h>
diff --git a/sys/dev/isa/aria.c b/sys/dev/isa/aria.c
index d7e51787b67..fee6c33a074 100644
--- a/sys/dev/isa/aria.c
+++ b/sys/dev/isa/aria.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aria.c,v 1.27 2006/11/16 01:33:00 christos Exp $ */
+/* $NetBSD: aria.c,v 1.28 2007/10/19 12:00:14 ad Exp $ */
/*-
* Copyright (c) 1995, 1996, 1998 Roland C. Dowdeswell. All rights reserved.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aria.c,v 1.27 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aria.c,v 1.28 2007/10/19 12:00:14 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -62,8 +62,8 @@ __KERNEL_RCSID(0, "$NetBSD: aria.c,v 1.27 2006/11/16 01:33:00 christos Exp $");
#include <sys/buf.h>
#include <sys/fcntl.h>
-#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/cpu.h>
+#include <sys/bus.h>
#include <sys/audioio.h>
#include <dev/audio_if.h>
diff --git a/sys/dev/isa/ast.c b/sys/dev/isa/ast.c
index 8a8ac16be4d..ce7c430ebbe 100644
--- a/sys/dev/isa/ast.c
+++ b/sys/dev/isa/ast.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ast.c,v 1.58 2006/11/16 01:33:00 christos Exp $ */
+/* $NetBSD: ast.c,v 1.59 2007/10/19 12:00:14 ad Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -34,15 +34,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ast.c,v 1.58 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ast.c,v 1.59 2007/10/19 12:00:14 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/termios.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/ic/comreg.h>
#include <dev/ic/comvar.h>
diff --git a/sys/dev/isa/atppc_isa.c b/sys/dev/isa/atppc_isa.c
index 026ac54953c..0feff5c2fc9 100644
--- a/sys/dev/isa/atppc_isa.c
+++ b/sys/dev/isa/atppc_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: atppc_isa.c,v 1.10 2007/03/04 06:02:10 christos Exp $ */
+/* $NetBSD: atppc_isa.c,v 1.11 2007/10/19 12:00:14 ad Exp $ */
/*-
* Copyright (c) 2001 Alcove - Nicolas Souchu
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atppc_isa.c,v 1.10 2007/03/04 06:02:10 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atppc_isa.c,v 1.11 2007/10/19 12:00:14 ad Exp $");
#include "opt_atppc.h"
@@ -40,8 +40,8 @@ __KERNEL_RCSID(0, "$NetBSD: atppc_isa.c,v 1.10 2007/03/04 06:02:10 christos Exp
#include <sys/malloc.h>
#include <sys/device.h>
-#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
diff --git a/sys/dev/isa/atppc_isadma.c b/sys/dev/isa/atppc_isadma.c
index 3c76d492fdb..64d44af9fe1 100644
--- a/sys/dev/isa/atppc_isadma.c
+++ b/sys/dev/isa/atppc_isadma.c
@@ -1,4 +1,4 @@
-/* $NetBSD: atppc_isadma.c,v 1.4 2007/03/04 06:02:10 christos Exp $ */
+/* $NetBSD: atppc_isadma.c,v 1.5 2007/10/19 12:00:15 ad Exp $ */
/*-
* Copyright (c) 2001 Alcove - Nicolas Souchu
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atppc_isadma.c,v 1.4 2007/03/04 06:02:10 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atppc_isadma.c,v 1.5 2007/10/19 12:00:15 ad Exp $");
#include "opt_atppc.h"
@@ -40,8 +40,8 @@ __KERNEL_RCSID(0, "$NetBSD: atppc_isadma.c,v 1.4 2007/03/04 06:02:10 christos Ex
#include <sys/malloc.h>
#include <sys/device.h>
-#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
#include <dev/ic/atppcreg.h>
#include <dev/ic/atppcvar.h>
diff --git a/sys/dev/isa/attimer_isa.c b/sys/dev/isa/attimer_isa.c
index 3c150c1b2cd..e88532c3fbf 100644
--- a/sys/dev/isa/attimer_isa.c
+++ b/sys/dev/isa/attimer_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: attimer_isa.c,v 1.6 2007/09/10 10:35:53 cube Exp $ */
+/* $NetBSD: attimer_isa.c,v 1.7 2007/10/19 12:00:15 ad Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: attimer_isa.c,v 1.6 2007/09/10 10:35:53 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: attimer_isa.c,v 1.7 2007/10/19 12:00:15 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -70,7 +70,7 @@ __KERNEL_RCSID(0, "$NetBSD: attimer_isa.c,v 1.6 2007/09/10 10:35:53 cube Exp $")
#include <sys/device.h>
#include <sys/proc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/attimervar.h>
diff --git a/sys/dev/isa/aztech.c b/sys/dev/isa/aztech.c
index dfcb529eb49..94e3b5b5036 100644
--- a/sys/dev/isa/aztech.c
+++ b/sys/dev/isa/aztech.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aztech.c,v 1.12 2006/11/16 01:33:00 christos Exp $ */
+/* $NetBSD: aztech.c,v 1.13 2007/10/19 12:00:15 ad Exp $ */
/* $OpenBSD: aztech.c,v 1.2 2001/12/05 10:27:06 mickey Exp $ */
/* $RuOBSD: aztech.c,v 1.11 2001/10/20 13:23:47 pva Exp $ */
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aztech.c,v 1.12 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aztech.c,v 1.13 2007/10/19 12:00:15 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: aztech.c,v 1.12 2006/11/16 01:33:00 christos Exp $")
#include <sys/device.h>
#include <sys/radioio.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
#include <dev/ic/lm700x.h>
diff --git a/sys/dev/isa/bha_isa.c b/sys/dev/isa/bha_isa.c
index 8071f1113de..3b028925345 100644
--- a/sys/dev/isa/bha_isa.c
+++ b/sys/dev/isa/bha_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bha_isa.c,v 1.29 2006/11/16 01:33:00 christos Exp $ */
+/* $NetBSD: bha_isa.c,v 1.30 2007/10/19 12:00:15 ad Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,14 +37,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bha_isa.c,v 1.29 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bha_isa.c,v 1.30 2007/10/19 12:00:15 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/scsipi/scsipi_all.h>
#include <dev/scsipi/scsiconf.h>
diff --git a/sys/dev/isa/boca.c b/sys/dev/isa/boca.c
index cbb60c00317..49e298772d2 100644
--- a/sys/dev/isa/boca.c
+++ b/sys/dev/isa/boca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: boca.c,v 1.48 2007/07/09 21:00:49 ad Exp $ */
+/* $NetBSD: boca.c,v 1.49 2007/10/19 12:00:15 ad Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: boca.c,v 1.48 2007/07/09 21:00:49 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: boca.c,v 1.49 2007/10/19 12:00:15 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -43,8 +43,8 @@ __KERNEL_RCSID(0, "$NetBSD: boca.c,v 1.48 2007/07/09 21:00:49 ad Exp $");
#include <sys/kernel.h>
#include <sys/callout.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/ic/comreg.h>
#include <dev/ic/comvar.h>
diff --git a/sys/dev/isa/cec.c b/sys/dev/isa/cec.c
index 419da2aec7d..24e86814bb3 100644
--- a/sys/dev/isa/cec.c
+++ b/sys/dev/isa/cec.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cec.c,v 1.6 2007/07/09 21:00:49 ad Exp $ */
+/* $NetBSD: cec.c,v 1.7 2007/10/19 12:00:15 ad Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cec.c,v 1.6 2007/07/09 21:00:49 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cec.c,v 1.7 2007/10/19 12:00:15 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: cec.c,v 1.6 2007/07/09 21:00:49 ad Exp $");
#include <sys/device.h>
#include <sys/kernel.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
#include <dev/isa/isadmavar.h>
diff --git a/sys/dev/isa/cms.c b/sys/dev/isa/cms.c
index ec358b75a67..708697217dd 100644
--- a/sys/dev/isa/cms.c
+++ b/sys/dev/isa/cms.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cms.c,v 1.14 2006/11/16 01:33:00 christos Exp $ */
+/* $NetBSD: cms.c,v 1.15 2007/10/19 12:00:15 ad Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cms.c,v 1.14 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cms.c,v 1.15 2007/10/19 12:00:15 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: cms.c,v 1.14 2006/11/16 01:33:00 christos Exp $");
#include <sys/device.h>
#include <sys/select.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/audioio.h>
#include <dev/audio_if.h>
diff --git a/sys/dev/isa/com_isa.c b/sys/dev/isa/com_isa.c
index e536e7b1908..c3f0c4328b7 100644
--- a/sys/dev/isa/com_isa.c
+++ b/sys/dev/isa/com_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: com_isa.c,v 1.28 2007/01/10 20:59:10 cube Exp $ */
+/* $NetBSD: com_isa.c,v 1.29 2007/10/19 12:00:15 ad Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_isa.c,v 1.28 2007/01/10 20:59:10 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_isa.c,v 1.29 2007/10/19 12:00:15 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -83,8 +83,8 @@ __KERNEL_RCSID(0, "$NetBSD: com_isa.c,v 1.28 2007/01/10 20:59:10 cube Exp $");
#include <sys/syslog.h>
#include <sys/device.h>
-#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
#include <dev/ic/comreg.h>
#include <dev/ic/comvar.h>
diff --git a/sys/dev/isa/com_multi.c b/sys/dev/isa/com_multi.c
index dbd336a00f1..20db950d498 100644
--- a/sys/dev/isa/com_multi.c
+++ b/sys/dev/isa/com_multi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: com_multi.c,v 1.24 2006/11/16 01:33:00 christos Exp $ */
+/* $NetBSD: com_multi.c,v 1.25 2007/10/19 12:00:15 ad Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_multi.c,v 1.24 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_multi.c,v 1.25 2007/10/19 12:00:15 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -88,8 +88,8 @@ __KERNEL_RCSID(0, "$NetBSD: com_multi.c,v 1.24 2006/11/16 01:33:00 christos Exp
#include <sys/syslog.h>
#include <sys/device.h>
-#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
#include <dev/ic/comreg.h>
#include <dev/ic/comvar.h>
diff --git a/sys/dev/isa/commultiprint.c b/sys/dev/isa/commultiprint.c
index f8ba7699c25..17bcff76602 100644
--- a/sys/dev/isa/commultiprint.c
+++ b/sys/dev/isa/commultiprint.c
@@ -1,9 +1,9 @@
-/* $NetBSD: commultiprint.c,v 1.2 2005/12/11 12:22:02 christos Exp $ */
+/* $NetBSD: commultiprint.c,v 1.3 2007/10/19 12:00:15 ad Exp $ */
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/com_multi.h>
int
diff --git a/sys/dev/isa/cs89x0isa.c b/sys/dev/isa/cs89x0isa.c
index eb0ec57832b..73aa53116b6 100644
--- a/sys/dev/isa/cs89x0isa.c
+++ b/sys/dev/isa/cs89x0isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cs89x0isa.c,v 1.12 2007/03/04 06:02:10 christos Exp $ */
+/* $NetBSD: cs89x0isa.c,v 1.13 2007/10/19 12:00:15 ad Exp $ */
/*
* Copyright 1997
@@ -36,7 +36,7 @@
/* isa DMA routines for cs89x0 */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cs89x0isa.c,v 1.12 2007/03/04 06:02:10 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cs89x0isa.c,v 1.13 2007/10/19 12:00:15 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -53,7 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: cs89x0isa.c,v 1.12 2007/03/04 06:02:10 christos Exp
#include <net/if_ether.h>
#include <net/if_media.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
diff --git a/sys/dev/isa/cy_isa.c b/sys/dev/isa/cy_isa.c
index 5a5e0c304b6..22e4ad2b21e 100644
--- a/sys/dev/isa/cy_isa.c
+++ b/sys/dev/isa/cy_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cy_isa.c,v 1.21 2006/11/16 01:33:00 christos Exp $ */
+/* $NetBSD: cy_isa.c,v 1.22 2007/10/19 12:00:15 ad Exp $ */
/*
* cy.c
@@ -10,14 +10,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cy_isa.c,v 1.21 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cy_isa.c,v 1.22 2007/10/19 12:00:15 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/isa/isavar.h>
#include <dev/isa/isareg.h>
diff --git a/sys/dev/isa/daic_isa.c b/sys/dev/isa/daic_isa.c
index 880720f487f..0be1f2cb2dd 100644
--- a/sys/dev/isa/daic_isa.c
+++ b/sys/dev/isa/daic_isa.c
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: daic_isa.c,v 1.13 2005/12/11 12:22:02 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: daic_isa.c,v 1.14 2007/10/19 12:00:15 ad Exp $");
#include <sys/param.h>
#include <sys/errno.h>
@@ -46,9 +46,9 @@ __KERNEL_RCSID(0, "$NetBSD: daic_isa.c,v 1.13 2005/12/11 12:22:02 christos Exp $
#include <sys/callout.h>
#endif
-#include <machine/cpu.h>
-#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/cpu.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
#include <sys/socket.h>
#include <net/if.h>
diff --git a/sys/dev/isa/depca_isa.c b/sys/dev/isa/depca_isa.c
index 938ddb9fc77..91a0b52754e 100644
--- a/sys/dev/isa/depca_isa.c
+++ b/sys/dev/isa/depca_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: depca_isa.c,v 1.11 2006/11/16 01:33:00 christos Exp $ */
+/* $NetBSD: depca_isa.c,v 1.12 2007/10/19 12:00:15 ad Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: depca_isa.c,v 1.11 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: depca_isa.c,v 1.12 2007/10/19 12:00:15 ad Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -93,9 +93,9 @@ __KERNEL_RCSID(0, "$NetBSD: depca_isa.c,v 1.11 2006/11/16 01:33:00 christos Exp
#include <netinet/if_inarp.h>
#endif
-#include <machine/cpu.h>
-#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/cpu.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
diff --git a/sys/dev/isa/dpt_isa.c b/sys/dev/isa/dpt_isa.c
index 360c5a31fd2..f8e7828b075 100644
--- a/sys/dev/isa/dpt_isa.c
+++ b/sys/dev/isa/dpt_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dpt_isa.c,v 1.17 2006/11/16 01:33:00 christos Exp $ */
+/* $NetBSD: dpt_isa.c,v 1.18 2007/10/19 12:00:15 ad Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Andrew Doran <ad@NetBSD.org>
@@ -32,15 +32,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dpt_isa.c,v 1.17 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dpt_isa.c,v 1.18 2007/10/19 12:00:15 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/queue.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/scsipi/scsipi_all.h>
#include <dev/scsipi/scsiconf.h>
diff --git a/sys/dev/isa/ega.c b/sys/dev/isa/ega.c
index 5f96b267448..420dacd2432 100644
--- a/sys/dev/isa/ega.c
+++ b/sys/dev/isa/ega.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ega.c,v 1.23 2007/07/28 20:28:57 mjf Exp $ */
+/* $NetBSD: ega.c,v 1.24 2007/10/19 12:00:16 ad Exp $ */
/*
* Copyright (c) 1999
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ega.c,v 1.23 2007/07/28 20:28:57 mjf Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ega.c,v 1.24 2007/10/19 12:00:16 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -35,7 +35,7 @@ __KERNEL_RCSID(0, "$NetBSD: ega.c,v 1.23 2007/07/28 20:28:57 mjf Exp $");
#include <sys/kernel.h>
#include <sys/device.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
diff --git a/sys/dev/isa/elink.c b/sys/dev/isa/elink.c
index 37bd21db6d1..8e5df75e940 100644
--- a/sys/dev/isa/elink.c
+++ b/sys/dev/isa/elink.c
@@ -1,4 +1,4 @@
-/* $NetBSD: elink.c,v 1.14 2001/11/13 08:01:12 lukem Exp $ */
+/* $NetBSD: elink.c,v 1.15 2007/10/19 12:00:16 ad Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -41,14 +41,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: elink.c,v 1.14 2001/11/13 08:01:12 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: elink.c,v 1.15 2007/10/19 12:00:16 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
#include <sys/queue.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/elink.h>
diff --git a/sys/dev/isa/esp_isa.c b/sys/dev/isa/esp_isa.c
index 92728f00114..8140b1c0b09 100644
--- a/sys/dev/isa/esp_isa.c
+++ b/sys/dev/isa/esp_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: esp_isa.c,v 1.32 2007/03/04 06:02:10 christos Exp $ */
+/* $NetBSD: esp_isa.c,v 1.33 2007/10/19 12:00:16 ad Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -113,15 +113,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esp_isa.c,v 1.32 2007/03/04 06:02:10 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esp_isa.c,v 1.33 2007/10/19 12:00:16 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/buf.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/scsipi/scsipi_all.h>
#include <dev/scsipi/scsi_all.h>
diff --git a/sys/dev/isa/ess.c b/sys/dev/isa/ess.c
index 2d1d445efc7..9c8d42c4fe7 100644
--- a/sys/dev/isa/ess.c
+++ b/sys/dev/isa/ess.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ess.c,v 1.74 2007/07/09 21:00:49 ad Exp $ */
+/* $NetBSD: ess.c,v 1.75 2007/10/19 12:00:16 ad Exp $ */
/*
* Copyright 1997
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ess.c,v 1.74 2007/07/09 21:00:49 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ess.c,v 1.75 2007/10/19 12:00:16 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -77,9 +77,9 @@ __KERNEL_RCSID(0, "$NetBSD: ess.c,v 1.74 2007/07/09 21:00:49 ad Exp $");
#include <sys/proc.h>
#include <sys/kernel.h>
-#include <machine/cpu.h>
-#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/cpu.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
#include <sys/audioio.h>
#include <dev/audio_if.h>
diff --git a/sys/dev/isa/ess_isa.c b/sys/dev/isa/ess_isa.c
index c2f5fd38a1e..1fc6c42e4f6 100644
--- a/sys/dev/isa/ess_isa.c
+++ b/sys/dev/isa/ess_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ess_isa.c,v 1.18 2006/11/16 01:33:00 christos Exp $ */
+/* $NetBSD: ess_isa.c,v 1.19 2007/10/19 12:00:16 ad Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -37,14 +37,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ess_isa.c,v 1.18 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ess_isa.c,v 1.19 2007/10/19 12:00:16 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/cpu.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
diff --git a/sys/dev/isa/fd.c b/sys/dev/isa/fd.c
index 7d15d58cc04..35a00734a58 100644
--- a/sys/dev/isa/fd.c
+++ b/sys/dev/isa/fd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.76 2007/10/08 16:41:11 ad Exp $ */
+/* $NetBSD: fd.c,v 1.77 2007/10/19 12:00:16 ad Exp $ */
/*-
* Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
@@ -88,7 +88,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.76 2007/10/08 16:41:11 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.77 2007/10/19 12:00:16 ad Exp $");
#include "rnd.h"
#include "opt_ddb.h"
@@ -131,8 +131,8 @@ __KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.76 2007/10/08 16:41:11 ad Exp $");
#include <dev/cons.h>
-#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/cpu.h>
+#include <sys/bus.h>
#include "locators.h"
@@ -146,7 +146,7 @@ __KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.76 2007/10/08 16:41:11 ad Exp $");
#define fd_cd fdisa_cd
#endif /* atari */
-#include <machine/intr.h>
+#include <sys/intr.h>
#include <dev/isa/isavar.h>
#include <dev/isa/isadmavar.h>
diff --git a/sys/dev/isa/fdc_isa.c b/sys/dev/isa/fdc_isa.c
index e5174e21302..25d9bf24f1e 100644
--- a/sys/dev/isa/fdc_isa.c
+++ b/sys/dev/isa/fdc_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fdc_isa.c,v 1.14 2006/11/16 01:33:00 christos Exp $ */
+/* $NetBSD: fdc_isa.c,v 1.15 2007/10/19 12:00:16 ad Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdc_isa.c,v 1.14 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdc_isa.c,v 1.15 2007/10/19 12:00:16 ad Exp $");
#include "rnd.h"
@@ -85,8 +85,8 @@ __KERNEL_RCSID(0, "$NetBSD: fdc_isa.c,v 1.14 2006/11/16 01:33:00 christos Exp $"
#include <sys/rnd.h>
#endif
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/isa/isavar.h>
#include <dev/isa/isadmavar.h>
diff --git a/sys/dev/isa/gus.c b/sys/dev/isa/gus.c
index 19b6901436c..fbd3b8a0ef5 100644
--- a/sys/dev/isa/gus.c
+++ b/sys/dev/isa/gus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: gus.c,v 1.99 2007/09/25 23:11:24 ad Exp $ */
+/* $NetBSD: gus.c,v 1.100 2007/10/19 12:00:16 ad Exp $ */
/*-
* Copyright (c) 1996, 1999 The NetBSD Foundation, Inc.
@@ -95,7 +95,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gus.c,v 1.99 2007/09/25 23:11:24 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gus.c,v 1.100 2007/10/19 12:00:16 ad Exp $");
#include "gus.h"
#if NGUS > 0
@@ -113,9 +113,9 @@ __KERNEL_RCSID(0, "$NetBSD: gus.c,v 1.99 2007/09/25 23:11:24 ad Exp $");
#include <sys/malloc.h>
#include <sys/kernel.h>
-#include <machine/cpu.h>
-#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/cpu.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
#include <sys/audioio.h>
#include <dev/audio_if.h>
diff --git a/sys/dev/isa/i82365_isa.c b/sys/dev/isa/i82365_isa.c
index 836afdb1ae0..70e33d8a861 100644
--- a/sys/dev/isa/i82365_isa.c
+++ b/sys/dev/isa/i82365_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: i82365_isa.c,v 1.27 2006/11/16 01:33:00 christos Exp $ */
+/* $NetBSD: i82365_isa.c,v 1.28 2007/10/19 12:00:16 ad Exp $ */
/*
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i82365_isa.c,v 1.27 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i82365_isa.c,v 1.28 2007/10/19 12:00:16 ad Exp $");
#define PCICISADEBUG
@@ -40,8 +40,8 @@ __KERNEL_RCSID(0, "$NetBSD: i82365_isa.c,v 1.27 2006/11/16 01:33:00 christos Exp
#include <sys/extent.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
diff --git a/sys/dev/isa/i82365_isasubr.c b/sys/dev/isa/i82365_isasubr.c
index 47a2c59ad35..344d34017f8 100644
--- a/sys/dev/isa/i82365_isasubr.c
+++ b/sys/dev/isa/i82365_isasubr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: i82365_isasubr.c,v 1.38 2006/03/29 04:16:49 thorpej Exp $ */
+/* $NetBSD: i82365_isasubr.c,v 1.39 2007/10/19 12:00:17 ad Exp $ */
/*
* Copyright (c) 2000 Christian E. Hopps. All rights reserved.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i82365_isasubr.c,v 1.38 2006/03/29 04:16:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i82365_isasubr.c,v 1.39 2007/10/19 12:00:17 ad Exp $");
#define PCICISADEBUG
@@ -42,8 +42,8 @@ __KERNEL_RCSID(0, "$NetBSD: i82365_isasubr.c,v 1.38 2006/03/29 04:16:49 thorpej
#include <sys/extent.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
diff --git a/sys/dev/isa/ics2101.c b/sys/dev/isa/ics2101.c
index efd42983563..89aa399c36e 100644
--- a/sys/dev/isa/ics2101.c
+++ b/sys/dev/isa/ics2101.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ics2101.c,v 1.13 2006/08/30 15:27:18 christos Exp $ */
+/* $NetBSD: ics2101.c,v 1.14 2007/10/19 12:00:17 ad Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ics2101.c,v 1.13 2006/08/30 15:27:18 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ics2101.c,v 1.14 2007/10/19 12:00:17 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: ics2101.c,v 1.13 2006/08/30 15:27:18 christos Exp $"
#include <sys/proc.h>
#include <sys/buf.h>
-#include <machine/cpu.h>
+#include <sys/cpu.h>
#include <sys/audioio.h>
#include <dev/audio_if.h>
diff --git a/sys/dev/isa/if_ai.c b/sys/dev/isa/if_ai.c
index 010e0569cbe..4db8a69790f 100644
--- a/sys/dev/isa/if_ai.c
+++ b/sys/dev/isa/if_ai.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ai.c,v 1.25 2006/11/16 01:33:00 christos Exp $ */
+/* $NetBSD: if_ai.c,v 1.26 2007/10/19 12:00:17 ad Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ai.c,v 1.25 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ai.c,v 1.26 2007/10/19 12:00:17 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -53,9 +53,9 @@ __KERNEL_RCSID(0, "$NetBSD: if_ai.c,v 1.25 2006/11/16 01:33:00 christos Exp $");
#include <net/if_media.h>
#include <net/if_ether.h>
-#include <machine/cpu.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/cpu.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
diff --git a/sys/dev/isa/if_ate.c b/sys/dev/isa/if_ate.c
index 2214e6ea525..85fc576a084 100644
--- a/sys/dev/isa/if_ate.c
+++ b/sys/dev/isa/if_ate.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ate.c,v 1.47 2006/11/16 01:33:00 christos Exp $ */
+/* $NetBSD: if_ate.c,v 1.48 2007/10/19 12:00:17 ad Exp $ */
/*
* All Rights Reserved, Copyright (C) Fujitsu Limited 1995
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ate.c,v 1.47 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ate.c,v 1.48 2007/10/19 12:00:17 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -44,8 +44,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_ate.c,v 1.47 2006/11/16 01:33:00 christos Exp $")
#include <net/if_ether.h>
#include <net/if_media.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/ic/mb86960reg.h>
#include <dev/ic/mb86960var.h>
diff --git a/sys/dev/isa/if_cs_isa.c b/sys/dev/isa/if_cs_isa.c
index fdce5f2a3c5..10d077933a6 100644
--- a/sys/dev/isa/if_cs_isa.c
+++ b/sys/dev/isa/if_cs_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cs_isa.c,v 1.18 2006/11/16 01:33:00 christos Exp $ */
+/* $NetBSD: if_cs_isa.c,v 1.19 2007/10/19 12:00:17 ad Exp $ */
/*
* Copyright 1997
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cs_isa.c,v 1.18 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cs_isa.c,v 1.19 2007/10/19 12:00:17 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -50,8 +50,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_cs_isa.c,v 1.18 2006/11/16 01:33:00 christos Exp
#include <net/if_ether.h>
#include <net/if_media.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
diff --git a/sys/dev/isa/if_ec.c b/sys/dev/isa/if_ec.c
index f8d868b7167..fbda79f2fc2 100644
--- a/sys/dev/isa/if_ec.c
+++ b/sys/dev/isa/if_ec.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ec.c,v 1.30 2007/03/04 06:02:12 christos Exp $ */
+/* $NetBSD: if_ec.c,v 1.31 2007/10/19 12:00:17 ad Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ec.c,v 1.30 2007/03/04 06:02:12 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ec.c,v 1.31 2007/10/19 12:00:17 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -71,8 +71,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_ec.c,v 1.30 2007/03/04 06:02:12 christos Exp $");
#include <net/if_ether.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
diff --git a/sys/dev/isa/if_ef.c b/sys/dev/isa/if_ef.c
index bf2f77056f8..435b9b9270a 100644
--- a/sys/dev/isa/if_ef.c
+++ b/sys/dev/isa/if_ef.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ef.c,v 1.23 2006/11/16 01:33:00 christos Exp $ */
+/* $NetBSD: if_ef.c,v 1.24 2007/10/19 12:00:17 ad Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ef.c,v 1.23 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ef.c,v 1.24 2007/10/19 12:00:17 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -53,9 +53,9 @@ __KERNEL_RCSID(0, "$NetBSD: if_ef.c,v 1.23 2006/11/16 01:33:00 christos Exp $");
#include <net/if_media.h>
#include <net/if_ether.h>
-#include <machine/cpu.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/cpu.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
diff --git a/sys/dev/isa/if_eg.c b/sys/dev/isa/if_eg.c
index 99b0149fa4e..e6ef1d5867e 100644
--- a/sys/dev/isa/if_eg.c
+++ b/sys/dev/isa/if_eg.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_eg.c,v 1.72 2007/03/04 06:02:12 christos Exp $ */
+/* $NetBSD: if_eg.c,v 1.73 2007/10/19 12:00:17 ad Exp $ */
/*
* Copyright (c) 1993 Dean Huxley <dean@fsa.ca>
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_eg.c,v 1.72 2007/03/04 06:02:12 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_eg.c,v 1.73 2007/10/19 12:00:17 ad Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -79,9 +79,9 @@ __KERNEL_RCSID(0, "$NetBSD: if_eg.c,v 1.72 2007/03/04 06:02:12 christos Exp $");
#include <net/bpfdesc.h>
#endif
-#include <machine/cpu.h>
-#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/cpu.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
#include <dev/isa/if_egreg.h>
diff --git a/sys/dev/isa/if_el.c b/sys/dev/isa/if_el.c
index 9e18d0e0b9c..0885a3bbf52 100644
--- a/sys/dev/isa/if_el.c
+++ b/sys/dev/isa/if_el.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_el.c,v 1.78 2007/08/26 22:45:57 dyoung Exp $ */
+/* $NetBSD: if_el.c,v 1.79 2007/10/19 12:00:17 ad Exp $ */
/*
* Copyright (c) 1994, Matthew E. Kimmel. Permission is hereby granted
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_el.c,v 1.78 2007/08/26 22:45:57 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_el.c,v 1.79 2007/10/19 12:00:17 ad Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -57,9 +57,9 @@ __KERNEL_RCSID(0, "$NetBSD: if_el.c,v 1.78 2007/08/26 22:45:57 dyoung Exp $");
#include <net/bpfdesc.h>
#endif
-#include <machine/cpu.h>
-#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/cpu.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
#include <dev/isa/if_elreg.h>
diff --git a/sys/dev/isa/if_ep_isa.c b/sys/dev/isa/if_ep_isa.c
index 1b44a4e5ba0..e21fc8cc935 100644
--- a/sys/dev/isa/if_ep_isa.c
+++ b/sys/dev/isa/if_ep_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ep_isa.c,v 1.40 2006/11/16 01:33:00 christos Exp $ */
+/* $NetBSD: if_ep_isa.c,v 1.41 2007/10/19 12:00:17 ad Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ep_isa.c,v 1.40 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ep_isa.c,v 1.41 2007/10/19 12:00:17 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -87,9 +87,9 @@ __KERNEL_RCSID(0, "$NetBSD: if_ep_isa.c,v 1.40 2006/11/16 01:33:00 christos Exp
#include <net/if_ether.h>
#include <net/if_media.h>
-#include <machine/cpu.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/cpu.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/mii/miivar.h>
diff --git a/sys/dev/isa/if_fmv_isa.c b/sys/dev/isa/if_fmv_isa.c
index af19e9e6bf5..00ca7f56ed1 100644
--- a/sys/dev/isa/if_fmv_isa.c
+++ b/sys/dev/isa/if_fmv_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fmv_isa.c,v 1.9 2006/11/16 01:33:00 christos Exp $ */
+/* $NetBSD: if_fmv_isa.c,v 1.10 2007/10/19 12:00:17 ad Exp $ */
/*
* All Rights Reserved, Copyright (C) Fujitsu Limited 1995
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_fmv_isa.c,v 1.9 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fmv_isa.c,v 1.10 2007/10/19 12:00:17 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -42,8 +42,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_fmv_isa.c,v 1.9 2006/11/16 01:33:00 christos Exp
#include <net/if_ether.h>
#include <net/if_media.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/ic/mb86960reg.h>
#include <dev/ic/mb86960var.h>
diff --git a/sys/dev/isa/if_hp.c b/sys/dev/isa/if_hp.c
index 530d86c1f0b..1fc221484ad 100644
--- a/sys/dev/isa/if_hp.c
+++ b/sys/dev/isa/if_hp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_hp.c,v 1.41 2007/03/04 06:02:12 christos Exp $ */
+/* $NetBSD: if_hp.c,v 1.42 2007/10/19 12:00:17 ad Exp $ */
/* XXX THIS DRIVER IS BROKEN. IT WILL NOT EVEN COMPILE. */
@@ -80,7 +80,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_hp.c,v 1.41 2007/03/04 06:02:12 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_hp.c,v 1.42 2007/10/19 12:00:17 ad Exp $");
#include "hp.h"
#if NHP > 0
@@ -120,7 +120,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_hp.c,v 1.41 2007/03/04 06:02:12 christos Exp $");
#include <net/bpfdesc.h>
#endif
-#include <machine/cpu.h>
+#include <sys/cpu.h>
#include <machine/pio.h>
#include <i386/isa/isa_device.h> /* XXX BROKEN */
diff --git a/sys/dev/isa/if_ix.c b/sys/dev/isa/if_ix.c
index a9398e31383..726c473a1d9 100644
--- a/sys/dev/isa/if_ix.c
+++ b/sys/dev/isa/if_ix.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ix.c,v 1.26 2006/11/16 01:33:00 christos Exp $ */
+/* $NetBSD: if_ix.c,v 1.27 2007/10/19 12:00:18 ad Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ix.c,v 1.26 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ix.c,v 1.27 2007/10/19 12:00:18 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -53,9 +53,9 @@ __KERNEL_RCSID(0, "$NetBSD: if_ix.c,v 1.26 2006/11/16 01:33:00 christos Exp $");
#include <net/if_media.h>
#include <net/if_ether.h>
-#include <machine/cpu.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/cpu.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
diff --git a/sys/dev/isa/if_iy.c b/sys/dev/isa/if_iy.c
index 10822e200e5..0820457dcc5 100644
--- a/sys/dev/isa/if_iy.c
+++ b/sys/dev/isa/if_iy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_iy.c,v 1.77 2007/09/01 07:32:28 dyoung Exp $ */
+/* $NetBSD: if_iy.c,v 1.78 2007/10/19 12:00:18 ad Exp $ */
/* #define IYDEBUG */
/* #define IYMEMDEBUG */
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_iy.c,v 1.77 2007/09/01 07:32:28 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iy.c,v 1.78 2007/10/19 12:00:18 ad Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -91,9 +91,9 @@ __KERNEL_RCSID(0, "$NetBSD: if_iy.c,v 1.77 2007/09/01 07:32:28 dyoung Exp $");
#include <net/if_media.h>
#endif
-#include <machine/cpu.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/cpu.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
diff --git a/sys/dev/isa/if_lc_isa.c b/sys/dev/isa/if_lc_isa.c
index 171f1769699..2d7a1e0f206 100644
--- a/sys/dev/isa/if_lc_isa.c
+++ b/sys/dev/isa/if_lc_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_lc_isa.c,v 1.27 2006/11/16 01:33:00 christos Exp $ */
+/* $NetBSD: if_lc_isa.c,v 1.28 2007/10/19 12:00:18 ad Exp $ */
/*-
* Copyright (c) 1994, 1995, 1997 Matt Thomas <matt@3am-software.com>
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_lc_isa.c,v 1.27 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_lc_isa.c,v 1.28 2007/10/19 12:00:18 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -51,9 +51,9 @@ __KERNEL_RCSID(0, "$NetBSD: if_lc_isa.c,v 1.27 2006/11/16 01:33:00 christos Exp
#include <net/if_ether.h>
#include <net/if_media.h>
-#include <machine/cpu.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/cpu.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/ic/lemacreg.h>
#include <dev/ic/lemacvar.h>
diff --git a/sys/dev/isa/if_le_isa.c b/sys/dev/isa/if_le_isa.c
index 065001fa5ef..9c3cd53425e 100644
--- a/sys/dev/isa/if_le_isa.c
+++ b/sys/dev/isa/if_le_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le_isa.c,v 1.44 2007/03/04 06:02:12 christos Exp $ */
+/* $NetBSD: if_le_isa.c,v 1.45 2007/10/19 12:00:18 ad Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le_isa.c,v 1.44 2007/03/04 06:02:12 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le_isa.c,v 1.45 2007/10/19 12:00:18 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -87,9 +87,9 @@ __KERNEL_RCSID(0, "$NetBSD: if_le_isa.c,v 1.44 2007/03/04 06:02:12 christos Exp
#include <net/if_ether.h>
#include <net/if_media.h>
-#include <machine/cpu.h>
-#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/cpu.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
diff --git a/sys/dev/isa/if_ne_isa.c b/sys/dev/isa/if_ne_isa.c
index 971d12f2c45..d1b18fd1ecc 100644
--- a/sys/dev/isa/if_ne_isa.c
+++ b/sys/dev/isa/if_ne_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ne_isa.c,v 1.23 2006/11/16 01:33:00 christos Exp $ */
+/* $NetBSD: if_ne_isa.c,v 1.24 2007/10/19 12:00:18 ad Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ne_isa.c,v 1.23 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ne_isa.c,v 1.24 2007/10/19 12:00:18 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -55,8 +55,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_ne_isa.c,v 1.23 2006/11/16 01:33:00 christos Exp
#include <net/if_ether.h>
#include <net/if_media.h>
-#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
#include <dev/ic/dp8390reg.h>
#include <dev/ic/dp8390var.h>
diff --git a/sys/dev/isa/if_ntwoc_isa.c b/sys/dev/isa/if_ntwoc_isa.c
index f09a36eabe5..5aed41206b2 100644
--- a/sys/dev/isa/if_ntwoc_isa.c
+++ b/sys/dev/isa/if_ntwoc_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ntwoc_isa.c,v 1.15 2006/11/16 01:33:00 christos Exp $ */
+/* $NetBSD: if_ntwoc_isa.c,v 1.16 2007/10/19 12:00:18 ad Exp $ */
/*
* Copyright (c) 1999 Christian E. Hopps
* Copyright (c) 1996 John Hay.
@@ -29,11 +29,11 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: if_ntwoc_isa.c,v 1.15 2006/11/16 01:33:00 christos Exp $
+ * $Id: if_ntwoc_isa.c,v 1.16 2007/10/19 12:00:18 ad Exp $
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ntwoc_isa.c,v 1.15 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ntwoc_isa.c,v 1.16 2007/10/19 12:00:18 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -43,9 +43,9 @@ __KERNEL_RCSID(0, "$NetBSD: if_ntwoc_isa.c,v 1.15 2006/11/16 01:33:00 christos E
#include <net/if.h>
-#include <machine/cpu.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/cpu.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/isa/isavar.h>
diff --git a/sys/dev/isa/if_sm_isa.c b/sys/dev/isa/if_sm_isa.c
index 535e077070b..6b56a9a9d45 100644
--- a/sys/dev/isa/if_sm_isa.c
+++ b/sys/dev/isa/if_sm_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sm_isa.c,v 1.17 2006/11/16 01:33:00 christos Exp $ */
+/* $NetBSD: if_sm_isa.c,v 1.18 2007/10/19 12:00:18 ad Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sm_isa.c,v 1.17 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sm_isa.c,v 1.18 2007/10/19 12:00:18 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -55,8 +55,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_sm_isa.c,v 1.17 2006/11/16 01:33:00 christos Exp
#include <net/if_ether.h>
#include <net/if_media.h>
-#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
diff --git a/sys/dev/isa/if_tr_isa.c b/sys/dev/isa/if_tr_isa.c
index fe33e5c4af8..f39eb0ca7bc 100644
--- a/sys/dev/isa/if_tr_isa.c
+++ b/sys/dev/isa/if_tr_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tr_isa.c,v 1.16 2006/11/16 01:33:00 christos Exp $ */
+/* $NetBSD: if_tr_isa.c,v 1.17 2007/10/19 12:00:18 ad Exp $ */
/* XXXJRT changes isa_attach_args too early!! */
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tr_isa.c,v 1.16 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tr_isa.c,v 1.17 2007/10/19 12:00:18 ad Exp $");
#undef TRISADEBUG
@@ -52,9 +52,9 @@ __KERNEL_RCSID(0, "$NetBSD: if_tr_isa.c,v 1.16 2006/11/16 01:33:00 christos Exp
#include <net/if_ether.h>
#include <net/if_media.h>
-#include <machine/cpu.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/cpu.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/isa/isavar.h>
diff --git a/sys/dev/isa/if_tribm_isa.c b/sys/dev/isa/if_tribm_isa.c
index a6fb5f71a74..9d5cfded4fd 100644
--- a/sys/dev/isa/if_tribm_isa.c
+++ b/sys/dev/isa/if_tribm_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tribm_isa.c,v 1.10 2006/11/16 01:33:00 christos Exp $ */
+/* $NetBSD: if_tribm_isa.c,v 1.11 2007/10/19 12:00:18 ad Exp $ */
/* XXXJRT changes isa_attach_args too early */
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tribm_isa.c,v 1.10 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tribm_isa.c,v 1.11 2007/10/19 12:00:18 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_tribm_isa.c,v 1.10 2006/11/16 01:33:00 christos E
#include <net/if_ether.h>
#include <net/if_media.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
diff --git a/sys/dev/isa/if_trtcm_isa.c b/sys/dev/isa/if_trtcm_isa.c
index 0ed2139dd38..417bea8d04e 100644
--- a/sys/dev/isa/if_trtcm_isa.c
+++ b/sys/dev/isa/if_trtcm_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_trtcm_isa.c,v 1.13 2006/11/16 01:33:00 christos Exp $ */
+/* $NetBSD: if_trtcm_isa.c,v 1.14 2007/10/19 12:00:18 ad Exp $ */
/* XXXJRT verify doens't change isa_attach_args too early */
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_trtcm_isa.c,v 1.13 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_trtcm_isa.c,v 1.14 2007/10/19 12:00:18 ad Exp $");
#undef TRTCMISADEBUG
@@ -53,7 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_trtcm_isa.c,v 1.13 2006/11/16 01:33:00 christos E
#include <net/if_ether.h>
#include <net/if_media.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
#include <dev/isa/elink.h>
diff --git a/sys/dev/isa/if_tscs_isa.c b/sys/dev/isa/if_tscs_isa.c
index 95059a1b628..1f95d11a7e1 100644
--- a/sys/dev/isa/if_tscs_isa.c
+++ b/sys/dev/isa/if_tscs_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tscs_isa.c,v 1.4 2005/12/11 12:22:02 christos Exp $ */
+/* $NetBSD: if_tscs_isa.c,v 1.5 2007/10/19 12:00:18 ad Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tscs_isa.c,v 1.4 2005/12/11 12:22:02 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tscs_isa.c,v 1.5 2007/10/19 12:00:18 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -53,8 +53,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_tscs_isa.c,v 1.4 2005/12/11 12:22:02 christos Exp
#include <net/if_ether.h>
#include <net/if_media.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
diff --git a/sys/dev/isa/if_we_isa.c b/sys/dev/isa/if_we_isa.c
index e39e9297fc0..2bc1846d2e8 100644
--- a/sys/dev/isa/if_we_isa.c
+++ b/sys/dev/isa/if_we_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_we_isa.c,v 1.17 2006/11/16 01:33:00 christos Exp $ */
+/* $NetBSD: if_we_isa.c,v 1.18 2007/10/19 12:00:18 ad Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_we_isa.c,v 1.17 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_we_isa.c,v 1.18 2007/10/19 12:00:18 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -72,9 +72,9 @@ __KERNEL_RCSID(0, "$NetBSD: if_we_isa.c,v 1.17 2006/11/16 01:33:00 christos Exp
#include <net/if_ether.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/bswap.h>
-#include <machine/intr.h>
+#include <sys/intr.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
diff --git a/sys/dev/isa/ioat66.c b/sys/dev/isa/ioat66.c
index a00bdde9ca6..02c95d9f053 100644
--- a/sys/dev/isa/ioat66.c
+++ b/sys/dev/isa/ioat66.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ioat66.c,v 1.15 2006/11/16 01:33:00 christos Exp $ */
+/* $NetBSD: ioat66.c,v 1.16 2007/10/19 12:00:19 ad Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -34,15 +34,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ioat66.c,v 1.15 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ioat66.c,v 1.16 2007/10/19 12:00:19 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/termios.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/ic/comreg.h>
#include <dev/ic/comvar.h>
diff --git a/sys/dev/isa/isa.c b/sys/dev/isa/isa.c
index 879f43ed840..7e309e18251 100644
--- a/sys/dev/isa/isa.c
+++ b/sys/dev/isa/isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isa.c,v 1.128 2007/01/02 02:23:51 isaki Exp $ */
+/* $NetBSD: isa.c,v 1.129 2007/10/19 12:00:19 ad Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa.c,v 1.128 2007/01/02 02:23:51 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa.c,v 1.129 2007/10/19 12:00:19 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: isa.c,v 1.128 2007/01/02 02:23:51 isaki Exp $");
#include <sys/malloc.h>
#include <sys/device.h>
-#include <machine/intr.h>
+#include <sys/intr.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
diff --git a/sys/dev/isa/isadma.c b/sys/dev/isa/isadma.c
index f56af46e684..65b3f2830fa 100644
--- a/sys/dev/isa/isadma.c
+++ b/sys/dev/isa/isadma.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isadma.c,v 1.55 2007/03/04 06:02:12 christos Exp $ */
+/* $NetBSD: isadma.c,v 1.56 2007/10/19 12:00:19 ad Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isadma.c,v 1.55 2007/03/04 06:02:12 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isadma.c,v 1.56 2007/10/19 12:00:19 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: isadma.c,v 1.55 2007/03/04 06:02:12 christos Exp $")
#include <sys/device.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <uvm/uvm_extern.h>
diff --git a/sys/dev/isa/isavar.h b/sys/dev/isa/isavar.h
index b6f8a690efd..c57a6f06b25 100644
--- a/sys/dev/isa/isavar.h
+++ b/sys/dev/isa/isavar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: isavar.h,v 1.48 2005/12/11 12:22:02 christos Exp $ */
+/* $NetBSD: isavar.h,v 1.49 2007/10/19 12:00:19 ad Exp $ */
/*-
* Copyright (c) 1997, 2001 The NetBSD Foundation, Inc.
@@ -80,7 +80,7 @@
*/
#include <sys/queue.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
/*
* Structures and definitions needed by the machine-dependent header.
diff --git a/sys/dev/isa/isic_isa.c b/sys/dev/isa/isic_isa.c
index d3e829063af..933e10ebc00 100644
--- a/sys/dev/isa/isic_isa.c
+++ b/sys/dev/isa/isic_isa.c
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_isa.c,v 1.28 2007/07/09 21:00:49 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_isa.c,v 1.29 2007/10/19 12:00:19 ad Exp $");
#include <sys/param.h>
#include <sys/errno.h>
@@ -50,9 +50,9 @@ __KERNEL_RCSID(0, "$NetBSD: isic_isa.c,v 1.28 2007/07/09 21:00:49 ad Exp $");
#include <sys/callout.h>
#endif
-#include <machine/cpu.h>
-#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/cpu.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
diff --git a/sys/dev/isa/isic_isa_avm_a1.c b/sys/dev/isa/isic_isa_avm_a1.c
index 1035db653c2..401e91f384c 100644
--- a/sys/dev/isa/isic_isa_avm_a1.c
+++ b/sys/dev/isa/isic_isa_avm_a1.c
@@ -35,14 +35,14 @@
* i4b_avm_a1.c - AVM A1/Fritz passive card driver for isdn4bsd
* ------------------------------------------------------------
*
- * $Id: isic_isa_avm_a1.c,v 1.9 2007/03/04 06:02:12 christos Exp $
+ * $Id: isic_isa_avm_a1.c,v 1.10 2007/10/19 12:00:19 ad Exp $
*
* last edit-date: [Fri Jan 5 11:37:22 2001]
*
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_isa_avm_a1.c,v 1.9 2007/03/04 06:02:12 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_isa_avm_a1.c,v 1.10 2007/10/19 12:00:19 ad Exp $");
#include "opt_isicisa.h"
#ifdef ISICISA_AVM_A1
@@ -65,7 +65,7 @@ __KERNEL_RCSID(0, "$NetBSD: isic_isa_avm_a1.c,v 1.9 2007/03/04 06:02:12 christos
#include <machine/clock.h>
#include <i386/isa/isa_device.h>
#else
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/device.h>
#endif
diff --git a/sys/dev/isa/isic_isa_itk_ix1.c b/sys/dev/isa/isic_isa_itk_ix1.c
index d0bc5addc17..015c3302493 100644
--- a/sys/dev/isa/isic_isa_itk_ix1.c
+++ b/sys/dev/isa/isic_isa_itk_ix1.c
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_isa_itk_ix1.c,v 1.14 2007/03/04 06:02:12 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_isa_itk_ix1.c,v 1.15 2007/10/19 12:00:19 ad Exp $");
#include "opt_isicisa.h"
@@ -88,7 +88,7 @@ __KERNEL_RCSID(0, "$NetBSD: isic_isa_itk_ix1.c,v 1.14 2007/03/04 06:02:12 christ
#include <machine/clock.h>
#include <i386/isa/isa_device.h>
#else
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/device.h>
#endif
diff --git a/sys/dev/isa/isic_isa_tel_s016.c b/sys/dev/isa/isic_isa_tel_s016.c
index f478a10f11f..438eb54bad4 100644
--- a/sys/dev/isa/isic_isa_tel_s016.c
+++ b/sys/dev/isa/isic_isa_tel_s016.c
@@ -37,7 +37,7 @@
* isic - I4B Siemens ISDN Chipset Driver for Teles S0/16 and clones
* =================================================================
*
- * $Id: isic_isa_tel_s016.c,v 1.8 2007/03/04 06:02:12 christos Exp $
+ * $Id: isic_isa_tel_s016.c,v 1.9 2007/10/19 12:00:19 ad Exp $
*
* last edit-date: [Fri Jan 5 11:37:22 2001]
*
@@ -50,7 +50,7 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_isa_tel_s016.c,v 1.8 2007/03/04 06:02:12 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_isa_tel_s016.c,v 1.9 2007/10/19 12:00:19 ad Exp $");
#include "opt_isicisa.h"
#ifdef ISICISA_TEL_S0_16
@@ -74,7 +74,7 @@ __KERNEL_RCSID(0, "$NetBSD: isic_isa_tel_s016.c,v 1.8 2007/03/04 06:02:12 christ
#include <machine/md_var.h>
#include <i386/isa/isa_device.h>
#else
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/device.h>
#endif
diff --git a/sys/dev/isa/isic_isa_tel_s0163.c b/sys/dev/isa/isic_isa_tel_s0163.c
index 618197ed6ff..8df45a0b932 100644
--- a/sys/dev/isa/isic_isa_tel_s0163.c
+++ b/sys/dev/isa/isic_isa_tel_s0163.c
@@ -37,7 +37,7 @@
* isic - I4B Siemens ISDN Chipset Driver for Teles S0/16.3
* ========================================================
*
- * $Id: isic_isa_tel_s0163.c,v 1.9 2007/03/04 06:02:12 christos Exp $
+ * $Id: isic_isa_tel_s0163.c,v 1.10 2007/10/19 12:00:19 ad Exp $
*
* last edit-date: [Fri Jan 5 11:37:22 2001]
*
@@ -49,7 +49,7 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_isa_tel_s0163.c,v 1.9 2007/03/04 06:02:12 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_isa_tel_s0163.c,v 1.10 2007/10/19 12:00:19 ad Exp $");
#include "opt_isicisa.h"
#ifdef ISICISA_TEL_S0_16_3
@@ -74,7 +74,7 @@ __KERNEL_RCSID(0, "$NetBSD: isic_isa_tel_s0163.c,v 1.9 2007/03/04 06:02:12 chris
#elif defined(__bsdi__)
/* XXX */
#else
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/device.h>
#endif
diff --git a/sys/dev/isa/isic_isa_tel_s08.c b/sys/dev/isa/isic_isa_tel_s08.c
index afa558686b1..48975e445fa 100644
--- a/sys/dev/isa/isic_isa_tel_s08.c
+++ b/sys/dev/isa/isic_isa_tel_s08.c
@@ -37,7 +37,7 @@
* isic - I4B Siemens ISDN Chipset Driver for Teles S0/8 and clones
* ================================================================
*
- * $Id: isic_isa_tel_s08.c,v 1.8 2007/03/04 06:02:12 christos Exp $
+ * $Id: isic_isa_tel_s08.c,v 1.9 2007/10/19 12:00:19 ad Exp $
*
* last edit-date: [Fri Jan 5 11:37:22 2001]
*
@@ -50,7 +50,7 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_isa_tel_s08.c,v 1.8 2007/03/04 06:02:12 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_isa_tel_s08.c,v 1.9 2007/10/19 12:00:19 ad Exp $");
#include "opt_isicisa.h"
#ifdef ISICISA_TEL_S0_8
@@ -74,7 +74,7 @@ __KERNEL_RCSID(0, "$NetBSD: isic_isa_tel_s08.c,v 1.8 2007/03/04 06:02:12 christo
#include <machine/md_var.h>
#include <i386/isa/isa_device.h>
#else
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/device.h>
#endif
diff --git a/sys/dev/isa/isic_isa_usr_sti.c b/sys/dev/isa/isic_isa_usr_sti.c
index db01f25a6d4..da32681b3cc 100644
--- a/sys/dev/isa/isic_isa_usr_sti.c
+++ b/sys/dev/isa/isic_isa_usr_sti.c
@@ -27,14 +27,14 @@
* i4b_usr_sti.c - USRobotics Sportster ISDN TA intern (Tina-pp)
* -------------------------------------------------------------
*
- * $Id: isic_isa_usr_sti.c,v 1.7 2007/03/04 06:02:13 christos Exp $
+ * $Id: isic_isa_usr_sti.c,v 1.8 2007/10/19 12:00:20 ad Exp $
*
* last edit-date: [Fri Jan 5 11:37:22 2001]
*
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_isa_usr_sti.c,v 1.7 2007/03/04 06:02:13 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_isa_usr_sti.c,v 1.8 2007/10/19 12:00:20 ad Exp $");
#include "opt_isicisa.h"
#ifdef ISICISA_USR_STI
@@ -57,7 +57,7 @@ __KERNEL_RCSID(0, "$NetBSD: isic_isa_usr_sti.c,v 1.7 2007/03/04 06:02:13 christo
#include <machine/clock.h>
#include <i386/isa/isa_device.h>
#else
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/device.h>
#endif
diff --git a/sys/dev/isa/it.c b/sys/dev/isa/it.c
index 9d4e22e6a28..ce0030b90a5 100644
--- a/sys/dev/isa/it.c
+++ b/sys/dev/isa/it.c
@@ -1,4 +1,4 @@
-/* $NetBSD: it.c,v 1.14 2007/09/09 05:08:11 xtraeme Exp $ */
+/* $NetBSD: it.c,v 1.15 2007/10/19 12:00:20 ad Exp $ */
/* $OpenBSD: it.c,v 1.19 2006/04/10 00:57:54 deraadt Exp $ */
/*
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: it.c,v 1.14 2007/09/09 05:08:11 xtraeme Exp $");
+__KERNEL_RCSID(0, "$NetBSD: it.c,v 1.15 2007/10/19 12:00:20 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -45,8 +45,8 @@ __KERNEL_RCSID(0, "$NetBSD: it.c,v 1.14 2007/09/09 05:08:11 xtraeme Exp $");
#include <sys/envsys.h>
#include <sys/time.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
diff --git a/sys/dev/isa/joy_ess.c b/sys/dev/isa/joy_ess.c
index debe1c54dbd..9eb324c0137 100644
--- a/sys/dev/isa/joy_ess.c
+++ b/sys/dev/isa/joy_ess.c
@@ -1,4 +1,4 @@
-/* $NetBSD: joy_ess.c,v 1.2 2005/12/11 12:22:03 christos Exp $ */
+/* $NetBSD: joy_ess.c,v 1.3 2007/10/19 12:00:20 ad Exp $ */
#include <sys/param.h>
#include <sys/systm.h>
@@ -6,7 +6,7 @@
#include <sys/device.h>
#include <sys/audioio.h>
#include <dev/audio_if.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
#include <dev/isa/essvar.h>
diff --git a/sys/dev/isa/joy_isa.c b/sys/dev/isa/joy_isa.c
index 6dc5554848c..f8c1a219bfc 100644
--- a/sys/dev/isa/joy_isa.c
+++ b/sys/dev/isa/joy_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: joy_isa.c,v 1.10 2006/11/16 01:33:00 christos Exp $ */
+/* $NetBSD: joy_isa.c,v 1.11 2007/10/19 12:00:20 ad Exp $ */
/*-
* Copyright (c) 1995 Jean-Marc Zucconi
@@ -33,14 +33,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: joy_isa.c,v 1.10 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: joy_isa.c,v 1.11 2007/10/19 12:00:20 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
diff --git a/sys/dev/isa/lm_isa.c b/sys/dev/isa/lm_isa.c
index 90f0e7de154..be74cb446a0 100644
--- a/sys/dev/isa/lm_isa.c
+++ b/sys/dev/isa/lm_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lm_isa.c,v 1.17 2007/09/08 00:39:48 xtraeme Exp $ */
+/* $NetBSD: lm_isa.c,v 1.18 2007/10/19 12:00:20 ad Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lm_isa.c,v 1.17 2007/09/08 00:39:48 xtraeme Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lm_isa.c,v 1.18 2007/10/19 12:00:20 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: lm_isa.c,v 1.17 2007/09/08 00:39:48 xtraeme Exp $");
#include <sys/device.h>
#include <sys/conf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
diff --git a/sys/dev/isa/lpt_isa.c b/sys/dev/isa/lpt_isa.c
index 9b77e6ebbc5..19023067ca8 100644
--- a/sys/dev/isa/lpt_isa.c
+++ b/sys/dev/isa/lpt_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lpt_isa.c,v 1.63 2006/11/16 01:33:00 christos Exp $ */
+/* $NetBSD: lpt_isa.c,v 1.64 2007/10/19 12:00:20 ad Exp $ */
/*
* Copyright (c) 1993, 1994 Charles M. Hannum.
@@ -54,7 +54,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lpt_isa.c,v 1.63 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lpt_isa.c,v 1.64 2007/10/19 12:00:20 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -67,8 +67,8 @@ __KERNEL_RCSID(0, "$NetBSD: lpt_isa.c,v 1.63 2006/11/16 01:33:00 christos Exp $"
#include <sys/device.h>
#include <sys/syslog.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/isa/isavar.h>
#include <dev/ic/lptreg.h>
diff --git a/sys/dev/isa/mcd.c b/sys/dev/isa/mcd.c
index c2e8ec7c132..8808a9f9716 100644
--- a/sys/dev/isa/mcd.c
+++ b/sys/dev/isa/mcd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mcd.c,v 1.101 2007/10/08 16:41:11 ad Exp $ */
+/* $NetBSD: mcd.c,v 1.102 2007/10/19 12:00:20 ad Exp $ */
/*
* Copyright (c) 1993, 1994, 1995 Charles M. Hannum. All rights reserved.
@@ -56,7 +56,7 @@
/*static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mcd.c,v 1.101 2007/10/08 16:41:11 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcd.c,v 1.102 2007/10/19 12:00:20 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -76,9 +76,9 @@ __KERNEL_RCSID(0, "$NetBSD: mcd.c,v 1.101 2007/10/08 16:41:11 ad Exp $");
#include <sys/device.h>
#include <sys/disk.h>
-#include <machine/cpu.h>
-#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/cpu.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
#include <dev/isa/mcdreg.h>
diff --git a/sys/dev/isa/midi_pcppi.c b/sys/dev/isa/midi_pcppi.c
index ea30d6faffe..c0e5682649b 100644
--- a/sys/dev/isa/midi_pcppi.c
+++ b/sys/dev/isa/midi_pcppi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: midi_pcppi.c,v 1.15 2006/11/16 01:33:00 christos Exp $ */
+/* $NetBSD: midi_pcppi.c,v 1.16 2007/10/19 12:00:20 ad Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: midi_pcppi.c,v 1.15 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: midi_pcppi.c,v 1.16 2007/10/19 12:00:20 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: midi_pcppi.c,v 1.15 2006/11/16 01:33:00 christos Exp
#include <sys/audioio.h>
#include <sys/midiio.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/pcppivar.h>
diff --git a/sys/dev/isa/moxa_isa.c b/sys/dev/isa/moxa_isa.c
index 7958edadb4c..ec877ca15f5 100644
--- a/sys/dev/isa/moxa_isa.c
+++ b/sys/dev/isa/moxa_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: moxa_isa.c,v 1.14 2006/11/16 01:33:00 christos Exp $ */
+/* $NetBSD: moxa_isa.c,v 1.15 2007/10/19 12:00:20 ad Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -34,15 +34,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: moxa_isa.c,v 1.14 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: moxa_isa.c,v 1.15 2007/10/19 12:00:20 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/termios.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/ic/comreg.h>
#include <dev/ic/comvar.h>
diff --git a/sys/dev/isa/mpu_isa.c b/sys/dev/isa/mpu_isa.c
index 7a697bf604c..13c628ae01b 100644
--- a/sys/dev/isa/mpu_isa.c
+++ b/sys/dev/isa/mpu_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mpu_isa.c,v 1.16 2006/11/16 01:33:00 christos Exp $ */
+/* $NetBSD: mpu_isa.c,v 1.17 2007/10/19 12:00:21 ad Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpu_isa.c,v 1.16 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpu_isa.c,v 1.17 2007/10/19 12:00:21 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: mpu_isa.c,v 1.16 2006/11/16 01:33:00 christos Exp $"
#include <sys/conf.h>
#include <sys/midiio.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/midi_if.h>
diff --git a/sys/dev/isa/mpu_sb.c b/sys/dev/isa/mpu_sb.c
index 0bb3f77940d..2ad51c6d728 100644
--- a/sys/dev/isa/mpu_sb.c
+++ b/sys/dev/isa/mpu_sb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mpu_sb.c,v 1.11 2006/11/16 01:33:00 christos Exp $ */
+/* $NetBSD: mpu_sb.c,v 1.12 2007/10/19 12:00:21 ad Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpu_sb.c,v 1.11 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpu_sb.c,v 1.12 2007/10/19 12:00:21 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: mpu_sb.c,v 1.11 2006/11/16 01:33:00 christos Exp $")
#include <sys/audioio.h>
#include <sys/midiio.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/audio_if.h>
#include <dev/midi_if.h>
diff --git a/sys/dev/isa/mpu_ym.c b/sys/dev/isa/mpu_ym.c
index db7b712f8ab..f95435068e6 100644
--- a/sys/dev/isa/mpu_ym.c
+++ b/sys/dev/isa/mpu_ym.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mpu_ym.c,v 1.12 2006/11/16 01:33:00 christos Exp $ */
+/* $NetBSD: mpu_ym.c,v 1.13 2007/10/19 12:00:21 ad Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpu_ym.c,v 1.12 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpu_ym.c,v 1.13 2007/10/19 12:00:21 ad Exp $");
#define NMPU_YM 1
@@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: mpu_ym.c,v 1.12 2006/11/16 01:33:00 christos Exp $")
#include <sys/audioio.h>
#include <sys/midiio.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/audio_if.h>
#include <dev/midi_if.h>
diff --git a/sys/dev/isa/nca_isa.c b/sys/dev/isa/nca_isa.c
index 88d5de8bff6..b0ceaeef5ad 100644
--- a/sys/dev/isa/nca_isa.c
+++ b/sys/dev/isa/nca_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nca_isa.c,v 1.18 2006/11/16 01:33:00 christos Exp $ */
+/* $NetBSD: nca_isa.c,v 1.19 2007/10/19 12:00:21 ad Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -64,15 +64,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nca_isa.c,v 1.18 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nca_isa.c,v 1.19 2007/10/19 12:00:21 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/buf.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/scsipi/scsi_all.h>
#include <dev/scsipi/scsipi_all.h>
diff --git a/sys/dev/isa/nsclpcsio_isa.c b/sys/dev/isa/nsclpcsio_isa.c
index 0b5c151d3b1..6e2c276caf7 100644
--- a/sys/dev/isa/nsclpcsio_isa.c
+++ b/sys/dev/isa/nsclpcsio_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nsclpcsio_isa.c,v 1.19 2007/09/09 05:26:18 xtraeme Exp $ */
+/* $NetBSD: nsclpcsio_isa.c,v 1.20 2007/10/19 12:00:21 ad Exp $ */
/*
* Copyright (c) 2002
@@ -27,14 +27,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nsclpcsio_isa.c,v 1.19 2007/09/09 05:26:18 xtraeme Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nsclpcsio_isa.c,v 1.20 2007/10/19 12:00:21 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/mutex.h>
#include <sys/gpio.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
/* Don't use gpio for now in the LKM */
#ifdef _LKM
diff --git a/sys/dev/isa/opl_ess.c b/sys/dev/isa/opl_ess.c
index 158ca671473..94a28523646 100644
--- a/sys/dev/isa/opl_ess.c
+++ b/sys/dev/isa/opl_ess.c
@@ -1,4 +1,4 @@
-/* $NetBSD: opl_ess.c,v 1.13 2006/11/16 01:33:00 christos Exp $ */
+/* $NetBSD: opl_ess.c,v 1.14 2007/10/19 12:00:21 ad Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opl_ess.c,v 1.13 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opl_ess.c,v 1.14 2007/10/19 12:00:21 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: opl_ess.c,v 1.13 2006/11/16 01:33:00 christos Exp $"
#include <sys/audioio.h>
#include <sys/midiio.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/audio_if.h>
#include <dev/midi_if.h>
diff --git a/sys/dev/isa/opl_isa.c b/sys/dev/isa/opl_isa.c
index 8fb953b78e2..9f9a9290fbd 100644
--- a/sys/dev/isa/opl_isa.c
+++ b/sys/dev/isa/opl_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: opl_isa.c,v 1.16 2006/11/16 01:33:00 christos Exp $ */
+/* $NetBSD: opl_isa.c,v 1.17 2007/10/19 12:00:21 ad Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opl_isa.c,v 1.16 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opl_isa.c,v 1.17 2007/10/19 12:00:21 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: opl_isa.c,v 1.16 2006/11/16 01:33:00 christos Exp $"
#include <sys/audioio.h>
#include <sys/midiio.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/audio_if.h>
#include <dev/midi_if.h>
diff --git a/sys/dev/isa/opl_sb.c b/sys/dev/isa/opl_sb.c
index 08f77c22ec7..1a2ceab04f4 100644
--- a/sys/dev/isa/opl_sb.c
+++ b/sys/dev/isa/opl_sb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: opl_sb.c,v 1.14 2006/11/16 01:33:00 christos Exp $ */
+/* $NetBSD: opl_sb.c,v 1.15 2007/10/19 12:00:21 ad Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opl_sb.c,v 1.14 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opl_sb.c,v 1.15 2007/10/19 12:00:21 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: opl_sb.c,v 1.14 2006/11/16 01:33:00 christos Exp $")
#include <sys/audioio.h>
#include <sys/midiio.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/audio_if.h>
#include <dev/midi_if.h>
diff --git a/sys/dev/isa/opl_wss.c b/sys/dev/isa/opl_wss.c
index c8f2d3372b1..17dae38ad97 100644
--- a/sys/dev/isa/opl_wss.c
+++ b/sys/dev/isa/opl_wss.c
@@ -1,4 +1,4 @@
-/* $NetBSD: opl_wss.c,v 1.10 2006/11/16 01:33:00 christos Exp $ */
+/* $NetBSD: opl_wss.c,v 1.11 2007/10/19 12:00:21 ad Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opl_wss.c,v 1.10 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opl_wss.c,v 1.11 2007/10/19 12:00:21 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: opl_wss.c,v 1.10 2006/11/16 01:33:00 christos Exp $"
#include <sys/audioio.h>
#include <sys/midiio.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/audio_if.h>
#include <dev/midi_if.h>
diff --git a/sys/dev/isa/opl_ym.c b/sys/dev/isa/opl_ym.c
index c61d10e559a..fa1b7998545 100644
--- a/sys/dev/isa/opl_ym.c
+++ b/sys/dev/isa/opl_ym.c
@@ -1,4 +1,4 @@
-/* $NetBSD: opl_ym.c,v 1.13 2006/11/16 01:33:00 christos Exp $ */
+/* $NetBSD: opl_ym.c,v 1.14 2007/10/19 12:00:21 ad Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opl_ym.c,v 1.13 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opl_ym.c,v 1.14 2007/10/19 12:00:21 ad Exp $");
#include "mpu_ym.h"
@@ -52,7 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: opl_ym.c,v 1.13 2006/11/16 01:33:00 christos Exp $")
#include <sys/audioio.h>
#include <sys/midiio.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/audio_if.h>
#include <dev/midi_if.h>
diff --git a/sys/dev/isa/pas.c b/sys/dev/isa/pas.c
index b881c417898..fc8adae77f5 100644
--- a/sys/dev/isa/pas.c
+++ b/sys/dev/isa/pas.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pas.c,v 1.65 2006/11/16 01:33:00 christos Exp $ */
+/* $NetBSD: pas.c,v 1.66 2007/10/19 12:00:21 ad Exp $ */
/*
* Copyright (c) 1991-1993 Regents of the University of California.
@@ -57,7 +57,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pas.c,v 1.65 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pas.c,v 1.66 2007/10/19 12:00:21 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -67,9 +67,9 @@ __KERNEL_RCSID(0, "$NetBSD: pas.c,v 1.65 2006/11/16 01:33:00 christos Exp $");
#include <sys/device.h>
#include <sys/proc.h>
-#include <machine/cpu.h>
-#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/cpu.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
#include <machine/pio.h>
#include <sys/audioio.h>
diff --git a/sys/dev/isa/pcdisplay.c b/sys/dev/isa/pcdisplay.c
index fe7d9807b00..e44e4a5eba5 100644
--- a/sys/dev/isa/pcdisplay.c
+++ b/sys/dev/isa/pcdisplay.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pcdisplay.c,v 1.33 2007/03/04 06:02:13 christos Exp $ */
+/* $NetBSD: pcdisplay.c,v 1.34 2007/10/19 12:00:21 ad Exp $ */
/*
* Copyright (c) 1998
@@ -27,14 +27,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcdisplay.c,v 1.33 2007/03/04 06:02:13 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcdisplay.c,v 1.34 2007/10/19 12:00:21 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
diff --git a/sys/dev/isa/pckbc_isa.c b/sys/dev/isa/pckbc_isa.c
index d45056630a8..1af58a74c50 100644
--- a/sys/dev/isa/pckbc_isa.c
+++ b/sys/dev/isa/pckbc_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbc_isa.c,v 1.21 2007/07/09 21:00:50 ad Exp $ */
+/* $NetBSD: pckbc_isa.c,v 1.22 2007/10/19 12:00:22 ad Exp $ */
/*
* Copyright (c) 1998
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pckbc_isa.c,v 1.21 2007/07/09 21:00:50 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbc_isa.c,v 1.22 2007/10/19 12:00:22 ad Exp $");
#include "opt_pckbc.h"
@@ -40,7 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: pckbc_isa.c,v 1.21 2007/07/09 21:00:50 ad Exp $");
#include <sys/queue.h>
#include <sys/lock.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
diff --git a/sys/dev/isa/pcppi.c b/sys/dev/isa/pcppi.c
index 743df29b945..fb29a51eb21 100644
--- a/sys/dev/isa/pcppi.c
+++ b/sys/dev/isa/pcppi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pcppi.c,v 1.23 2007/07/09 21:00:50 ad Exp $ */
+/* $NetBSD: pcppi.c,v 1.24 2007/10/19 12:00:22 ad Exp $ */
/*
* Copyright (c) 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcppi.c,v 1.23 2007/07/09 21:00:50 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcppi.c,v 1.24 2007/10/19 12:00:22 ad Exp $");
#include "attimer.h"
@@ -40,7 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: pcppi.c,v 1.23 2007/07/09 21:00:50 ad Exp $");
#include <sys/device.h>
#include <sys/errno.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/attimervar.h>
diff --git a/sys/dev/isa/radiotrack.c b/sys/dev/isa/radiotrack.c
index 60068b3f07f..eed5790597d 100644
--- a/sys/dev/isa/radiotrack.c
+++ b/sys/dev/isa/radiotrack.c
@@ -1,4 +1,4 @@
-/* $NetBSD: radiotrack.c,v 1.14 2006/11/16 01:33:00 christos Exp $ */
+/* $NetBSD: radiotrack.c,v 1.15 2007/10/19 12:00:22 ad Exp $ */
/* $OpenBSD: radiotrack.c,v 1.1 2001/12/05 10:27:06 mickey Exp $ */
/* $RuOBSD: radiotrack.c,v 1.3 2001/10/18 16:51:36 pva Exp $ */
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radiotrack.c,v 1.14 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radiotrack.c,v 1.15 2007/10/19 12:00:22 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: radiotrack.c,v 1.14 2006/11/16 01:33:00 christos Exp
#include <sys/device.h>
#include <sys/radioio.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
#include <dev/ic/lm700x.h>
diff --git a/sys/dev/isa/rtfps.c b/sys/dev/isa/rtfps.c
index c63e517c6b5..4853ed3873a 100644
--- a/sys/dev/isa/rtfps.c
+++ b/sys/dev/isa/rtfps.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rtfps.c,v 1.52 2006/11/16 01:33:00 christos Exp $ */
+/* $NetBSD: rtfps.c,v 1.53 2007/10/19 12:00:22 ad Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -34,15 +34,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtfps.c,v 1.52 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtfps.c,v 1.53 2007/10/19 12:00:22 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/termios.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/ic/comreg.h>
#include <dev/ic/comvar.h>
diff --git a/sys/dev/isa/satlink.c b/sys/dev/isa/satlink.c
index 114b95554a5..a7ef9d30a07 100644
--- a/sys/dev/isa/satlink.c
+++ b/sys/dev/isa/satlink.c
@@ -1,4 +1,4 @@
-/* $NetBSD: satlink.c,v 1.33 2007/07/10 12:15:00 tsutsui Exp $ */
+/* $NetBSD: satlink.c,v 1.34 2007/10/19 12:00:22 ad Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: satlink.c,v 1.33 2007/07/10 12:15:00 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: satlink.c,v 1.34 2007/10/19 12:00:22 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -62,9 +62,9 @@ __KERNEL_RCSID(0, "$NetBSD: satlink.c,v 1.33 2007/07/10 12:15:00 tsutsui Exp $")
#include <sys/file.h>
#include <sys/tty.h>
-#include <machine/cpu.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/cpu.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
diff --git a/sys/dev/isa/sb.c b/sys/dev/isa/sb.c
index bcd64572207..538b0a6bbc5 100644
--- a/sys/dev/isa/sb.c
+++ b/sys/dev/isa/sb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sb.c,v 1.86 2007/01/29 01:52:45 hubertf Exp $ */
+/* $NetBSD: sb.c,v 1.87 2007/10/19 12:00:22 ad Exp $ */
/*
* Copyright (c) 1991-1993 Regents of the University of California.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sb.c,v 1.86 2007/01/29 01:52:45 hubertf Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sb.c,v 1.87 2007/10/19 12:00:22 ad Exp $");
#include "midi.h"
@@ -47,9 +47,9 @@ __KERNEL_RCSID(0, "$NetBSD: sb.c,v 1.86 2007/01/29 01:52:45 hubertf Exp $");
#include <sys/device.h>
#include <sys/proc.h>
-#include <machine/cpu.h>
-#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/cpu.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
#include <sys/audioio.h>
#include <dev/audio_if.h>
diff --git a/sys/dev/isa/sb_isa.c b/sys/dev/isa/sb_isa.c
index 79593175076..899fcbdaf55 100644
--- a/sys/dev/isa/sb_isa.c
+++ b/sys/dev/isa/sb_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sb_isa.c,v 1.34 2006/11/16 01:33:00 christos Exp $ */
+/* $NetBSD: sb_isa.c,v 1.35 2007/10/19 12:00:22 ad Exp $ */
/*
* Copyright (c) 1991-1993 Regents of the University of California.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sb_isa.c,v 1.34 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sb_isa.c,v 1.35 2007/10/19 12:00:22 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: sb_isa.c,v 1.34 2006/11/16 01:33:00 christos Exp $")
#include <sys/device.h>
#include <sys/proc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/audioio.h>
#include <dev/audio_if.h>
diff --git a/sys/dev/isa/sbdsp.c b/sys/dev/isa/sbdsp.c
index 17d9dfd073d..ad87324deec 100644
--- a/sys/dev/isa/sbdsp.c
+++ b/sys/dev/isa/sbdsp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sbdsp.c,v 1.126 2006/11/16 01:33:00 christos Exp $ */
+/* $NetBSD: sbdsp.c,v 1.127 2007/10/19 12:00:22 ad Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -81,7 +81,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbdsp.c,v 1.126 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbdsp.c,v 1.127 2007/10/19 12:00:22 ad Exp $");
#include "midi.h"
#include "mpu.h"
@@ -96,9 +96,9 @@ __KERNEL_RCSID(0, "$NetBSD: sbdsp.c,v 1.126 2006/11/16 01:33:00 christos Exp $")
#include <sys/proc.h>
#include <sys/buf.h>
-#include <machine/cpu.h>
-#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/cpu.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
#include <sys/audioio.h>
#include <dev/audio_if.h>
diff --git a/sys/dev/isa/seagate.c b/sys/dev/isa/seagate.c
index bb752f67250..6c2ff9c77e4 100644
--- a/sys/dev/isa/seagate.c
+++ b/sys/dev/isa/seagate.c
@@ -1,4 +1,4 @@
-/* $NetBSD: seagate.c,v 1.62 2007/03/04 06:02:13 christos Exp $ */
+/* $NetBSD: seagate.c,v 1.63 2007/10/19 12:00:22 ad Exp $ */
/*
* ST01/02, Future Domain TMC-885, TMC-950 SCSI driver
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: seagate.c,v 1.62 2007/03/04 06:02:13 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: seagate.c,v 1.63 2007/10/19 12:00:22 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -79,7 +79,7 @@ __KERNEL_RCSID(0, "$NetBSD: seagate.c,v 1.62 2007/03/04 06:02:13 christos Exp $"
#include <sys/queue.h>
#include <sys/malloc.h>
-#include <machine/intr.h>
+#include <sys/intr.h>
#include <machine/pio.h>
#include <dev/scsipi/scsi_all.h>
diff --git a/sys/dev/isa/slhci_isa.c b/sys/dev/isa/slhci_isa.c
index 882657ac5ba..ad7c1b3bd13 100644
--- a/sys/dev/isa/slhci_isa.c
+++ b/sys/dev/isa/slhci_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: slhci_isa.c,v 1.7 2007/08/15 03:53:10 kiyohara Exp $ */
+/* $NetBSD: slhci_isa.c,v 1.8 2007/10/19 12:00:23 ad Exp $ */
/*
* Copyright (c) 2001 Kiyoshi Ikehara. All rights reserved.
@@ -35,14 +35,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: slhci_isa.c,v 1.7 2007/08/15 03:53:10 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: slhci_isa.c,v 1.8 2007/10/19 12:00:23 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
-#include <machine/cpu.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
diff --git a/sys/dev/isa/smsc.c b/sys/dev/isa/smsc.c
index af331e2147b..443e32e86c2 100644
--- a/sys/dev/isa/smsc.c
+++ b/sys/dev/isa/smsc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: smsc.c,v 1.3 2007/09/09 05:17:17 xtraeme Exp $ */
+/* $NetBSD: smsc.c,v 1.4 2007/10/19 12:00:23 ad Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smsc.c,v 1.3 2007/09/09 05:17:17 xtraeme Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smsc.c,v 1.4 2007/10/19 12:00:23 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -58,7 +58,7 @@ __KERNEL_RCSID(0, "$NetBSD: smsc.c,v 1.3 2007/09/09 05:17:17 xtraeme Exp $");
#include <sys/conf.h>
#include <sys/time.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
@@ -67,7 +67,7 @@ __KERNEL_RCSID(0, "$NetBSD: smsc.c,v 1.3 2007/09/09 05:17:17 xtraeme Exp $");
#include <dev/isa/smscvar.h>
-#include <machine/intr.h>
+#include <sys/intr.h>
#if defined(LMDEBUG)
#define DPRINTF(x) do { printf x; } while (0)
diff --git a/sys/dev/isa/spkr.c b/sys/dev/isa/spkr.c
index 3f7e0726542..3324040f067 100644
--- a/sys/dev/isa/spkr.c
+++ b/sys/dev/isa/spkr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: spkr.c,v 1.24 2007/03/04 06:02:13 christos Exp $ */
+/* $NetBSD: spkr.c,v 1.25 2007/10/19 12:00:23 ad Exp $ */
/*
* Copyright (c) 1990 Eric S. Raymond (esr@snark.thyrsus.com)
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spkr.c,v 1.24 2007/03/04 06:02:13 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spkr.c,v 1.25 2007/10/19 12:00:23 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -56,7 +56,7 @@ __KERNEL_RCSID(0, "$NetBSD: spkr.c,v 1.24 2007/03/04 06:02:13 christos Exp $");
#include <sys/ioctl.h>
#include <sys/conf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/pcppivar.h>
diff --git a/sys/dev/isa/tcic2_isa.c b/sys/dev/isa/tcic2_isa.c
index 67f8b347fba..f03c9fd175a 100644
--- a/sys/dev/isa/tcic2_isa.c
+++ b/sys/dev/isa/tcic2_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tcic2_isa.c,v 1.17 2006/11/16 01:33:00 christos Exp $ */
+/* $NetBSD: tcic2_isa.c,v 1.18 2007/10/19 12:00:23 ad Exp $ */
/*
*
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcic2_isa.c,v 1.17 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcic2_isa.c,v 1.18 2007/10/19 12:00:23 ad Exp $");
#undef TCICISADEBUG
@@ -42,8 +42,8 @@ __KERNEL_RCSID(0, "$NetBSD: tcic2_isa.c,v 1.17 2006/11/16 01:33:00 christos Exp
#include <sys/extent.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
diff --git a/sys/dev/isa/tcom.c b/sys/dev/isa/tcom.c
index 65723400d7a..52ce8e97048 100644
--- a/sys/dev/isa/tcom.c
+++ b/sys/dev/isa/tcom.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tcom.c,v 1.13 2006/11/16 01:33:00 christos Exp $ */
+/* $NetBSD: tcom.c,v 1.14 2007/10/19 12:00:23 ad Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -77,15 +77,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcom.c,v 1.13 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcom.c,v 1.14 2007/10/19 12:00:23 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/termios.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/ic/comreg.h>
#include <dev/ic/comvar.h>
diff --git a/sys/dev/isa/toaster.c b/sys/dev/isa/toaster.c
index ee809993f37..ea32f74a3b4 100644
--- a/sys/dev/isa/toaster.c
+++ b/sys/dev/isa/toaster.c
@@ -1,4 +1,4 @@
-/* $NetBSD: toaster.c,v 1.4 2007/07/09 21:00:50 ad Exp $ */
+/* $NetBSD: toaster.c,v 1.5 2007/10/19 12:00:23 ad Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: toaster.c,v 1.4 2007/07/09 21:00:50 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: toaster.c,v 1.5 2007/10/19 12:00:23 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: toaster.c,v 1.4 2007/07/09 21:00:50 ad Exp $");
#include <sys/callout.h>
#include <sys/select.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <dev/isa/tsdiovar.h>
diff --git a/sys/dev/isa/toasterlcd.c b/sys/dev/isa/toasterlcd.c
index b368437728b..8e6114b4872 100644
--- a/sys/dev/isa/toasterlcd.c
+++ b/sys/dev/isa/toasterlcd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: toasterlcd.c,v 1.3 2007/01/29 01:52:45 hubertf Exp $ */
+/* $NetBSD: toasterlcd.c,v 1.4 2007/10/19 12:00:23 ad Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: toasterlcd.c,v 1.3 2007/01/29 01:52:45 hubertf Exp $");
+__KERNEL_RCSID(0, "$NetBSD: toasterlcd.c,v 1.4 2007/10/19 12:00:23 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: toasterlcd.c,v 1.3 2007/01/29 01:52:45 hubertf Exp $
#include <sys/callout.h>
#include <sys/select.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <dev/wscons/wsdisplayvar.h>
diff --git a/sys/dev/isa/tsdio.c b/sys/dev/isa/tsdio.c
index bb6878e097c..2168e4b9f60 100644
--- a/sys/dev/isa/tsdio.c
+++ b/sys/dev/isa/tsdio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tsdio.c,v 1.3 2005/12/11 12:22:03 christos Exp $ */
+/* $NetBSD: tsdio.c,v 1.4 2007/10/19 12:00:23 ad Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -37,14 +37,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tsdio.c,v 1.3 2005/12/11 12:22:03 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tsdio.c,v 1.4 2007/10/19 12:00:23 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
diff --git a/sys/dev/isa/ug_isa.c b/sys/dev/isa/ug_isa.c
index 219ce8bb70e..a0a10eb2666 100644
--- a/sys/dev/isa/ug_isa.c
+++ b/sys/dev/isa/ug_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ug_isa.c,v 1.3 2007/09/09 05:39:10 xtraeme Exp $ */
+/* $NetBSD: ug_isa.c,v 1.4 2007/10/19 12:00:23 ad Exp $ */
/*
* Copyright (c) 2007 Mihai Chelaru <kefren@netbsd.ro>
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ug_isa.c,v 1.3 2007/09/09 05:39:10 xtraeme Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ug_isa.c,v 1.4 2007/10/19 12:00:23 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -45,8 +45,8 @@ __KERNEL_RCSID(0, "$NetBSD: ug_isa.c,v 1.3 2007/09/09 05:39:10 xtraeme Exp $");
#include <sys/envsys.h>
#include <sys/time.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
diff --git a/sys/dev/isa/uha_isa.c b/sys/dev/isa/uha_isa.c
index 148c88e480e..f5f49b87649 100644
--- a/sys/dev/isa/uha_isa.c
+++ b/sys/dev/isa/uha_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uha_isa.c,v 1.31 2006/11/16 01:33:00 christos Exp $ */
+/* $NetBSD: uha_isa.c,v 1.32 2007/10/19 12:00:23 ad Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uha_isa.c,v 1.31 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uha_isa.c,v 1.32 2007/10/19 12:00:23 ad Exp $");
#include "opt_ddb.h"
@@ -48,8 +48,8 @@ __KERNEL_RCSID(0, "$NetBSD: uha_isa.c,v 1.31 2006/11/16 01:33:00 christos Exp $"
#include <sys/proc.h>
#include <sys/user.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/scsipi/scsi_all.h>
#include <dev/scsipi/scsipi_all.h>
diff --git a/sys/dev/isa/wdc_isa.c b/sys/dev/isa/wdc_isa.c
index 400be7ebc4e..21c712b8c42 100644
--- a/sys/dev/isa/wdc_isa.c
+++ b/sys/dev/isa/wdc_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc_isa.c,v 1.51 2006/11/16 01:33:00 christos Exp $ */
+/* $NetBSD: wdc_isa.c,v 1.52 2007/10/19 12:00:24 ad Exp $ */
/*-
* Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
@@ -37,15 +37,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_isa.c,v 1.51 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_isa.c,v 1.52 2007/10/19 12:00:24 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/isa/isavar.h>
#include <dev/isa/isadmavar.h>
diff --git a/sys/dev/isa/wds.c b/sys/dev/isa/wds.c
index fe6f5003bb1..d3bf2c7204c 100644
--- a/sys/dev/isa/wds.c
+++ b/sys/dev/isa/wds.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wds.c,v 1.66 2007/03/04 06:02:13 christos Exp $ */
+/* $NetBSD: wds.c,v 1.67 2007/10/19 12:00:24 ad Exp $ */
/*
* XXX
@@ -86,7 +86,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wds.c,v 1.66 2007/03/04 06:02:13 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wds.c,v 1.67 2007/10/19 12:00:24 ad Exp $");
#include "opt_ddb.h"
@@ -110,8 +110,8 @@ __KERNEL_RCSID(0, "$NetBSD: wds.c,v 1.66 2007/03/04 06:02:13 christos Exp $");
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/scsipi/scsi_all.h>
#include <dev/scsipi/scsipi_all.h>
diff --git a/sys/dev/isa/weasel_isa.c b/sys/dev/isa/weasel_isa.c
index 429768b0b7c..56dd16e4125 100644
--- a/sys/dev/isa/weasel_isa.c
+++ b/sys/dev/isa/weasel_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: weasel_isa.c,v 1.3 2005/12/11 12:22:03 christos Exp $ */
+/* $NetBSD: weasel_isa.c,v 1.4 2007/10/19 12:00:24 ad Exp $ */
/*-
* Copyright (c) 2000 Zembu Labs, Inc.
@@ -42,14 +42,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: weasel_isa.c,v 1.3 2005/12/11 12:22:03 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: weasel_isa.c,v 1.4 2007/10/19 12:00:24 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/wdog.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/weaselreg.h>
#include <dev/isa/weaselvar.h>
diff --git a/sys/dev/isa/wss.c b/sys/dev/isa/wss.c
index 5acd13015ee..6961be453d4 100644
--- a/sys/dev/isa/wss.c
+++ b/sys/dev/isa/wss.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wss.c,v 1.67 2006/11/16 01:33:00 christos Exp $ */
+/* $NetBSD: wss.c,v 1.68 2007/10/19 12:00:24 ad Exp $ */
/*
* Copyright (c) 1994 John Brezak
@@ -36,16 +36,16 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wss.c,v 1.67 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wss.c,v 1.68 2007/10/19 12:00:24 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/errno.h>
-#include <machine/cpu.h>
-#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/cpu.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
#include <sys/audioio.h>
#include <dev/audio_if.h>
diff --git a/sys/dev/isa/wss_isa.c b/sys/dev/isa/wss_isa.c
index 64a6bce637c..dfe323f0a9b 100644
--- a/sys/dev/isa/wss_isa.c
+++ b/sys/dev/isa/wss_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wss_isa.c,v 1.23 2006/11/16 01:33:00 christos Exp $ */
+/* $NetBSD: wss_isa.c,v 1.24 2007/10/19 12:00:24 ad Exp $ */
/*
* Copyright (c) 1994 John Brezak
@@ -41,16 +41,16 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wss_isa.c,v 1.23 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wss_isa.c,v 1.24 2007/10/19 12:00:24 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/errno.h>
-#include <machine/cpu.h>
-#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/cpu.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
#include <sys/audioio.h>
#include <dev/audio_if.h>
diff --git a/sys/dev/isa/wt.c b/sys/dev/isa/wt.c
index 2a9bbe4d1cb..1d932f4a7f2 100644
--- a/sys/dev/isa/wt.c
+++ b/sys/dev/isa/wt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wt.c,v 1.77 2007/07/29 12:50:21 ad Exp $ */
+/* $NetBSD: wt.c,v 1.78 2007/10/19 12:00:24 ad Exp $ */
/*
* Streamer tape driver.
@@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wt.c,v 1.77 2007/07/29 12:50:21 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wt.c,v 1.78 2007/10/19 12:00:24 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -67,8 +67,8 @@ __KERNEL_RCSID(0, "$NetBSD: wt.c,v 1.77 2007/07/29 12:50:21 ad Exp $");
#include <sys/lwp.h>
#include <sys/conf.h>
-#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
#include <machine/pio.h>
#include <dev/isa/isavar.h>
diff --git a/sys/dev/isa/ym.c b/sys/dev/isa/ym.c
index 10b3612a84d..b18a882bcfa 100644
--- a/sys/dev/isa/ym.c
+++ b/sys/dev/isa/ym.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ym.c,v 1.31 2007/07/09 21:00:50 ad Exp $ */
+/* $NetBSD: ym.c,v 1.32 2007/10/19 12:00:24 ad Exp $ */
/*-
* Copyright (c) 1999-2002 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ym.c,v 1.31 2007/07/09 21:00:50 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ym.c,v 1.32 2007/10/19 12:00:24 ad Exp $");
#include "mpu_ym.h"
#include "opt_ym.h"
@@ -80,9 +80,9 @@ __KERNEL_RCSID(0, "$NetBSD: ym.c,v 1.31 2007/07/09 21:00:50 ad Exp $");
#include <sys/kernel.h>
#include <sys/proc.h>
-#include <machine/cpu.h>
-#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/cpu.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
#include <sys/audioio.h>
#include <dev/audio_if.h>
diff --git a/sys/dev/isapnp/aha_isapnp.c b/sys/dev/isapnp/aha_isapnp.c
index 0fecd641025..0e4ddeb0bc4 100644
--- a/sys/dev/isapnp/aha_isapnp.c
+++ b/sys/dev/isapnp/aha_isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aha_isapnp.c,v 1.12 2006/11/16 01:33:05 christos Exp $ */
+/* $NetBSD: aha_isapnp.c,v 1.13 2007/10/19 12:00:30 ad Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,14 +37,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aha_isapnp.c,v 1.12 2006/11/16 01:33:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aha_isapnp.c,v 1.13 2007/10/19 12:00:30 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/conf.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/scsipi/scsi_all.h>
#include <dev/scsipi/scsipi_all.h>
diff --git a/sys/dev/isapnp/aic_isapnp.c b/sys/dev/isapnp/aic_isapnp.c
index 975efcd4d0f..7f1c59fb0f0 100644
--- a/sys/dev/isapnp/aic_isapnp.c
+++ b/sys/dev/isapnp/aic_isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aic_isapnp.c,v 1.14 2006/11/16 01:33:05 christos Exp $ */
+/* $NetBSD: aic_isapnp.c,v 1.15 2007/10/19 12:00:30 ad Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,13 +37,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aic_isapnp.c,v 1.14 2006/11/16 01:33:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic_isapnp.c,v 1.15 2007/10/19 12:00:30 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
diff --git a/sys/dev/isapnp/atppc_isapnp.c b/sys/dev/isapnp/atppc_isapnp.c
index de0bed3ac03..f537f06662c 100644
--- a/sys/dev/isapnp/atppc_isapnp.c
+++ b/sys/dev/isapnp/atppc_isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: atppc_isapnp.c,v 1.6 2007/03/04 06:02:13 christos Exp $ */
+/* $NetBSD: atppc_isapnp.c,v 1.7 2007/10/19 12:00:30 ad Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atppc_isapnp.c,v 1.6 2007/03/04 06:02:13 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atppc_isapnp.c,v 1.7 2007/10/19 12:00:30 ad Exp $");
#include "opt_atppc.h"
@@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: atppc_isapnp.c,v 1.6 2007/03/04 06:02:13 christos Ex
#include <sys/proc.h>
#include <sys/termios.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
#include <dev/isa/isadmavar.h>
diff --git a/sys/dev/isapnp/com_isapnp.c b/sys/dev/isapnp/com_isapnp.c
index e06526c73db..ace863a2beb 100644
--- a/sys/dev/isapnp/com_isapnp.c
+++ b/sys/dev/isapnp/com_isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: com_isapnp.c,v 1.26 2006/11/16 01:33:05 christos Exp $ */
+/* $NetBSD: com_isapnp.c,v 1.27 2007/10/19 12:00:30 ad Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_isapnp.c,v 1.26 2006/11/16 01:33:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_isapnp.c,v 1.27 2007/10/19 12:00:30 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: com_isapnp.c,v 1.26 2006/11/16 01:33:05 christos Exp
#include <sys/proc.h>
#include <sys/termios.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
#include <dev/isa/isadmavar.h>
diff --git a/sys/dev/isapnp/ess_isapnp.c b/sys/dev/isapnp/ess_isapnp.c
index ca4e319a794..4f564946963 100644
--- a/sys/dev/isapnp/ess_isapnp.c
+++ b/sys/dev/isapnp/ess_isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ess_isapnp.c,v 1.17 2006/11/16 01:33:05 christos Exp $ */
+/* $NetBSD: ess_isapnp.c,v 1.18 2007/10/19 12:00:31 ad Exp $ */
/*
* Copyright (c) 1991-1993 Regents of the University of California.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ess_isapnp.c,v 1.17 2006/11/16 01:33:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ess_isapnp.c,v 1.18 2007/10/19 12:00:31 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: ess_isapnp.c,v 1.17 2006/11/16 01:33:05 christos Exp
#include <sys/device.h>
#include <sys/proc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/audioio.h>
#include <dev/audio_if.h>
diff --git a/sys/dev/isapnp/gus_isapnp.c b/sys/dev/isapnp/gus_isapnp.c
index 469475d4411..f8d386efcf8 100644
--- a/sys/dev/isapnp/gus_isapnp.c
+++ b/sys/dev/isapnp/gus_isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: gus_isapnp.c,v 1.30 2006/11/16 01:33:05 christos Exp $ */
+/* $NetBSD: gus_isapnp.c,v 1.31 2007/10/19 12:00:31 ad Exp $ */
/*
* Copyright (c) 1997, 1999 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gus_isapnp.c,v 1.30 2006/11/16 01:33:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gus_isapnp.c,v 1.31 2007/10/19 12:00:31 ad Exp $");
#include "guspnp.h"
#if NGUSPNP > 0
@@ -54,7 +54,7 @@ __KERNEL_RCSID(0, "$NetBSD: gus_isapnp.c,v 1.30 2006/11/16 01:33:05 christos Exp
#include <sys/device.h>
#include <sys/proc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/audioio.h>
#include <dev/audio_if.h>
diff --git a/sys/dev/isapnp/i82365_isapnp.c b/sys/dev/isapnp/i82365_isapnp.c
index 7100bca55a8..11fdcb0feac 100644
--- a/sys/dev/isapnp/i82365_isapnp.c
+++ b/sys/dev/isapnp/i82365_isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: i82365_isapnp.c,v 1.23 2006/11/16 01:33:05 christos Exp $ */
+/* $NetBSD: i82365_isapnp.c,v 1.24 2007/10/19 12:00:31 ad Exp $ */
/*
* Copyright (c) 1998 Bill Sommerfeld. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i82365_isapnp.c,v 1.23 2006/11/16 01:33:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i82365_isapnp.c,v 1.24 2007/10/19 12:00:31 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -39,8 +39,8 @@ __KERNEL_RCSID(0, "$NetBSD: i82365_isapnp.c,v 1.23 2006/11/16 01:33:05 christos
#include <sys/extent.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
diff --git a/sys/dev/isapnp/if_an_isapnp.c b/sys/dev/isapnp/if_an_isapnp.c
index eca040d47e4..1543971b125 100644
--- a/sys/dev/isapnp/if_an_isapnp.c
+++ b/sys/dev/isapnp/if_an_isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_an_isapnp.c,v 1.15 2006/11/16 01:33:05 christos Exp $ */
+/* $NetBSD: if_an_isapnp.c,v 1.16 2007/10/19 12:00:31 ad Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_an_isapnp.c,v 1.15 2006/11/16 01:33:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_an_isapnp.c,v 1.16 2007/10/19 12:00:31 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -64,8 +64,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_an_isapnp.c,v 1.15 2006/11/16 01:33:05 christos E
#include <net80211/ieee80211_netbsd.h>
#include <net80211/ieee80211_var.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/ic/anreg.h>
#include <dev/ic/anvar.h>
diff --git a/sys/dev/isapnp/if_cs_isapnp.c b/sys/dev/isapnp/if_cs_isapnp.c
index 2cf6b934705..08855591606 100644
--- a/sys/dev/isapnp/if_cs_isapnp.c
+++ b/sys/dev/isapnp/if_cs_isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cs_isapnp.c,v 1.9 2006/03/29 06:51:47 thorpej Exp $ */
+/* $NetBSD: if_cs_isapnp.c,v 1.10 2007/10/19 12:00:31 ad Exp $ */
/*-
* Copyright (c)2001 YAMAMOTO Takashi,
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cs_isapnp.c,v 1.9 2006/03/29 06:51:47 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cs_isapnp.c,v 1.10 2007/10/19 12:00:31 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -43,8 +43,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_cs_isapnp.c,v 1.9 2006/03/29 06:51:47 thorpej Exp
#include <net/if_ether.h>
#include <net/if_media.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/isa/isavar.h>
diff --git a/sys/dev/isapnp/if_ep_isapnp.c b/sys/dev/isapnp/if_ep_isapnp.c
index 1fdf278aedf..c5df7e17bb0 100644
--- a/sys/dev/isapnp/if_ep_isapnp.c
+++ b/sys/dev/isapnp/if_ep_isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ep_isapnp.c,v 1.31 2006/11/16 01:33:05 christos Exp $ */
+/* $NetBSD: if_ep_isapnp.c,v 1.32 2007/10/19 12:00:31 ad Exp $ */
/*
* Copyright (c) 1997 Jonathan Stone <jonathan@NetBSD.org>
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ep_isapnp.c,v 1.31 2006/11/16 01:33:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ep_isapnp.c,v 1.32 2007/10/19 12:00:31 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -48,9 +48,9 @@ __KERNEL_RCSID(0, "$NetBSD: if_ep_isapnp.c,v 1.31 2006/11/16 01:33:05 christos E
#include <net/if_ether.h>
#include <net/if_media.h>
-#include <machine/cpu.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/cpu.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/isa/isavar.h>
diff --git a/sys/dev/isapnp/if_fmv_isapnp.c b/sys/dev/isapnp/if_fmv_isapnp.c
index ff341f0be06..dd815eb8ce9 100644
--- a/sys/dev/isapnp/if_fmv_isapnp.c
+++ b/sys/dev/isapnp/if_fmv_isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fmv_isapnp.c,v 1.8 2006/11/16 01:33:05 christos Exp $ */
+/* $NetBSD: if_fmv_isapnp.c,v 1.9 2007/10/19 12:00:31 ad Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_fmv_isapnp.c,v 1.8 2006/11/16 01:33:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fmv_isapnp.c,v 1.9 2007/10/19 12:00:31 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -48,8 +48,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_fmv_isapnp.c,v 1.8 2006/11/16 01:33:05 christos E
#include <net/if_ether.h>
#include <net/if_media.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/ic/mb86960reg.h>
#include <dev/ic/mb86960var.h>
diff --git a/sys/dev/isapnp/if_le_isapnp.c b/sys/dev/isapnp/if_le_isapnp.c
index 53403b766ba..6847ced27d2 100644
--- a/sys/dev/isapnp/if_le_isapnp.c
+++ b/sys/dev/isapnp/if_le_isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le_isapnp.c,v 1.31 2007/03/04 06:02:13 christos Exp $ */
+/* $NetBSD: if_le_isapnp.c,v 1.32 2007/10/19 12:00:31 ad Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le_isapnp.c,v 1.31 2007/03/04 06:02:13 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le_isapnp.c,v 1.32 2007/10/19 12:00:31 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -87,9 +87,9 @@ __KERNEL_RCSID(0, "$NetBSD: if_le_isapnp.c,v 1.31 2007/03/04 06:02:13 christos E
#include <net/if_ether.h>
#include <net/if_media.h>
-#include <machine/cpu.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/cpu.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/isa/isavar.h>
#include <dev/isa/isadmavar.h>
diff --git a/sys/dev/isapnp/if_ne_isapnp.c b/sys/dev/isapnp/if_ne_isapnp.c
index 9786b1185f6..0c4638a2558 100644
--- a/sys/dev/isapnp/if_ne_isapnp.c
+++ b/sys/dev/isapnp/if_ne_isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ne_isapnp.c,v 1.23 2006/11/16 01:33:05 christos Exp $ */
+/* $NetBSD: if_ne_isapnp.c,v 1.24 2007/10/19 12:00:31 ad Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ne_isapnp.c,v 1.23 2006/11/16 01:33:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ne_isapnp.c,v 1.24 2007/10/19 12:00:31 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -55,8 +55,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_ne_isapnp.c,v 1.23 2006/11/16 01:33:05 christos E
#include <net/if_ether.h>
#include <net/if_media.h>
-#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
#include <dev/ic/dp8390reg.h>
#include <dev/ic/dp8390var.h>
diff --git a/sys/dev/isapnp/if_tr_isapnp.c b/sys/dev/isapnp/if_tr_isapnp.c
index bead5593f7f..a0e9dba2ad6 100644
--- a/sys/dev/isapnp/if_tr_isapnp.c
+++ b/sys/dev/isapnp/if_tr_isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tr_isapnp.c,v 1.15 2006/11/16 01:33:05 christos Exp $ */
+/* $NetBSD: if_tr_isapnp.c,v 1.16 2007/10/19 12:00:31 ad Exp $ */
/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tr_isapnp.c,v 1.15 2006/11/16 01:33:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tr_isapnp.c,v 1.16 2007/10/19 12:00:31 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -55,9 +55,9 @@ __KERNEL_RCSID(0, "$NetBSD: if_tr_isapnp.c,v 1.15 2006/11/16 01:33:05 christos E
#include <net/if_ether.h>
#include <net/if_media.h>
-#include <machine/cpu.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/cpu.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/ic/tropicreg.h>
#include <dev/ic/tropicvar.h>
diff --git a/sys/dev/isapnp/isapnp.c b/sys/dev/isapnp/isapnp.c
index 03aa2f77560..3fd698c48aa 100644
--- a/sys/dev/isapnp/isapnp.c
+++ b/sys/dev/isapnp/isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isapnp.c,v 1.52 2006/11/16 01:33:05 christos Exp $ */
+/* $NetBSD: isapnp.c,v 1.53 2007/10/19 12:00:31 ad Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isapnp.c,v 1.52 2006/11/16 01:33:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isapnp.c,v 1.53 2007/10/19 12:00:31 ad Exp $");
#include "isadma.h"
@@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: isapnp.c,v 1.52 2006/11/16 01:33:05 christos Exp $")
#include <sys/device.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
diff --git a/sys/dev/isapnp/isapnpdebug.c b/sys/dev/isapnp/isapnpdebug.c
index 18abd3398d3..b39e217a065 100644
--- a/sys/dev/isapnp/isapnpdebug.c
+++ b/sys/dev/isapnp/isapnpdebug.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isapnpdebug.c,v 1.9 2005/12/11 12:22:16 christos Exp $ */
+/* $NetBSD: isapnpdebug.c,v 1.10 2007/10/19 12:00:31 ad Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isapnpdebug.c,v 1.9 2005/12/11 12:22:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isapnpdebug.c,v 1.10 2007/10/19 12:00:31 ad Exp $");
#ifdef DEBUG_ISAPNP
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: isapnpdebug.c,v 1.9 2005/12/11 12:22:16 christos Exp
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
diff --git a/sys/dev/isapnp/isapnpres.c b/sys/dev/isapnp/isapnpres.c
index 25aaefc6b0e..1a00b4994c8 100644
--- a/sys/dev/isapnp/isapnpres.c
+++ b/sys/dev/isapnp/isapnpres.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isapnpres.c,v 1.16 2006/04/13 03:34:46 christos Exp $ */
+/* $NetBSD: isapnpres.c,v 1.17 2007/10/19 12:00:32 ad Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -41,14 +41,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isapnpres.c,v 1.16 2006/04/13 03:34:46 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isapnpres.c,v 1.17 2007/10/19 12:00:32 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
diff --git a/sys/dev/isapnp/isic_isapnp.c b/sys/dev/isapnp/isic_isapnp.c
index dc8957ddee4..e3b24e6e5c6 100644
--- a/sys/dev/isapnp/isic_isapnp.c
+++ b/sys/dev/isapnp/isic_isapnp.c
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_isapnp.c,v 1.26 2007/07/09 21:00:51 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_isapnp.c,v 1.27 2007/10/19 12:00:32 ad Exp $");
#include <sys/param.h>
#include <sys/errno.h>
@@ -50,9 +50,9 @@ __KERNEL_RCSID(0, "$NetBSD: isic_isapnp.c,v 1.26 2007/07/09 21:00:51 ad Exp $");
#include <sys/callout.h>
#endif
-#include <machine/cpu.h>
-#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/cpu.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
#include <dev/isapnp/isapnpreg.h>
diff --git a/sys/dev/isapnp/isic_isapnp_ctx_s0P.c b/sys/dev/isapnp/isic_isapnp_ctx_s0P.c
index ccca8baf9ca..68a9cde71b7 100644
--- a/sys/dev/isapnp/isic_isapnp_ctx_s0P.c
+++ b/sys/dev/isapnp/isic_isapnp_ctx_s0P.c
@@ -27,14 +27,14 @@
* isic - I4B Siemens ISDN Chipset Driver for Creatix PnP cards
* ============================================================
*
- * $Id: isic_isapnp_ctx_s0P.c,v 1.10 2007/03/04 06:02:13 christos Exp $
+ * $Id: isic_isapnp_ctx_s0P.c,v 1.11 2007/10/19 12:00:32 ad Exp $
*
* last edit-date: [Fri Jan 5 11:38:29 2001]
*
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_ctx_s0P.c,v 1.10 2007/03/04 06:02:13 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_ctx_s0P.c,v 1.11 2007/10/19 12:00:32 ad Exp $");
#include "opt_isicpnp.h"
#if ISICPNP_CRTX_S0_P
@@ -59,7 +59,7 @@ __KERNEL_RCSID(0, "$NetBSD: isic_isapnp_ctx_s0P.c,v 1.10 2007/03/04 06:02:13 chr
#include <machine/clock.h>
#include <i386/isa/isa_device.h>
#else
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/device.h>
#endif
diff --git a/sys/dev/isapnp/isic_isapnp_drn_ngo.c b/sys/dev/isapnp/isic_isapnp_drn_ngo.c
index 410a8ab49d8..a7c36be65e5 100644
--- a/sys/dev/isapnp/isic_isapnp_drn_ngo.c
+++ b/sys/dev/isapnp/isic_isapnp_drn_ngo.c
@@ -27,14 +27,14 @@
* i4b_drn_ngo.c - Dr. Neuhaus Niccy GO@ and SAGEM Cybermod
* --------------------------------------------------------
*
- * $Id: isic_isapnp_drn_ngo.c,v 1.9 2007/03/04 06:02:13 christos Exp $
+ * $Id: isic_isapnp_drn_ngo.c,v 1.10 2007/10/19 12:00:32 ad Exp $
*
* last edit-date: [Fri Jan 5 11:38:29 2001]
*
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_drn_ngo.c,v 1.9 2007/03/04 06:02:13 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_drn_ngo.c,v 1.10 2007/10/19 12:00:32 ad Exp $");
#include "opt_isicpnp.h"
#ifdef ISICPNP_DRN_NGO
@@ -57,7 +57,7 @@ __KERNEL_RCSID(0, "$NetBSD: isic_isapnp_drn_ngo.c,v 1.9 2007/03/04 06:02:13 chri
#include <machine/clock.h>
#include <i386/isa/isa_device.h>
#else
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/device.h>
#endif
diff --git a/sys/dev/isapnp/isic_isapnp_dynalink.c b/sys/dev/isapnp/isic_isapnp_dynalink.c
index 1cc83137e44..9e4cb00ab21 100644
--- a/sys/dev/isapnp/isic_isapnp_dynalink.c
+++ b/sys/dev/isapnp/isic_isapnp_dynalink.c
@@ -33,7 +33,7 @@
* isdn4bsd layer1 driver for Dynalink IS64PH isdn TA
* ==================================================
*
- * $Id: isic_isapnp_dynalink.c,v 1.8 2007/03/04 06:02:13 christos Exp $
+ * $Id: isic_isapnp_dynalink.c,v 1.9 2007/10/19 12:00:32 ad Exp $
*
* last edit-date: [Fri Jan 5 11:38:29 2001]
*
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_dynalink.c,v 1.8 2007/03/04 06:02:13 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_dynalink.c,v 1.9 2007/10/19 12:00:32 ad Exp $");
#include "opt_isicpnp.h"
#ifdef ISICPNP_DYNALINK
@@ -106,7 +106,7 @@ __KERNEL_RCSID(0, "$NetBSD: isic_isapnp_dynalink.c,v 1.8 2007/03/04 06:02:13 chr
#elif defined(__bsdi__)
#include <i386/isa/pnp.h>
#else
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/device.h>
#endif
diff --git a/sys/dev/isapnp/isic_isapnp_elsa_qs1i.c b/sys/dev/isapnp/isic_isapnp_elsa_qs1i.c
index 82ebbcca25d..a04da6517ba 100644
--- a/sys/dev/isapnp/isic_isapnp_elsa_qs1i.c
+++ b/sys/dev/isapnp/isic_isapnp_elsa_qs1i.c
@@ -27,14 +27,14 @@
* isic - I4B Siemens ISDN Chipset Driver for ELSA Quickstep 1000pro ISA
* =====================================================================
*
- * $Id: isic_isapnp_elsa_qs1i.c,v 1.15 2007/07/09 21:00:51 ad Exp $
+ * $Id: isic_isapnp_elsa_qs1i.c,v 1.16 2007/10/19 12:00:32 ad Exp $
*
* last edit-date: [Fri Jan 5 11:38:29 2001]
*
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_elsa_qs1i.c,v 1.15 2007/07/09 21:00:51 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_elsa_qs1i.c,v 1.16 2007/10/19 12:00:32 ad Exp $");
#include "opt_isicpnp.h"
#if defined(ISICPNP_ELSA_QS1ISA) || defined(ISICPNP_ELSA_PCC16)
@@ -60,7 +60,7 @@ __KERNEL_RCSID(0, "$NetBSD: isic_isapnp_elsa_qs1i.c,v 1.15 2007/07/09 21:00:51 a
#include <i386/isa/isa_device.h>
#include <i386/isa/pnp.h>
#else
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/device.h>
#endif
diff --git a/sys/dev/isapnp/isic_isapnp_itkix.c b/sys/dev/isapnp/isic_isapnp_itkix.c
index 1ebc5f2d29b..825e18b1cbb 100644
--- a/sys/dev/isapnp/isic_isapnp_itkix.c
+++ b/sys/dev/isapnp/isic_isapnp_itkix.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isic_isapnp_itkix.c,v 1.6 2005/12/11 12:22:16 christos Exp $ */
+/* $NetBSD: isic_isapnp_itkix.c,v 1.7 2007/10/19 12:00:32 ad Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_itkix.c,v 1.6 2005/12/11 12:22:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_itkix.c,v 1.7 2007/10/19 12:00:32 ad Exp $");
#include "opt_isicpnp.h"
@@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: isic_isapnp_itkix.c,v 1.6 2005/12/11 12:22:16 christ
#include <sys/systm.h>
#include <sys/mbuf.h>
#include <sys/callout.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/device.h>
#include <sys/socket.h>
diff --git a/sys/dev/isapnp/isic_isapnp_siemens_isurf.c b/sys/dev/isapnp/isic_isapnp_siemens_isurf.c
index 30e55b8b19e..19fa589b041 100644
--- a/sys/dev/isapnp/isic_isapnp_siemens_isurf.c
+++ b/sys/dev/isapnp/isic_isapnp_siemens_isurf.c
@@ -37,14 +37,14 @@
* Siemens I-Surf 2.0 PnP specific routines for isic driver
* --------------------------------------------------------
*
- * $Id: isic_isapnp_siemens_isurf.c,v 1.10 2007/03/04 06:02:13 christos Exp $
+ * $Id: isic_isapnp_siemens_isurf.c,v 1.11 2007/10/19 12:00:32 ad Exp $
*
* last edit-date: [Fri Jan 5 11:38:29 2001]
*
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_siemens_isurf.c,v 1.10 2007/03/04 06:02:13 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_siemens_isurf.c,v 1.11 2007/10/19 12:00:32 ad Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -66,7 +66,7 @@ __KERNEL_RCSID(0, "$NetBSD: isic_isapnp_siemens_isurf.c,v 1.10 2007/03/04 06:02:
#include <i386/isa/isa_device.h>
#else
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/device.h>
#endif
diff --git a/sys/dev/isapnp/isic_isapnp_sws.c b/sys/dev/isapnp/isic_isapnp_sws.c
index 272a332713c..70b85a9be04 100644
--- a/sys/dev/isapnp/isic_isapnp_sws.c
+++ b/sys/dev/isapnp/isic_isapnp_sws.c
@@ -47,7 +47,7 @@
* EXPERIMENTAL !!!!
* =================
*
- * $Id: isic_isapnp_sws.c,v 1.11 2007/03/04 06:02:14 christos Exp $
+ * $Id: isic_isapnp_sws.c,v 1.12 2007/10/19 12:00:32 ad Exp $
*
* last edit-date: [Fri Jan 5 11:38:29 2001]
*
@@ -57,7 +57,7 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_sws.c,v 1.11 2007/03/04 06:02:14 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_sws.c,v 1.12 2007/10/19 12:00:32 ad Exp $");
#include "opt_isicpnp.h"
#ifdef ISICPNP_SEDLBAUER
@@ -96,7 +96,7 @@ __KERNEL_RCSID(0, "$NetBSD: isic_isapnp_sws.c,v 1.11 2007/03/04 06:02:14 christo
#include <machine/clock.h>
#include <i386/isa/isa_device.h>
#else
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/device.h>
#endif
diff --git a/sys/dev/isapnp/isic_isapnp_tel_s0P.c b/sys/dev/isapnp/isic_isapnp_tel_s0P.c
index 341944a2957..7d75652fab2 100644
--- a/sys/dev/isapnp/isic_isapnp_tel_s0P.c
+++ b/sys/dev/isapnp/isic_isapnp_tel_s0P.c
@@ -38,14 +38,14 @@
* EXPERIMENTAL !!!
* ================
*
- * $Id: isic_isapnp_tel_s0P.c,v 1.10 2007/03/04 06:02:14 christos Exp $
+ * $Id: isic_isapnp_tel_s0P.c,v 1.11 2007/10/19 12:00:32 ad Exp $
*
* last edit-date: [Fri Jan 5 11:38:29 2001]
*
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_tel_s0P.c,v 1.10 2007/03/04 06:02:14 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_tel_s0P.c,v 1.11 2007/10/19 12:00:32 ad Exp $");
#include "opt_isicpnp.h"
#ifdef ISICPNP_TEL_S0_16_3_P
@@ -68,7 +68,7 @@ __KERNEL_RCSID(0, "$NetBSD: isic_isapnp_tel_s0P.c,v 1.10 2007/03/04 06:02:14 chr
#include <machine/clock.h>
#include <i386/isa/isa_device.h>
#else
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/device.h>
#endif
diff --git a/sys/dev/isapnp/joy_isapnp.c b/sys/dev/isapnp/joy_isapnp.c
index 3ccab869731..d6702813e8b 100644
--- a/sys/dev/isapnp/joy_isapnp.c
+++ b/sys/dev/isapnp/joy_isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: joy_isapnp.c,v 1.9 2006/11/16 01:33:05 christos Exp $ */
+/* $NetBSD: joy_isapnp.c,v 1.10 2007/10/19 12:00:32 ad Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -37,14 +37,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: joy_isapnp.c,v 1.9 2006/11/16 01:33:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: joy_isapnp.c,v 1.10 2007/10/19 12:00:32 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
#include <dev/isapnp/isapnpreg.h>
diff --git a/sys/dev/isapnp/mpu_isapnp.c b/sys/dev/isapnp/mpu_isapnp.c
index bd8e9934630..b7f66e219eb 100644
--- a/sys/dev/isapnp/mpu_isapnp.c
+++ b/sys/dev/isapnp/mpu_isapnp.c
@@ -1,7 +1,7 @@
-/* $NetBSD: mpu_isapnp.c,v 1.15 2006/11/16 01:33:05 christos Exp $ */
+/* $NetBSD: mpu_isapnp.c,v 1.16 2007/10/19 12:00:33 ad Exp $ */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpu_isapnp.c,v 1.15 2006/11/16 01:33:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpu_isapnp.c,v 1.16 2007/10/19 12:00:33 ad Exp $");
#include "midi.h"
@@ -13,7 +13,7 @@ __KERNEL_RCSID(0, "$NetBSD: mpu_isapnp.c,v 1.15 2006/11/16 01:33:05 christos Exp
#include <sys/device.h>
#include <sys/proc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/audioio.h>
#include <dev/audio_if.h>
diff --git a/sys/dev/isapnp/sb_isapnp.c b/sys/dev/isapnp/sb_isapnp.c
index 389e123424a..07daba76cf5 100644
--- a/sys/dev/isapnp/sb_isapnp.c
+++ b/sys/dev/isapnp/sb_isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sb_isapnp.c,v 1.50 2006/11/16 01:33:05 christos Exp $ */
+/* $NetBSD: sb_isapnp.c,v 1.51 2007/10/19 12:00:33 ad Exp $ */
/*
* Copyright (c) 1991-1993 Regents of the University of California.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sb_isapnp.c,v 1.50 2006/11/16 01:33:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sb_isapnp.c,v 1.51 2007/10/19 12:00:33 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: sb_isapnp.c,v 1.50 2006/11/16 01:33:05 christos Exp
#include <sys/device.h>
#include <sys/proc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/audioio.h>
#include <dev/audio_if.h>
diff --git a/sys/dev/isapnp/wdc_isapnp.c b/sys/dev/isapnp/wdc_isapnp.c
index eb2cd82baee..a083aa37f7f 100644
--- a/sys/dev/isapnp/wdc_isapnp.c
+++ b/sys/dev/isapnp/wdc_isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc_isapnp.c,v 1.36 2006/11/16 01:33:05 christos Exp $ */
+/* $NetBSD: wdc_isapnp.c,v 1.37 2007/10/19 12:00:33 ad Exp $ */
/*-
* Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
@@ -37,15 +37,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_isapnp.c,v 1.36 2006/11/16 01:33:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_isapnp.c,v 1.37 2007/10/19 12:00:33 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/isa/isavar.h>
#include <dev/isa/isadmavar.h>
diff --git a/sys/dev/isapnp/wss_isapnp.c b/sys/dev/isapnp/wss_isapnp.c
index 60d2f96e454..94020b5b0ab 100644
--- a/sys/dev/isapnp/wss_isapnp.c
+++ b/sys/dev/isapnp/wss_isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wss_isapnp.c,v 1.20 2006/11/16 01:33:05 christos Exp $ */
+/* $NetBSD: wss_isapnp.c,v 1.21 2007/10/19 12:00:33 ad Exp $ */
/*
* Copyright (c) 1997, 1999 The NetBSD Foundation, Inc.
@@ -37,14 +37,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wss_isapnp.c,v 1.20 2006/11/16 01:33:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wss_isapnp.c,v 1.21 2007/10/19 12:00:33 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/errno.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/audioio.h>
#include <dev/audio_if.h>
diff --git a/sys/dev/marvell/gt.c b/sys/dev/marvell/gt.c
index 4f5db6f0104..bdc40e12a5c 100644
--- a/sys/dev/marvell/gt.c
+++ b/sys/dev/marvell/gt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: gt.c,v 1.13 2007/01/29 01:52:44 hubertf Exp $ */
+/* $NetBSD: gt.c,v 1.14 2007/10/19 12:00:33 ad Exp $ */
/*
* Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gt.c,v 1.13 2007/01/29 01:52:44 hubertf Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gt.c,v 1.14 2007/10/19 12:00:33 ad Exp $");
#include "opt_marvell.h"
#include "locators.h"
@@ -56,7 +56,7 @@ __KERNEL_RCSID(0, "$NetBSD: gt.c,v 1.13 2007/01/29 01:52:44 hubertf Exp $");
#define _BUS_SPACE_PRIVATE
#define _BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <powerpc/spr.h>
#include <powerpc/oea/hid.h>
diff --git a/sys/dev/marvell/gti2c.c b/sys/dev/marvell/gti2c.c
index c7718855d2f..325bf4d0980 100644
--- a/sys/dev/marvell/gti2c.c
+++ b/sys/dev/marvell/gti2c.c
@@ -1,4 +1,4 @@
-/* $NetBSD: gti2c.c,v 1.5 2006/06/26 18:21:39 drochner Exp $ */
+/* $NetBSD: gti2c.c,v 1.6 2007/10/19 12:00:33 ad Exp $ */
/*
* Copyright (c) 2005 Brocade Communcations, inc.
@@ -32,15 +32,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gti2c.c,v 1.5 2006/06/26 18:21:39 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gti2c.c,v 1.6 2007/10/19 12:00:33 ad Exp $");
#include <sys/param.h>
#include <sys/device.h>
#include <sys/conf.h>
#include <sys/proc.h>
-#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
#include <dev/marvell/gtintrreg.h>
#include <dev/marvell/gti2creg.h>
diff --git a/sys/dev/marvell/gtidma.c b/sys/dev/marvell/gtidma.c
index dd7e9a1043a..fbbac36ccfc 100644
--- a/sys/dev/marvell/gtidma.c
+++ b/sys/dev/marvell/gtidma.c
@@ -1,4 +1,4 @@
-/* $NetBSD: gtidma.c,v 1.11 2007/07/09 21:00:51 ad Exp $ */
+/* $NetBSD: gtidma.c,v 1.12 2007/10/19 12:00:33 ad Exp $ */
/*
* Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gtidma.c,v 1.11 2007/07/09 21:00:51 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gtidma.c,v 1.12 2007/10/19 12:00:33 ad Exp $");
#include "opt_idma.h"
#include "opt_ddb.h"
@@ -59,8 +59,8 @@ __KERNEL_RCSID(0, "$NetBSD: gtidma.c,v 1.11 2007/07/09 21:00:51 ad Exp $");
#include <uvm/uvm_extern.h>
#include <machine/psl.h>
-#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <powerpc/atomic.h>
diff --git a/sys/dev/marvell/gtmpsc.c b/sys/dev/marvell/gtmpsc.c
index 0f28f459bb5..30bd78368fb 100644
--- a/sys/dev/marvell/gtmpsc.c
+++ b/sys/dev/marvell/gtmpsc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: gtmpsc.c,v 1.25 2007/10/17 00:43:51 garbled Exp $ */
+/* $NetBSD: gtmpsc.c,v 1.26 2007/10/19 12:00:33 ad Exp $ */
/*
* Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gtmpsc.c,v 1.25 2007/10/17 00:43:51 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gtmpsc.c,v 1.26 2007/10/19 12:00:33 ad Exp $");
#include "opt_kgdb.h"
@@ -68,8 +68,8 @@ __KERNEL_RCSID(0, "$NetBSD: gtmpsc.c,v 1.25 2007/10/17 00:43:51 garbled Exp $");
#include <powerpc/atomic.h>
#include <dev/cons.h>
-#include <machine/bus.h>
-#include <machine/cpu.h> /* for DELAY */
+#include <sys/bus.h>
+#include <sys/cpu.h> /* for DELAY */
#include <machine/stdarg.h>
#include "gtmpsc.h"
diff --git a/sys/dev/marvell/gtpci.c b/sys/dev/marvell/gtpci.c
index 49cbbd6c15e..0965535575c 100644
--- a/sys/dev/marvell/gtpci.c
+++ b/sys/dev/marvell/gtpci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: gtpci.c,v 1.15 2007/01/29 01:52:44 hubertf Exp $ */
+/* $NetBSD: gtpci.c,v 1.16 2007/10/19 12:00:33 ad Exp $ */
/*
* Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gtpci.c,v 1.15 2007/01/29 01:52:44 hubertf Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gtpci.c,v 1.16 2007/10/19 12:00:33 ad Exp $");
#include "opt_marvell.h"
#include <sys/param.h>
@@ -49,8 +49,8 @@ __KERNEL_RCSID(0, "$NetBSD: gtpci.c,v 1.15 2007/01/29 01:52:44 hubertf Exp $");
#define _BUS_SPACE_PRIVATE
#define _BUS_DMA_PRIVATE
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
diff --git a/sys/dev/marvell/if_gfe.c b/sys/dev/marvell/if_gfe.c
index 9ab518620f6..23a9dc32235 100644
--- a/sys/dev/marvell/if_gfe.c
+++ b/sys/dev/marvell/if_gfe.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gfe.c,v 1.25 2007/09/01 07:32:29 dyoung Exp $ */
+/* $NetBSD: if_gfe.c,v 1.26 2007/10/19 12:00:33 ad Exp $ */
/*
* Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_gfe.c,v 1.25 2007/09/01 07:32:29 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gfe.c,v 1.26 2007/10/19 12:00:33 ad Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -61,7 +61,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_gfe.c,v 1.25 2007/09/01 07:32:29 dyoung Exp $");
#include <sys/mbuf.h>
#include <sys/socket.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <net/if.h>
#include <net/if_dl.h>
diff --git a/sys/dev/marvell/obio.c b/sys/dev/marvell/obio.c
index 166add8d277..abcf8c4448c 100644
--- a/sys/dev/marvell/obio.c
+++ b/sys/dev/marvell/obio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: obio.c,v 1.9 2007/01/29 01:52:44 hubertf Exp $ */
+/* $NetBSD: obio.c,v 1.10 2007/10/19 12:00:34 ad Exp $ */
/*
* Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.9 2007/01/29 01:52:44 hubertf Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.10 2007/10/19 12:00:34 ad Exp $");
#include "opt_marvell.h"
@@ -55,7 +55,7 @@ __KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.9 2007/01/29 01:52:44 hubertf Exp $");
#define _BUS_SPACE_PRIVATE
#define _BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <powerpc/spr.h>
#include <powerpc/oea/hid.h>
diff --git a/sys/dev/mca/aha_mca.c b/sys/dev/mca/aha_mca.c
index 72a68120e23..e4eb8074d6b 100644
--- a/sys/dev/mca/aha_mca.c
+++ b/sys/dev/mca/aha_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aha_mca.c,v 1.16 2006/11/16 01:33:05 christos Exp $ */
+/* $NetBSD: aha_mca.c,v 1.17 2007/10/19 12:00:34 ad Exp $ */
/*
* Copyright (c) 2000-2002 The NetBSD Foundation, Inc.
@@ -52,14 +52,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aha_mca.c,v 1.16 2006/11/16 01:33:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aha_mca.c,v 1.17 2007/10/19 12:00:34 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/scsipi/scsi_all.h>
#include <dev/scsipi/scsipi_all.h>
diff --git a/sys/dev/mca/com_mca.c b/sys/dev/mca/com_mca.c
index f5155906f19..b9aa7b0cdfc 100644
--- a/sys/dev/mca/com_mca.c
+++ b/sys/dev/mca/com_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: com_mca.c,v 1.17 2006/11/16 01:33:05 christos Exp $ */
+/* $NetBSD: com_mca.c,v 1.18 2007/10/19 12:00:34 ad Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_mca.c,v 1.17 2006/11/16 01:33:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_mca.c,v 1.18 2007/10/19 12:00:34 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -87,8 +87,8 @@ __KERNEL_RCSID(0, "$NetBSD: com_mca.c,v 1.17 2006/11/16 01:33:05 christos Exp $"
#include <sys/syslog.h>
#include <sys/device.h>
-#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
#include <dev/ic/comreg.h>
#include <dev/ic/comvar.h>
diff --git a/sys/dev/mca/ed_mca.c b/sys/dev/mca/ed_mca.c
index 8b05fa35016..13746d70902 100644
--- a/sys/dev/mca/ed_mca.c
+++ b/sys/dev/mca/ed_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ed_mca.c,v 1.38 2007/10/08 16:41:12 ad Exp $ */
+/* $NetBSD: ed_mca.c,v 1.39 2007/10/19 12:00:34 ad Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ed_mca.c,v 1.38 2007/10/08 16:41:12 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ed_mca.c,v 1.39 2007/10/19 12:00:34 ad Exp $");
#include "rnd.h"
@@ -63,8 +63,8 @@ __KERNEL_RCSID(0, "$NetBSD: ed_mca.c,v 1.38 2007/10/08 16:41:12 ad Exp $");
#include <sys/rnd.h>
#endif
-#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
#include <dev/mca/mcavar.h>
diff --git a/sys/dev/mca/edc_mca.c b/sys/dev/mca/edc_mca.c
index 122b1ab8aa3..fcf6496af64 100644
--- a/sys/dev/mca/edc_mca.c
+++ b/sys/dev/mca/edc_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: edc_mca.c,v 1.37 2007/07/29 12:50:21 ad Exp $ */
+/* $NetBSD: edc_mca.c,v 1.38 2007/10/19 12:00:34 ad Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: edc_mca.c,v 1.37 2007/07/29 12:50:21 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: edc_mca.c,v 1.38 2007/10/19 12:00:34 ad Exp $");
#include "rnd.h"
@@ -73,8 +73,8 @@ __KERNEL_RCSID(0, "$NetBSD: edc_mca.c,v 1.37 2007/07/29 12:50:21 ad Exp $");
#include <sys/rnd.h>
#endif
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/mca/mcareg.h>
#include <dev/mca/mcavar.h>
diff --git a/sys/dev/mca/esp_mca.c b/sys/dev/mca/esp_mca.c
index a3c0f788b96..35a1802c62d 100644
--- a/sys/dev/mca/esp_mca.c
+++ b/sys/dev/mca/esp_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: esp_mca.c,v 1.15 2007/03/04 06:02:14 christos Exp $ */
+/* $NetBSD: esp_mca.c,v 1.16 2007/10/19 12:00:34 ad Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esp_mca.c,v 1.15 2007/03/04 06:02:14 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esp_mca.c,v 1.16 2007/10/19 12:00:34 ad Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -64,8 +64,8 @@ __KERNEL_RCSID(0, "$NetBSD: esp_mca.c,v 1.15 2007/03/04 06:02:14 christos Exp $"
#include <dev/scsipi/scsiconf.h>
#include <dev/scsipi/scsi_message.h>
-#include <machine/bus.h>
-#include <machine/cpu.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
#include <dev/ic/ncr53c9xreg.h>
#include <dev/ic/ncr53c9xvar.h>
diff --git a/sys/dev/mca/if_ate_mca.c b/sys/dev/mca/if_ate_mca.c
index e75c7c8bcab..c8ee9bcb746 100644
--- a/sys/dev/mca/if_ate_mca.c
+++ b/sys/dev/mca/if_ate_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ate_mca.c,v 1.17 2006/11/16 01:33:05 christos Exp $ */
+/* $NetBSD: if_ate_mca.c,v 1.18 2007/10/19 12:00:34 ad Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ate_mca.c,v 1.17 2006/11/16 01:33:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ate_mca.c,v 1.18 2007/10/19 12:00:34 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -53,8 +53,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_ate_mca.c,v 1.17 2006/11/16 01:33:05 christos Exp
#include <net/if_ether.h>
#include <net/if_media.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/ic/mb86960reg.h>
#include <dev/ic/mb86960var.h>
diff --git a/sys/dev/mca/if_elmc_mca.c b/sys/dev/mca/if_elmc_mca.c
index bfeddb0d59d..f33eec1bc32 100644
--- a/sys/dev/mca/if_elmc_mca.c
+++ b/sys/dev/mca/if_elmc_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_elmc_mca.c,v 1.22 2006/11/16 01:33:05 christos Exp $ */
+/* $NetBSD: if_elmc_mca.c,v 1.23 2007/10/19 12:00:34 ad Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_elmc_mca.c,v 1.22 2006/11/16 01:33:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_elmc_mca.c,v 1.23 2007/10/19 12:00:34 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -61,7 +61,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_elmc_mca.c,v 1.22 2006/11/16 01:33:05 christos Ex
#include <net/if_media.h>
#include <net/if_ether.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/i82586reg.h>
#include <dev/ic/i82586var.h>
diff --git a/sys/dev/mca/if_ep_mca.c b/sys/dev/mca/if_ep_mca.c
index 2ebe65bf4e1..0082c9d8c1c 100644
--- a/sys/dev/mca/if_ep_mca.c
+++ b/sys/dev/mca/if_ep_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ep_mca.c,v 1.17 2006/11/16 01:33:05 christos Exp $ */
+/* $NetBSD: if_ep_mca.c,v 1.18 2007/10/19 12:00:35 ad Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ep_mca.c,v 1.17 2006/11/16 01:33:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ep_mca.c,v 1.18 2007/10/19 12:00:35 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -90,7 +90,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_ep_mca.c,v 1.17 2006/11/16 01:33:05 christos Exp
#include <net/if_ether.h>
#include <net/if_media.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/mii/miivar.h>
diff --git a/sys/dev/mca/if_le_mca.c b/sys/dev/mca/if_le_mca.c
index 62029501e4c..480cad9e82b 100644
--- a/sys/dev/mca/if_le_mca.c
+++ b/sys/dev/mca/if_le_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le_mca.c,v 1.15 2006/11/16 01:33:05 christos Exp $ */
+/* $NetBSD: if_le_mca.c,v 1.16 2007/10/19 12:00:35 ad Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le_mca.c,v 1.15 2006/11/16 01:33:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le_mca.c,v 1.16 2007/10/19 12:00:35 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -67,9 +67,9 @@ __KERNEL_RCSID(0, "$NetBSD: if_le_mca.c,v 1.15 2006/11/16 01:33:05 christos Exp
#include <net/if_ether.h>
#include <net/if_media.h>
-#include <machine/cpu.h>
-#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/cpu.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
#include <dev/ic/lancereg.h>
#include <dev/ic/lancevar.h>
diff --git a/sys/dev/mca/if_ne_mca.c b/sys/dev/mca/if_ne_mca.c
index c89d6ea3bd9..418e5dc885f 100644
--- a/sys/dev/mca/if_ne_mca.c
+++ b/sys/dev/mca/if_ne_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ne_mca.c,v 1.12 2006/11/16 01:33:05 christos Exp $ */
+/* $NetBSD: if_ne_mca.c,v 1.13 2007/10/19 12:00:35 ad Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ne_mca.c,v 1.12 2006/11/16 01:33:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ne_mca.c,v 1.13 2007/10/19 12:00:35 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -60,7 +60,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_ne_mca.c,v 1.12 2006/11/16 01:33:05 christos Exp
#include <net/if_media.h>
#include <net/if_ether.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/dp8390reg.h>
#include <dev/ic/dp8390var.h>
diff --git a/sys/dev/mca/if_tra_mca.c b/sys/dev/mca/if_tra_mca.c
index 0efc82d2449..6a1627c8d57 100644
--- a/sys/dev/mca/if_tra_mca.c
+++ b/sys/dev/mca/if_tra_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tra_mca.c,v 1.7 2006/11/16 01:33:05 christos Exp $ */
+/* $NetBSD: if_tra_mca.c,v 1.8 2007/10/19 12:00:35 ad Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tra_mca.c,v 1.7 2006/11/16 01:33:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tra_mca.c,v 1.8 2007/10/19 12:00:35 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -54,8 +54,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_tra_mca.c,v 1.7 2006/11/16 01:33:05 christos Exp
#include <net/if_ether.h>
#include <net/if_media.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/ic/mb86950reg.h>
#include <dev/ic/mb86950var.h>
diff --git a/sys/dev/mca/if_we_mca.c b/sys/dev/mca/if_we_mca.c
index 287eaeec589..b3f012b6c02 100644
--- a/sys/dev/mca/if_we_mca.c
+++ b/sys/dev/mca/if_we_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_we_mca.c,v 1.18 2006/11/16 01:33:05 christos Exp $ */
+/* $NetBSD: if_we_mca.c,v 1.19 2007/10/19 12:00:35 ad Exp $ */
/*-
* Copyright (c) 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_we_mca.c,v 1.18 2006/11/16 01:33:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_we_mca.c,v 1.19 2007/10/19 12:00:35 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -73,7 +73,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_we_mca.c,v 1.18 2006/11/16 01:33:05 christos Exp
#include <net/if_media.h>
#include <net/if_ether.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/mca/mcareg.h>
#include <dev/mca/mcavar.h>
diff --git a/sys/dev/mca/mca.c b/sys/dev/mca/mca.c
index 7160f041e16..464846caf4d 100644
--- a/sys/dev/mca/mca.c
+++ b/sys/dev/mca/mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mca.c,v 1.23 2007/04/11 18:32:19 garbled Exp $ */
+/* $NetBSD: mca.c,v 1.24 2007/10/19 12:00:35 ad Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -42,13 +42,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mca.c,v 1.23 2007/04/11 18:32:19 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mca.c,v 1.24 2007/10/19 12:00:35 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/mca_machdep.h>
#include <dev/mca/mcareg.h>
diff --git a/sys/dev/mca/mcavar.h b/sys/dev/mca/mcavar.h
index 3362b2eae91..ccec7f00906 100644
--- a/sys/dev/mca/mcavar.h
+++ b/sys/dev/mca/mcavar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mcavar.h,v 1.9 2005/12/11 12:22:18 christos Exp $ */
+/* $NetBSD: mcavar.h,v 1.10 2007/10/19 12:00:35 ad Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
* separated into mca_machdep.h.
*/
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/mca_machdep.h>
struct mcabus_attach_args {
diff --git a/sys/dev/mii/ciphy.c b/sys/dev/mii/ciphy.c
index b02c9c91e83..38e4a3610a5 100644
--- a/sys/dev/mii/ciphy.c
+++ b/sys/dev/mii/ciphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ciphy.c,v 1.11 2006/11/26 15:40:14 tsutsui Exp $ */
+/* $NetBSD: ciphy.c,v 1.12 2007/10/19 12:00:35 ad Exp $ */
/*-
* Copyright (c) 2004
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ciphy.c,v 1.11 2006/11/26 15:40:14 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ciphy.c,v 1.12 2007/10/19 12:00:35 ad Exp $");
/*
* Driver for the Cicada CS8201 10/100/1000 copper PHY.
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: ciphy.c,v 1.11 2006/11/26 15:40:14 tsutsui Exp $");
#include <sys/device.h>
#include <sys/kernel.h>
#include <sys/socket.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <net/if.h>
#include <net/if_arp.h>
diff --git a/sys/dev/mii/rlphy.c b/sys/dev/mii/rlphy.c
index 8118f3d8239..2104c3e1c7a 100644
--- a/sys/dev/mii/rlphy.c
+++ b/sys/dev/mii/rlphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rlphy.c,v 1.16 2007/10/13 13:05:19 isaki Exp $ */
+/* $NetBSD: rlphy.c,v 1.17 2007/10/19 12:00:35 ad Exp $ */
/* $OpenBSD: rlphy.c,v 1.20 2005/07/31 05:27:30 pvalchev Exp $ */
/*
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rlphy.c,v 1.16 2007/10/13 13:05:19 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rlphy.c,v 1.17 2007/10/19 12:00:35 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -53,7 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: rlphy.c,v 1.16 2007/10/13 13:05:19 isaki Exp $");
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
#include <dev/mii/miidevs.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/rtl81x9reg.h>
struct rlphy_softc {
diff --git a/sys/dev/mii/tlphy.c b/sys/dev/mii/tlphy.c
index 8c3a591e107..de7229de166 100644
--- a/sys/dev/mii/tlphy.c
+++ b/sys/dev/mii/tlphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tlphy.c,v 1.50 2006/11/16 21:24:07 christos Exp $ */
+/* $NetBSD: tlphy.c,v 1.51 2007/10/19 12:00:36 ad Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tlphy.c,v 1.50 2006/11/16 21:24:07 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tlphy.c,v 1.51 2007/10/19 12:00:36 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -80,7 +80,7 @@ __KERNEL_RCSID(0, "$NetBSD: tlphy.c,v 1.50 2006/11/16 21:24:07 christos Exp $");
#include <sys/socket.h>
#include <sys/errno.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <net/if.h>
#include <net/if_media.h>
diff --git a/sys/dev/mscp/mscp.c b/sys/dev/mscp/mscp.c
index 6b0c9d57533..95a42955c39 100644
--- a/sys/dev/mscp/mscp.c
+++ b/sys/dev/mscp/mscp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mscp.c,v 1.26 2007/07/29 12:15:43 ad Exp $ */
+/* $NetBSD: mscp.c,v 1.27 2007/10/19 12:00:36 ad Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mscp.c,v 1.26 2007/07/29 12:15:43 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mscp.c,v 1.27 2007/10/19 12:00:36 ad Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -87,7 +87,7 @@ __KERNEL_RCSID(0, "$NetBSD: mscp.c,v 1.26 2007/07/29 12:15:43 ad Exp $");
#include <sys/proc.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/mscp/mscp.h>
#include <dev/mscp/mscpreg.h>
diff --git a/sys/dev/mscp/mscp_disk.c b/sys/dev/mscp/mscp_disk.c
index 7a383b607bb..79fdce09742 100644
--- a/sys/dev/mscp/mscp_disk.c
+++ b/sys/dev/mscp/mscp_disk.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mscp_disk.c,v 1.57 2007/10/08 16:41:12 ad Exp $ */
+/* $NetBSD: mscp_disk.c,v 1.58 2007/10/19 12:00:36 ad Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
@@ -81,7 +81,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mscp_disk.c,v 1.57 2007/10/08 16:41:12 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mscp_disk.c,v 1.58 2007/10/19 12:00:36 ad Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -100,8 +100,8 @@ __KERNEL_RCSID(0, "$NetBSD: mscp_disk.c,v 1.57 2007/10/08 16:41:12 ad Exp $");
#include <ufs/ufs/dinode.h>
#include <ufs/ffs/fs.h>
-#include <machine/bus.h>
-#include <machine/cpu.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
#include <dev/mscp/mscp.h>
#include <dev/mscp/mscpreg.h>
diff --git a/sys/dev/mscp/mscp_subr.c b/sys/dev/mscp/mscp_subr.c
index f47f3b7123b..fce67472529 100644
--- a/sys/dev/mscp/mscp_subr.c
+++ b/sys/dev/mscp/mscp_subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mscp_subr.c,v 1.33 2007/04/29 20:23:35 msaitoh Exp $ */
+/* $NetBSD: mscp_subr.c,v 1.34 2007/10/19 12:00:36 ad Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mscp_subr.c,v 1.33 2007/04/29 20:23:35 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mscp_subr.c,v 1.34 2007/10/19 12:00:36 ad Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -84,7 +84,7 @@ __KERNEL_RCSID(0, "$NetBSD: mscp_subr.c,v 1.33 2007/04/29 20:23:35 msaitoh Exp $
#include <sys/systm.h>
#include <sys/proc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/sid.h>
#include <dev/mscp/mscp.h>
diff --git a/sys/dev/mscp/mscp_tape.c b/sys/dev/mscp/mscp_tape.c
index 4f32fedaec5..79b7a888332 100644
--- a/sys/dev/mscp/mscp_tape.c
+++ b/sys/dev/mscp/mscp_tape.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mscp_tape.c,v 1.31 2007/07/29 12:15:43 ad Exp $ */
+/* $NetBSD: mscp_tape.c,v 1.32 2007/10/19 12:00:36 ad Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mscp_tape.c,v 1.31 2007/07/29 12:15:43 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mscp_tape.c,v 1.32 2007/10/19 12:00:36 ad Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -56,8 +56,8 @@ __KERNEL_RCSID(0, "$NetBSD: mscp_tape.c,v 1.31 2007/07/29 12:15:43 ad Exp $");
#include <sys/proc.h>
#include <sys/conf.h>
-#include <machine/bus.h>
-#include <machine/cpu.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
#include <dev/mscp/mscp.h>
#include <dev/mscp/mscpreg.h>
diff --git a/sys/dev/mvme/clmpcc_pcctwo.c b/sys/dev/mvme/clmpcc_pcctwo.c
index 19a5b608c82..f07ab6a1d3a 100644
--- a/sys/dev/mvme/clmpcc_pcctwo.c
+++ b/sys/dev/mvme/clmpcc_pcctwo.c
@@ -1,4 +1,4 @@
-/* $NetBSD: clmpcc_pcctwo.c,v 1.12 2006/08/07 01:31:36 mhitch Exp $ */
+/* $NetBSD: clmpcc_pcctwo.c,v 1.13 2007/10/19 12:00:36 ad Exp $ */
/*-
* Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clmpcc_pcctwo.c,v 1.12 2006/08/07 01:31:36 mhitch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clmpcc_pcctwo.c,v 1.13 2007/10/19 12:00:36 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -57,9 +57,9 @@ __KERNEL_RCSID(0, "$NetBSD: clmpcc_pcctwo.c,v 1.12 2006/08/07 01:31:36 mhitch Ex
#include <dev/cons.h>
-#include <machine/cpu.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/cpu.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/ic/clmpccvar.h>
diff --git a/sys/dev/mvme/clock_pcctwo.c b/sys/dev/mvme/clock_pcctwo.c
index 3b053e5f727..b21a8ee8db3 100644
--- a/sys/dev/mvme/clock_pcctwo.c
+++ b/sys/dev/mvme/clock_pcctwo.c
@@ -1,4 +1,4 @@
-/* $NetBSD: clock_pcctwo.c,v 1.10 2006/03/29 07:07:41 thorpej Exp $ */
+/* $NetBSD: clock_pcctwo.c,v 1.11 2007/10/19 12:00:36 ad Exp $ */
/*-
* Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock_pcctwo.c,v 1.10 2006/03/29 07:07:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock_pcctwo.c,v 1.11 2007/10/19 12:00:36 ad Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: clock_pcctwo.c,v 1.10 2006/03/29 07:07:41 thorpej Ex
#include <sys/device.h>
#include <machine/psl.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/mvme/clockvar.h>
#include <dev/mvme/pcctwovar.h>
diff --git a/sys/dev/mvme/if_ie_mvme.c b/sys/dev/mvme/if_ie_mvme.c
index 02e0f586cf7..d7e35cd9f26 100644
--- a/sys/dev/mvme/if_ie_mvme.c
+++ b/sys/dev/mvme/if_ie_mvme.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ie_mvme.c,v 1.10 2007/03/04 06:02:15 christos Exp $ */
+/* $NetBSD: if_ie_mvme.c,v 1.11 2007/10/19 12:00:36 ad Exp $ */
/*-
* Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ie_mvme.c,v 1.10 2007/03/04 06:02:15 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ie_mvme.c,v 1.11 2007/10/19 12:00:36 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -56,8 +56,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_ie_mvme.c,v 1.10 2007/03/04 06:02:15 christos Exp
#include <uvm/uvm_extern.h>
#include <machine/autoconf.h>
-#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/cpu.h>
+#include <sys/bus.h>
#include <dev/ic/i82586reg.h>
#include <dev/ic/i82586var.h>
diff --git a/sys/dev/mvme/lpt_mvme.c b/sys/dev/mvme/lpt_mvme.c
index bbed79b2f23..3ba621eb4e5 100644
--- a/sys/dev/mvme/lpt_mvme.c
+++ b/sys/dev/mvme/lpt_mvme.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lpt_mvme.c,v 1.10 2007/10/08 20:12:06 ad Exp $ */
+/* $NetBSD: lpt_mvme.c,v 1.11 2007/10/19 12:00:36 ad Exp $ */
/*-
* Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lpt_mvme.c,v 1.10 2007/10/08 20:12:06 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lpt_mvme.c,v 1.11 2007/10/19 12:00:36 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -105,8 +105,8 @@ __KERNEL_RCSID(0, "$NetBSD: lpt_mvme.c,v 1.10 2007/10/08 20:12:06 ad Exp $");
#include <sys/conf.h>
#include <sys/syslog.h>
-#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/cpu.h>
+#include <sys/bus.h>
#include <dev/mvme/lptvar.h>
diff --git a/sys/dev/mvme/lpt_pcctwo.c b/sys/dev/mvme/lpt_pcctwo.c
index bba23bc3a49..5a934c5f422 100644
--- a/sys/dev/mvme/lpt_pcctwo.c
+++ b/sys/dev/mvme/lpt_pcctwo.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lpt_pcctwo.c,v 1.8 2006/03/29 07:07:41 thorpej Exp $ */
+/* $NetBSD: lpt_pcctwo.c,v 1.9 2007/10/19 12:00:37 ad Exp $ */
/*-
* Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lpt_pcctwo.c,v 1.8 2006/03/29 07:07:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lpt_pcctwo.c,v 1.9 2007/10/19 12:00:37 ad Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -49,8 +49,8 @@ __KERNEL_RCSID(0, "$NetBSD: lpt_pcctwo.c,v 1.8 2006/03/29 07:07:41 thorpej Exp $
#include <sys/device.h>
#include <sys/syslog.h>
-#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/cpu.h>
+#include <sys/bus.h>
#include <dev/mvme/lptvar.h>
#include <dev/mvme/pcctworeg.h>
diff --git a/sys/dev/mvme/memc.c b/sys/dev/mvme/memc.c
index d7ec3bc6007..e502b7d9694 100644
--- a/sys/dev/mvme/memc.c
+++ b/sys/dev/mvme/memc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: memc.c,v 1.6 2005/12/11 12:22:48 christos Exp $ */
+/* $NetBSD: memc.c,v 1.7 2007/10/19 12:00:37 ad Exp $ */
/*-
* Copyright (c) 2000, 2002 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: memc.c,v 1.6 2005/12/11 12:22:48 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: memc.c,v 1.7 2007/10/19 12:00:37 ad Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -50,8 +50,8 @@ __KERNEL_RCSID(0, "$NetBSD: memc.c,v 1.6 2005/12/11 12:22:48 christos Exp $");
#include <sys/device.h>
#include <sys/malloc.h>
-#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/cpu.h>
+#include <sys/bus.h>
#include <dev/mvme/memcvar.h>
#include <dev/mvme/memcreg.h>
diff --git a/sys/dev/mvme/mvmebus.c b/sys/dev/mvme/mvmebus.c
index 44074764172..2a0cb42cd58 100644
--- a/sys/dev/mvme/mvmebus.c
+++ b/sys/dev/mvme/mvmebus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mvmebus.c,v 1.11 2007/03/04 06:02:15 christos Exp $ */
+/* $NetBSD: mvmebus.c,v 1.12 2007/10/19 12:00:37 ad Exp $ */
/*-
* Copyright (c) 2000, 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mvmebus.c,v 1.11 2007/03/04 06:02:15 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mvmebus.c,v 1.12 2007/10/19 12:00:37 ad Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -46,8 +46,8 @@ __KERNEL_RCSID(0, "$NetBSD: mvmebus.c,v 1.11 2007/03/04 06:02:15 christos Exp $"
#include <sys/malloc.h>
#include <sys/kcore.h>
-#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/cpu.h>
+#include <sys/bus.h>
#include <dev/vme/vmereg.h>
#include <dev/vme/vmevar.h>
diff --git a/sys/dev/mvme/osiop_pcctwo.c b/sys/dev/mvme/osiop_pcctwo.c
index 7d081d515ef..6e962ac4667 100644
--- a/sys/dev/mvme/osiop_pcctwo.c
+++ b/sys/dev/mvme/osiop_pcctwo.c
@@ -1,4 +1,4 @@
-/* $NetBSD: osiop_pcctwo.c,v 1.10 2006/03/29 07:07:41 thorpej Exp $ */
+/* $NetBSD: osiop_pcctwo.c,v 1.11 2007/10/19 12:00:37 ad Exp $ */
/*-
* Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: osiop_pcctwo.c,v 1.10 2006/03/29 07:07:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: osiop_pcctwo.c,v 1.11 2007/10/19 12:00:37 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -53,8 +53,8 @@ __KERNEL_RCSID(0, "$NetBSD: osiop_pcctwo.c,v 1.10 2006/03/29 07:07:41 thorpej Ex
#include <dev/scsipi/scsipi_all.h>
#include <dev/scsipi/scsiconf.h>
-#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/cpu.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <dev/ic/osiopreg.h>
diff --git a/sys/dev/mvme/pcctwo.c b/sys/dev/mvme/pcctwo.c
index f3d9072cf9b..d0f8eee847c 100644
--- a/sys/dev/mvme/pcctwo.c
+++ b/sys/dev/mvme/pcctwo.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pcctwo.c,v 1.6 2005/12/11 12:22:48 christos Exp $ */
+/* $NetBSD: pcctwo.c,v 1.7 2007/10/19 12:00:37 ad Exp $ */
/*-
* Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
@@ -41,15 +41,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcctwo.c,v 1.6 2005/12/11 12:22:48 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcctwo.c,v 1.7 2007/10/19 12:00:37 ad Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/cpu.h>
+#include <sys/bus.h>
#include <dev/mvme/pcctworeg.h>
#include <dev/mvme/pcctwovar.h>
diff --git a/sys/dev/mvme/vme_two.c b/sys/dev/mvme/vme_two.c
index 2041c46a323..68163bbfee4 100644
--- a/sys/dev/mvme/vme_two.c
+++ b/sys/dev/mvme/vme_two.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vme_two.c,v 1.5 2005/12/11 12:22:48 christos Exp $ */
+/* $NetBSD: vme_two.c,v 1.6 2007/10/19 12:00:37 ad Exp $ */
/*-
* Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vme_two.c,v 1.5 2005/12/11 12:22:48 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vme_two.c,v 1.6 2007/10/19 12:00:37 ad Exp $");
#include "vmetwo.h"
@@ -50,8 +50,8 @@ __KERNEL_RCSID(0, "$NetBSD: vme_two.c,v 1.5 2005/12/11 12:22:48 christos Exp $")
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/cpu.h>
+#include <sys/bus.h>
#include <dev/vme/vmereg.h>
#include <dev/vme/vmevar.h>
diff --git a/sys/dev/mvme/vme_two_isr.c b/sys/dev/mvme/vme_two_isr.c
index 8e8afc68474..a9c6b126cc9 100644
--- a/sys/dev/mvme/vme_two_isr.c
+++ b/sys/dev/mvme/vme_two_isr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vme_two_isr.c,v 1.6 2005/12/11 12:22:48 christos Exp $ */
+/* $NetBSD: vme_two_isr.c,v 1.7 2007/10/19 12:00:37 ad Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vme_two_isr.c,v 1.6 2005/12/11 12:22:48 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vme_two_isr.c,v 1.7 2007/10/19 12:00:37 ad Exp $");
#include "vmetwo.h"
@@ -54,8 +54,8 @@ __KERNEL_RCSID(0, "$NetBSD: vme_two_isr.c,v 1.6 2005/12/11 12:22:48 christos Exp
#include <sys/malloc.h>
#include <sys/lock.h>
-#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/cpu.h>
+#include <sys/bus.h>
#include <dev/vme/vmereg.h>
#include <dev/vme/vmevar.h>
diff --git a/sys/dev/ofisa/atppc_ofisa.c b/sys/dev/ofisa/atppc_ofisa.c
index 82e39f73ddb..5de19666010 100644
--- a/sys/dev/ofisa/atppc_ofisa.c
+++ b/sys/dev/ofisa/atppc_ofisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: atppc_ofisa.c,v 1.5 2007/03/04 06:02:15 christos Exp $ */
+/* $NetBSD: atppc_ofisa.c,v 1.6 2007/10/19 12:00:37 ad Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atppc_ofisa.c,v 1.5 2007/03/04 06:02:15 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atppc_ofisa.c,v 1.6 2007/10/19 12:00:37 ad Exp $");
#include "opt_atppc.h"
@@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: atppc_ofisa.c,v 1.5 2007/03/04 06:02:15 christos Exp
#include <sys/proc.h>
#include <sys/termios.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ofw/openfirm.h>
#include <dev/isa/isavar.h>
diff --git a/sys/dev/ofisa/com_ofisa.c b/sys/dev/ofisa/com_ofisa.c
index 1b1db6ed3b6..8e42449612d 100644
--- a/sys/dev/ofisa/com_ofisa.c
+++ b/sys/dev/ofisa/com_ofisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: com_ofisa.c,v 1.11 2006/07/13 22:56:02 gdamore Exp $ */
+/* $NetBSD: com_ofisa.c,v 1.12 2007/10/19 12:00:37 ad Exp $ */
/*
* Copyright 1997, 1998
@@ -38,15 +38,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_ofisa.c,v 1.11 2006/07/13 22:56:02 gdamore Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_ofisa.c,v 1.12 2007/10/19 12:00:37 ad Exp $");
#include <sys/param.h>
#include <sys/device.h>
#include <sys/systm.h>
#include <sys/tty.h>
-#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
#include <dev/ofw/openfirm.h>
#include <dev/isa/isavar.h>
diff --git a/sys/dev/ofisa/ess_ofisa.c b/sys/dev/ofisa/ess_ofisa.c
index 68b6f816e99..f42b677deaf 100644
--- a/sys/dev/ofisa/ess_ofisa.c
+++ b/sys/dev/ofisa/ess_ofisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ess_ofisa.c,v 1.17 2006/03/29 07:09:33 thorpej Exp $ */
+/* $NetBSD: ess_ofisa.c,v 1.18 2007/10/19 12:00:37 ad Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -38,14 +38,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ess_ofisa.c,v 1.17 2006/03/29 07:09:33 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ess_ofisa.c,v 1.18 2007/10/19 12:00:37 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <sys/audioio.h>
#include <dev/audio_if.h>
diff --git a/sys/dev/ofisa/if_cs_ofisa.c b/sys/dev/ofisa/if_cs_ofisa.c
index 0266683a4e9..51a9d660243 100644
--- a/sys/dev/ofisa/if_cs_ofisa.c
+++ b/sys/dev/ofisa/if_cs_ofisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cs_ofisa.c,v 1.15 2006/03/29 07:09:33 thorpej Exp $ */
+/* $NetBSD: if_cs_ofisa.c,v 1.16 2007/10/19 12:00:37 ad Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cs_ofisa.c,v 1.15 2006/03/29 07:09:33 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cs_ofisa.c,v 1.16 2007/10/19 12:00:37 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -59,8 +59,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_cs_ofisa.c,v 1.15 2006/03/29 07:09:33 thorpej Exp
#include <netinet/if_inarp.h>
#endif
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/ofw/openfirm.h>
#include <dev/isa/isavar.h>
diff --git a/sys/dev/ofisa/joy_ofisa.c b/sys/dev/ofisa/joy_ofisa.c
index 758ce088748..be41a79235d 100644
--- a/sys/dev/ofisa/joy_ofisa.c
+++ b/sys/dev/ofisa/joy_ofisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: joy_ofisa.c,v 1.11 2006/05/14 21:42:28 elad Exp $ */
+/* $NetBSD: joy_ofisa.c,v 1.12 2007/10/19 12:00:37 ad Exp $ */
/*-
* Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
@@ -37,14 +37,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: joy_ofisa.c,v 1.11 2006/05/14 21:42:28 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: joy_ofisa.c,v 1.12 2007/10/19 12:00:37 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ofw/openfirm.h>
#include <dev/isa/isavar.h>
diff --git a/sys/dev/ofisa/lpt_ofisa.c b/sys/dev/ofisa/lpt_ofisa.c
index 720d5a3d5e6..7663bc36f79 100644
--- a/sys/dev/ofisa/lpt_ofisa.c
+++ b/sys/dev/ofisa/lpt_ofisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lpt_ofisa.c,v 1.11 2006/03/29 07:09:33 thorpej Exp $ */
+/* $NetBSD: lpt_ofisa.c,v 1.12 2007/10/19 12:00:38 ad Exp $ */
/*
* Copyright 1997, 1998
@@ -38,15 +38,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lpt_ofisa.c,v 1.11 2006/03/29 07:09:33 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lpt_ofisa.c,v 1.12 2007/10/19 12:00:38 ad Exp $");
#include <sys/param.h>
#include <sys/device.h>
#include <sys/systm.h>
#include <sys/tty.h>
-#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
#include <dev/ofw/openfirm.h>
#include <dev/isa/isavar.h>
diff --git a/sys/dev/ofisa/ofisa.c b/sys/dev/ofisa/ofisa.c
index 0203f489982..1a30c9759de 100644
--- a/sys/dev/ofisa/ofisa.c
+++ b/sys/dev/ofisa/ofisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ofisa.c,v 1.17 2007/02/20 01:56:59 matt Exp $ */
+/* $NetBSD: ofisa.c,v 1.18 2007/10/19 12:00:38 ad Exp $ */
/*
* Copyright 1997, 1998
@@ -34,14 +34,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofisa.c,v 1.17 2007/02/20 01:56:59 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofisa.c,v 1.18 2007/10/19 12:00:38 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/ofw/openfirm.h>
#include <dev/isa/isavar.h>
diff --git a/sys/dev/ofisa/pckbc_ofisa.c b/sys/dev/ofisa/pckbc_ofisa.c
index 843b82db294..59096753a74 100644
--- a/sys/dev/ofisa/pckbc_ofisa.c
+++ b/sys/dev/ofisa/pckbc_ofisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbc_ofisa.c,v 1.12 2007/07/09 21:00:52 ad Exp $ */
+/* $NetBSD: pckbc_ofisa.c,v 1.13 2007/10/19 12:00:38 ad Exp $ */
/*
* Copyright (c) 1998
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pckbc_ofisa.c,v 1.12 2007/07/09 21:00:52 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbc_ofisa.c,v 1.13 2007/10/19 12:00:38 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -40,7 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: pckbc_ofisa.c,v 1.12 2007/07/09 21:00:52 ad Exp $");
#include <sys/queue.h>
#include <sys/lock.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
diff --git a/sys/dev/ofisa/sb_ofisa.c b/sys/dev/ofisa/sb_ofisa.c
index effa3823899..82e04353b8e 100644
--- a/sys/dev/ofisa/sb_ofisa.c
+++ b/sys/dev/ofisa/sb_ofisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sb_ofisa.c,v 1.14 2006/03/29 07:09:33 thorpej Exp $ */
+/* $NetBSD: sb_ofisa.c,v 1.15 2007/10/19 12:00:38 ad Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -38,14 +38,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sb_ofisa.c,v 1.14 2006/03/29 07:09:33 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sb_ofisa.c,v 1.15 2007/10/19 12:00:38 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <sys/audioio.h>
#include <dev/audio_if.h>
diff --git a/sys/dev/ofisa/wdc_ofisa.c b/sys/dev/ofisa/wdc_ofisa.c
index aacbda23d25..1ee2424dc11 100644
--- a/sys/dev/ofisa/wdc_ofisa.c
+++ b/sys/dev/ofisa/wdc_ofisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc_ofisa.c,v 1.28 2006/03/29 07:09:33 thorpej Exp $ */
+/* $NetBSD: wdc_ofisa.c,v 1.29 2007/10/19 12:00:38 ad Exp $ */
/*
* Copyright 1997, 1998
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_ofisa.c,v 1.28 2006/03/29 07:09:33 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_ofisa.c,v 1.29 2007/10/19 12:00:38 ad Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -46,8 +46,8 @@ __KERNEL_RCSID(0, "$NetBSD: wdc_ofisa.c,v 1.28 2006/03/29 07:09:33 thorpej Exp $
#include <sys/tty.h>
#include <sys/malloc.h>
-#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
#include <dev/ofw/openfirm.h>
#include <dev/isa/isavar.h>
diff --git a/sys/dev/pci/aac_pci.c b/sys/dev/pci/aac_pci.c
index b1d1d3abc40..ceda74ea101 100644
--- a/sys/dev/pci/aac_pci.c
+++ b/sys/dev/pci/aac_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aac_pci.c,v 1.21 2007/06/05 04:04:14 briggs Exp $ */
+/* $NetBSD: aac_pci.c,v 1.22 2007/10/19 12:00:38 ad Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aac_pci.c,v 1.21 2007/06/05 04:04:14 briggs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aac_pci.c,v 1.22 2007/10/19 12:00:38 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -81,9 +81,9 @@ __KERNEL_RCSID(0, "$NetBSD: aac_pci.c,v 1.21 2007/06/05 04:04:14 briggs Exp $");
#include <sys/malloc.h>
#include <sys/queue.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/endian.h>
-#include <machine/intr.h>
+#include <sys/intr.h>
#include <dev/pci/pcidevs.h>
#include <dev/pci/pcireg.h>
diff --git a/sys/dev/pci/adv_pci.c b/sys/dev/pci/adv_pci.c
index 426a03befbd..76e81447b15 100644
--- a/sys/dev/pci/adv_pci.c
+++ b/sys/dev/pci/adv_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: adv_pci.c,v 1.20 2006/11/16 01:33:08 christos Exp $ */
+/* $NetBSD: adv_pci.c,v 1.21 2007/10/19 12:00:38 ad Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved.
@@ -63,7 +63,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adv_pci.c,v 1.20 2006/11/16 01:33:08 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adv_pci.c,v 1.21 2007/10/19 12:00:38 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -72,8 +72,8 @@ __KERNEL_RCSID(0, "$NetBSD: adv_pci.c,v 1.20 2006/11/16 01:33:08 christos Exp $"
#include <sys/queue.h>
#include <sys/device.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/scsipi/scsi_all.h>
#include <dev/scsipi/scsipi_all.h>
diff --git a/sys/dev/pci/adw_pci.c b/sys/dev/pci/adw_pci.c
index 4b80ab6a2dd..c3c7b61b573 100644
--- a/sys/dev/pci/adw_pci.c
+++ b/sys/dev/pci/adw_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: adw_pci.c,v 1.19 2006/11/16 01:33:08 christos Exp $ */
+/* $NetBSD: adw_pci.c,v 1.20 2007/10/19 12:00:38 ad Exp $ */
/*
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adw_pci.c,v 1.19 2006/11/16 01:33:08 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adw_pci.c,v 1.20 2007/10/19 12:00:38 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -57,8 +57,8 @@ __KERNEL_RCSID(0, "$NetBSD: adw_pci.c,v 1.19 2006/11/16 01:33:08 christos Exp $"
#include <sys/queue.h>
#include <sys/device.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/scsipi/scsi_all.h>
#include <dev/scsipi/scsipi_all.h>
diff --git a/sys/dev/pci/agp.c b/sys/dev/pci/agp.c
index 59f92db1e4f..26d9380c7a7 100644
--- a/sys/dev/pci/agp.c
+++ b/sys/dev/pci/agp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: agp.c,v 1.48 2007/08/15 02:26:13 markd Exp $ */
+/* $NetBSD: agp.c,v 1.49 2007/10/19 12:00:38 ad Exp $ */
/*-
* Copyright (c) 2000 Doug Rabson
@@ -65,7 +65,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp.c,v 1.48 2007/08/15 02:26:13 markd Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp.c,v 1.49 2007/10/19 12:00:38 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -87,7 +87,7 @@ __KERNEL_RCSID(0, "$NetBSD: agp.c,v 1.48 2007/08/15 02:26:13 markd Exp $");
#include <dev/pci/agpreg.h>
#include <dev/pci/pcidevs.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
MALLOC_DEFINE(M_AGP, "AGP", "AGP memory");
diff --git a/sys/dev/pci/agp_ali.c b/sys/dev/pci/agp_ali.c
index 1adb78a4dde..a843c826c86 100644
--- a/sys/dev/pci/agp_ali.c
+++ b/sys/dev/pci/agp_ali.c
@@ -1,4 +1,4 @@
-/* $NetBSD: agp_ali.c,v 1.11 2006/11/16 01:33:08 christos Exp $ */
+/* $NetBSD: agp_ali.c,v 1.12 2007/10/19 12:00:39 ad Exp $ */
/*-
* Copyright (c) 2000 Doug Rabson
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp_ali.c,v 1.11 2006/11/16 01:33:08 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp_ali.c,v 1.12 2007/10/19 12:00:39 ad Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: agp_ali.c,v 1.11 2006/11/16 01:33:08 christos Exp $"
#include <dev/pci/agpvar.h>
#include <dev/pci/agpreg.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
struct agp_ali_softc {
struct agp_softc agp;
diff --git a/sys/dev/pci/agp_amd64.c b/sys/dev/pci/agp_amd64.c
index e48f81e2798..df5f47fe0ff 100644
--- a/sys/dev/pci/agp_amd64.c
+++ b/sys/dev/pci/agp_amd64.c
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp_amd64.c,v 1.1 2007/08/04 09:33:05 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp_amd64.c,v 1.2 2007/10/19 12:00:39 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: agp_amd64.c,v 1.1 2007/08/04 09:33:05 kiyohara Exp $
#include <dev/pci/pcidevs.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#define AMD64_MAX_MCTRL 8
diff --git a/sys/dev/pci/agp_apple.c b/sys/dev/pci/agp_apple.c
index 20bd3c9f1f3..1c8cfc77778 100644
--- a/sys/dev/pci/agp_apple.c
+++ b/sys/dev/pci/agp_apple.c
@@ -1,4 +1,4 @@
-/* $NetBSD: agp_apple.c,v 1.1 2007/03/25 23:31:51 macallan Exp $ */
+/* $NetBSD: agp_apple.c,v 1.2 2007/10/19 12:00:39 ad Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp_apple.c,v 1.1 2007/03/25 23:31:51 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp_apple.c,v 1.2 2007/10/19 12:00:39 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: agp_apple.c,v 1.1 2007/03/25 23:31:51 macallan Exp $
#include <dev/pci/agpvar.h>
#include <dev/pci/agpreg.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
static u_int32_t agp_apple_get_aperture(struct agp_softc *);
static int agp_apple_set_aperture(struct agp_softc *, u_int32_t);
diff --git a/sys/dev/pci/agp_i810.c b/sys/dev/pci/agp_i810.c
index 57320ec08c1..a4b5c88d286 100644
--- a/sys/dev/pci/agp_i810.c
+++ b/sys/dev/pci/agp_i810.c
@@ -1,4 +1,4 @@
-/* $NetBSD: agp_i810.c,v 1.42 2007/08/15 02:26:13 markd Exp $ */
+/* $NetBSD: agp_i810.c,v 1.43 2007/10/19 12:00:39 ad Exp $ */
/*-
* Copyright (c) 2000 Doug Rabson
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp_i810.c,v 1.42 2007/08/15 02:26:13 markd Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp_i810.c,v 1.43 2007/10/19 12:00:39 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: agp_i810.c,v 1.42 2007/08/15 02:26:13 markd Exp $");
#include <sys/agpio.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include "agp_intel.h"
diff --git a/sys/dev/pci/agp_intel.c b/sys/dev/pci/agp_intel.c
index 4ac70151c9c..f68de4c2a45 100644
--- a/sys/dev/pci/agp_intel.c
+++ b/sys/dev/pci/agp_intel.c
@@ -1,4 +1,4 @@
-/* $NetBSD: agp_intel.c,v 1.22 2007/03/26 22:42:39 hubertf Exp $ */
+/* $NetBSD: agp_intel.c,v 1.23 2007/10/19 12:00:39 ad Exp $ */
/*-
* Copyright (c) 2000 Doug Rabson
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp_intel.c,v 1.22 2007/03/26 22:42:39 hubertf Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp_intel.c,v 1.23 2007/10/19 12:00:39 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: agp_intel.c,v 1.22 2007/03/26 22:42:39 hubertf Exp $
#include <dev/pci/agpvar.h>
#include <dev/pci/agpreg.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
struct agp_intel_softc {
u_int32_t initial_aperture;
diff --git a/sys/dev/pci/agp_sis.c b/sys/dev/pci/agp_sis.c
index 8b6b957a396..0c77251f6f9 100644
--- a/sys/dev/pci/agp_sis.c
+++ b/sys/dev/pci/agp_sis.c
@@ -1,4 +1,4 @@
-/* $NetBSD: agp_sis.c,v 1.10 2006/11/16 01:33:08 christos Exp $ */
+/* $NetBSD: agp_sis.c,v 1.11 2007/10/19 12:00:39 ad Exp $ */
/*-
* Copyright (c) 2000 Doug Rabson
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp_sis.c,v 1.10 2006/11/16 01:33:08 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp_sis.c,v 1.11 2007/10/19 12:00:39 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: agp_sis.c,v 1.10 2006/11/16 01:33:08 christos Exp $"
#include <dev/pci/agpvar.h>
#include <dev/pci/agpreg.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
struct agp_sis_softc {
u_int32_t initial_aperture; /* aperture size at startup */
diff --git a/sys/dev/pci/agp_via.c b/sys/dev/pci/agp_via.c
index c03b29bddee..0beae86449b 100644
--- a/sys/dev/pci/agp_via.c
+++ b/sys/dev/pci/agp_via.c
@@ -1,4 +1,4 @@
-/* $NetBSD: agp_via.c,v 1.13 2007/03/27 20:57:46 jmcneill Exp $ */
+/* $NetBSD: agp_via.c,v 1.14 2007/10/19 12:00:39 ad Exp $ */
/*-
* Copyright (c) 2000 Doug Rabson
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp_via.c,v 1.13 2007/03/27 20:57:46 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp_via.c,v 1.14 2007/10/19 12:00:39 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: agp_via.c,v 1.13 2007/03/27 20:57:46 jmcneill Exp $"
#include <dev/pci/agpreg.h>
#include <dev/pci/pcidevs.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
static u_int32_t agp_via_get_aperture(struct agp_softc *);
static int agp_via_set_aperture(struct agp_softc *, u_int32_t);
diff --git a/sys/dev/pci/ahc_pci.c b/sys/dev/pci/ahc_pci.c
index 244709e9271..f4d5c32843e 100644
--- a/sys/dev/pci/ahc_pci.c
+++ b/sys/dev/pci/ahc_pci.c
@@ -39,7 +39,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGES.
*
- * $Id: ahc_pci.c,v 1.59 2007/09/26 01:22:29 macallan Exp $
+ * $Id: ahc_pci.c,v 1.60 2007/10/19 12:00:39 ad Exp $
*
* //depot/aic7xxx/aic7xxx/aic7xxx_pci.c#57 $
*
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahc_pci.c,v 1.59 2007/09/26 01:22:29 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahc_pci.c,v 1.60 2007/10/19 12:00:39 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -60,8 +60,8 @@ __KERNEL_RCSID(0, "$NetBSD: ahc_pci.c,v 1.59 2007/09/26 01:22:29 macallan Exp $"
#include <sys/device.h>
#include <sys/reboot.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
diff --git a/sys/dev/pci/amdpm.c b/sys/dev/pci/amdpm.c
index 361c3ce686e..3f2af656e7a 100644
--- a/sys/dev/pci/amdpm.c
+++ b/sys/dev/pci/amdpm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: amdpm.c,v 1.27 2007/08/26 17:17:06 xtraeme Exp $ */
+/* $NetBSD: amdpm.c,v 1.28 2007/10/19 12:00:39 ad Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdpm.c,v 1.27 2007/08/26 17:17:06 xtraeme Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdpm.c,v 1.28 2007/10/19 12:00:39 ad Exp $");
#include "opt_amdpm.h"
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: amdpm.c,v 1.27 2007/08/26 17:17:06 xtraeme Exp $");
#include <sys/callout.h>
#include <sys/rnd.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/acpipmtimer.h>
#include <dev/i2c/i2cvar.h>
diff --git a/sys/dev/pci/amr.c b/sys/dev/pci/amr.c
index 4e521748928..a2e418a0133 100644
--- a/sys/dev/pci/amr.c
+++ b/sys/dev/pci/amr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: amr.c,v 1.45 2007/07/09 21:00:52 ad Exp $ */
+/* $NetBSD: amr.c,v 1.46 2007/10/19 12:00:39 ad Exp $ */
/*-
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amr.c,v 1.45 2007/07/09 21:00:52 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amr.c,v 1.46 2007/10/19 12:00:39 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -88,7 +88,7 @@ __KERNEL_RCSID(0, "$NetBSD: amr.c,v 1.45 2007/07/09 21:00:52 ad Exp $");
#include <uvm/uvm_extern.h>
#include <machine/endian.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcidevs.h>
#include <dev/pci/pcivar.h>
diff --git a/sys/dev/pci/atppc_puc.c b/sys/dev/pci/atppc_puc.c
index fba4f842b53..fb006a1abfa 100644
--- a/sys/dev/pci/atppc_puc.c
+++ b/sys/dev/pci/atppc_puc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: atppc_puc.c,v 1.5 2007/03/04 06:02:16 christos Exp $ */
+/* $NetBSD: atppc_puc.c,v 1.6 2007/10/19 12:00:40 ad Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
#include "opt_atppc.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atppc_puc.c,v 1.5 2007/03/04 06:02:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atppc_puc.c,v 1.6 2007/10/19 12:00:40 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: atppc_puc.c,v 1.5 2007/03/04 06:02:16 christos Exp $
#include <sys/proc.h>
#include <sys/termios.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <uvm/uvm_extern.h>
#include <dev/pci/pcivar.h>
diff --git a/sys/dev/pci/auacer.c b/sys/dev/pci/auacer.c
index 1eafab4a73a..e49c72079b9 100644
--- a/sys/dev/pci/auacer.c
+++ b/sys/dev/pci/auacer.c
@@ -1,4 +1,4 @@
-/* $NetBSD: auacer.c,v 1.16 2007/03/04 06:02:16 christos Exp $ */
+/* $NetBSD: auacer.c,v 1.17 2007/10/19 12:00:40 ad Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -51,7 +51,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auacer.c,v 1.16 2007/03/04 06:02:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auacer.c,v 1.17 2007/10/19 12:00:40 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -72,7 +72,7 @@ __KERNEL_RCSID(0, "$NetBSD: auacer.c,v 1.16 2007/03/04 06:02:16 christos Exp $")
#include <dev/mulaw.h>
#include <dev/auconv.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/ac97reg.h>
#include <dev/ic/ac97var.h>
diff --git a/sys/dev/pci/auich.c b/sys/dev/pci/auich.c
index 2564d8ae954..924947dbdc0 100644
--- a/sys/dev/pci/auich.c
+++ b/sys/dev/pci/auich.c
@@ -1,4 +1,4 @@
-/* $NetBSD: auich.c,v 1.118 2007/09/02 00:48:52 xtraeme Exp $ */
+/* $NetBSD: auich.c,v 1.119 2007/10/19 12:00:40 ad Exp $ */
/*-
* Copyright (c) 2000, 2004, 2005 The NetBSD Foundation, Inc.
@@ -118,7 +118,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auich.c,v 1.118 2007/09/02 00:48:52 xtraeme Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auich.c,v 1.119 2007/10/19 12:00:40 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -140,7 +140,7 @@ __KERNEL_RCSID(0, "$NetBSD: auich.c,v 1.118 2007/09/02 00:48:52 xtraeme Exp $");
#include <dev/mulaw.h>
#include <dev/auconv.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/ac97reg.h>
#include <dev/ic/ac97var.h>
diff --git a/sys/dev/pci/auixp.c b/sys/dev/pci/auixp.c
index ba85a7591f5..06702904ec0 100644
--- a/sys/dev/pci/auixp.c
+++ b/sys/dev/pci/auixp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: auixp.c,v 1.23 2007/04/29 20:23:36 msaitoh Exp $ */
+/* $NetBSD: auixp.c,v 1.24 2007/10/19 12:00:40 ad Exp $ */
/*
* Copyright (c) 2004, 2005 Reinoud Zandijk <reinoud@netbsd.org>
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auixp.c,v 1.23 2007/04/29 20:23:36 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auixp.c,v 1.24 2007/10/19 12:00:40 ad Exp $");
#include <sys/types.h>
#include <sys/errno.h>
@@ -65,8 +65,8 @@ __KERNEL_RCSID(0, "$NetBSD: auixp.c,v 1.23 2007/04/29 20:23:36 msaitoh Exp $");
#include <sys/audioio.h>
#include <sys/queue.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/pci/pcidevs.h>
#include <dev/pci/pcivar.h>
diff --git a/sys/dev/pci/autri.c b/sys/dev/pci/autri.c
index 167707a5f63..75ba1cb1c22 100644
--- a/sys/dev/pci/autri.c
+++ b/sys/dev/pci/autri.c
@@ -1,4 +1,4 @@
-/* $NetBSD: autri.c,v 1.34 2006/11/16 01:33:08 christos Exp $ */
+/* $NetBSD: autri.c,v 1.35 2007/10/19 12:00:40 ad Exp $ */
/*
* Copyright (c) 2001 SOMEYA Yoshihiko and KUROSAWA Takahiro.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autri.c,v 1.34 2006/11/16 01:33:08 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autri.c,v 1.35 2007/10/19 12:00:40 ad Exp $");
#include "midi.h"
@@ -60,8 +60,8 @@ __KERNEL_RCSID(0, "$NetBSD: autri.c,v 1.34 2006/11/16 01:33:08 christos Exp $");
#include <dev/ic/ac97var.h>
#include <dev/ic/mpuvar.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/pci/autrireg.h>
#include <dev/pci/autrivar.h>
diff --git a/sys/dev/pci/bha_pci.c b/sys/dev/pci/bha_pci.c
index 0a97fe20c93..d19f2dbc6d0 100644
--- a/sys/dev/pci/bha_pci.c
+++ b/sys/dev/pci/bha_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bha_pci.c,v 1.30 2006/11/16 01:33:08 christos Exp $ */
+/* $NetBSD: bha_pci.c,v 1.31 2007/10/19 12:00:40 ad Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,14 +37,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bha_pci.c,v 1.30 2006/11/16 01:33:08 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bha_pci.c,v 1.31 2007/10/19 12:00:40 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/scsipi/scsipi_all.h>
#include <dev/scsipi/scsiconf.h>
diff --git a/sys/dev/pci/bktr/bktr_audio.c b/sys/dev/pci/bktr/bktr_audio.c
index c68cebf042c..6810ece3bcd 100644
--- a/sys/dev/pci/bktr/bktr_audio.c
+++ b/sys/dev/pci/bktr/bktr_audio.c
@@ -1,6 +1,6 @@
/* $SourceForge: bktr_audio.c,v 1.6 2003/03/11 23:11:20 thomasklausner Exp $ */
-/* $NetBSD: bktr_audio.c,v 1.16 2006/11/24 22:52:16 wiz Exp $ */
+/* $NetBSD: bktr_audio.c,v 1.17 2007/10/19 12:01:01 ad Exp $ */
/* $FreeBSD: src/sys/dev/bktr/bktr_audio.c,v 1.8 2000/10/31 13:09:56 roger Exp$ */
/*
* This is part of the Driver for Video Capture Cards (Frame grabbers)
@@ -64,14 +64,14 @@
#if (__FreeBSD_version >=300000)
#include <machine/bus_memio.h> /* for bus space */
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/bus.h>
#endif
#endif
#ifdef __NetBSD__
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bktr_audio.c,v 1.16 2006/11/24 22:52:16 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bktr_audio.c,v 1.17 2007/10/19 12:01:01 ad Exp $");
#include <sys/proc.h>
#include <dev/ic/bt8xx.h> /* NetBSD location of .h files */
diff --git a/sys/dev/pci/bktr/bktr_card.c b/sys/dev/pci/bktr/bktr_card.c
index 2e20122667c..bdbcfb6198a 100644
--- a/sys/dev/pci/bktr/bktr_card.c
+++ b/sys/dev/pci/bktr/bktr_card.c
@@ -1,6 +1,6 @@
/* $SourceForge: bktr_card.c,v 1.3 2003/03/11 23:11:21 thomasklausner Exp $ */
-/* $NetBSD: bktr_card.c,v 1.23 2006/11/16 01:33:20 christos Exp $ */
+/* $NetBSD: bktr_card.c,v 1.24 2007/10/19 12:01:02 ad Exp $ */
/* $FreeBSD: src/sys/dev/bktr/bktr_card.c,v 1.16 2000/10/31 13:09:56 roger Exp$ */
/*
@@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bktr_card.c,v 1.23 2006/11/16 01:33:20 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bktr_card.c,v 1.24 2007/10/19 12:01:02 ad Exp $");
#include "opt_bktr.h" /* Include any kernel config options */
@@ -69,7 +69,7 @@ __KERNEL_RCSID(0, "$NetBSD: bktr_card.c,v 1.23 2006/11/16 01:33:20 christos Exp
#if (__FreeBSD_version >=300000)
#include <machine/bus_memio.h> /* for bus space */
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/bus.h>
#endif
#endif
diff --git a/sys/dev/pci/bktr/bktr_core.c b/sys/dev/pci/bktr/bktr_core.c
index 909bdf50d88..dc6c45c8f4f 100644
--- a/sys/dev/pci/bktr/bktr_core.c
+++ b/sys/dev/pci/bktr/bktr_core.c
@@ -1,6 +1,6 @@
/* $SourceForge: bktr_core.c,v 1.6 2003/03/11 23:11:22 thomasklausner Exp $ */
-/* $NetBSD: bktr_core.c,v 1.43 2007/07/09 21:01:19 ad Exp $ */
+/* $NetBSD: bktr_core.c,v 1.44 2007/10/19 12:01:02 ad Exp $ */
/* $FreeBSD: src/sys/dev/bktr/bktr_core.c,v 1.114 2000/10/31 13:09:56 roger Exp$ */
/*
@@ -98,7 +98,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bktr_core.c,v 1.43 2007/07/09 21:01:19 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bktr_core.c,v 1.44 2007/10/19 12:01:02 ad Exp $");
#include "opt_bktr.h" /* Include any kernel config options */
@@ -136,7 +136,7 @@ __KERNEL_RCSID(0, "$NetBSD: bktr_core.c,v 1.43 2007/07/09 21:01:19 ad Exp $");
#if (__FreeBSD_version >=300000)
#include <machine/bus_memio.h> /* for bus space */
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/bus.h>
#endif
diff --git a/sys/dev/pci/bktr/bktr_os.c b/sys/dev/pci/bktr/bktr_os.c
index 14345fb5157..3a342fb4ec7 100644
--- a/sys/dev/pci/bktr/bktr_os.c
+++ b/sys/dev/pci/bktr/bktr_os.c
@@ -1,6 +1,6 @@
/* $SourceForge: bktr_os.c,v 1.5 2003/03/11 23:11:25 thomasklausner Exp $ */
-/* $NetBSD: bktr_os.c,v 1.47 2007/09/25 14:13:35 ad Exp $ */
+/* $NetBSD: bktr_os.c,v 1.48 2007/10/19 12:01:02 ad Exp $ */
/* $FreeBSD: src/sys/dev/bktr/bktr_os.c,v 1.20 2000/10/20 08:16:53 roger Exp$ */
/*
@@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bktr_os.c,v 1.47 2007/09/25 14:13:35 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bktr_os.c,v 1.48 2007/10/19 12:01:02 ad Exp $");
#ifdef __FreeBSD__
#include "bktr.h"
@@ -89,7 +89,7 @@ __KERNEL_RCSID(0, "$NetBSD: bktr_os.c,v 1.47 2007/09/25 14:13:35 ad Exp $");
#if (__FreeBSD_version >=300000)
#include <machine/bus_memio.h> /* used by bus space */
-#include <machine/bus.h> /* used by bus space and newbus */
+#include <sys/bus.h> /* used by bus space and newbus */
#include <sys/bus.h>
#endif
diff --git a/sys/dev/pci/bktr/bktr_reg.h b/sys/dev/pci/bktr/bktr_reg.h
index 5af4156323f..395a65db888 100644
--- a/sys/dev/pci/bktr/bktr_reg.h
+++ b/sys/dev/pci/bktr/bktr_reg.h
@@ -1,6 +1,6 @@
/* $SourceForge: bktr_reg.h,v 1.3 2003/03/11 23:11:27 thomasklausner Exp $ */
-/* $NetBSD: bktr_reg.h,v 1.16 2005/12/30 00:16:32 mjl Exp $ */
+/* $NetBSD: bktr_reg.h,v 1.17 2007/10/19 12:01:03 ad Exp $ */
/*
* $FreeBSD: src/sys/dev/bktr/bktr_reg.h,v 1.42 2000/10/31 13:09:56 roger Exp$
*
@@ -49,7 +49,7 @@
#endif
#ifdef __NetBSD__
-#include <machine/bus.h> /* struct device */
+#include <sys/bus.h> /* struct device */
#include <sys/device.h>
#include <sys/select.h> /* struct selinfo */
#include <sys/reboot.h> /* AB_* for bootverbose */
diff --git a/sys/dev/pci/bktr/bktr_tuner.c b/sys/dev/pci/bktr/bktr_tuner.c
index 51d5c32d0f7..17884600452 100644
--- a/sys/dev/pci/bktr/bktr_tuner.c
+++ b/sys/dev/pci/bktr/bktr_tuner.c
@@ -1,6 +1,6 @@
/* $Sourceforge: bktr_tuner.c,v 1.5 2003/03/13 22:21:04 emsi Exp $ */
-/* $NetBSD: bktr_tuner.c,v 1.11 2005/12/28 20:41:56 wiz Exp $ */
+/* $NetBSD: bktr_tuner.c,v 1.12 2007/10/19 12:01:03 ad Exp $ */
/* $FreeBSD: src/sys/dev/bktr/bktr_tuner.c,v 1.9 2000/10/19 07:33:28 roger Exp$ */
/*
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bktr_tuner.c,v 1.11 2005/12/28 20:41:56 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bktr_tuner.c,v 1.12 2007/10/19 12:01:03 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -66,7 +66,7 @@ __KERNEL_RCSID(0, "$NetBSD: bktr_tuner.c,v 1.11 2005/12/28 20:41:56 wiz Exp $");
#if (__FreeBSD_version >=300000)
#include <machine/bus_memio.h> /* for bus space */
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/bus.h>
#endif
#endif
diff --git a/sys/dev/pci/btvmei.c b/sys/dev/pci/btvmei.c
index 53d0d412be1..e6580d9739f 100644
--- a/sys/dev/pci/btvmei.c
+++ b/sys/dev/pci/btvmei.c
@@ -1,4 +1,4 @@
-/* $NetBSD: btvmei.c,v 1.16 2007/01/10 20:36:28 cube Exp $ */
+/* $NetBSD: btvmei.c,v 1.17 2007/10/19 12:00:40 ad Exp $ */
/*
* Copyright (c) 1999
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: btvmei.c,v 1.16 2007/01/10 20:36:28 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btvmei.c,v 1.17 2007/10/19 12:00:40 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: btvmei.c,v 1.16 2007/01/10 20:36:28 cube Exp $");
#include <sys/proc.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/extent.h>
#include <dev/pci/pcireg.h>
diff --git a/sys/dev/pci/btvmeii.c b/sys/dev/pci/btvmeii.c
index 00986027b8e..1937809a25b 100644
--- a/sys/dev/pci/btvmeii.c
+++ b/sys/dev/pci/btvmeii.c
@@ -1,4 +1,4 @@
-/* $NetBSD: btvmeii.c,v 1.12 2006/11/24 22:04:25 wiz Exp $ */
+/* $NetBSD: btvmeii.c,v 1.13 2007/10/19 12:00:40 ad Exp $ */
/*
* Copyright (c) 1999
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: btvmeii.c,v 1.12 2006/11/24 22:04:25 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btvmeii.c,v 1.13 2007/10/19 12:00:40 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: btvmeii.c,v 1.12 2006/11/24 22:04:25 wiz Exp $");
#include <dev/pci/pcivar.h>
#include <dev/pci/pcidevs.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/malloc.h>
#include <sys/extent.h>
diff --git a/sys/dev/pci/cac_pci.c b/sys/dev/pci/cac_pci.c
index 41630c6911b..f96759f3ae6 100644
--- a/sys/dev/pci/cac_pci.c
+++ b/sys/dev/pci/cac_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cac_pci.c,v 1.25 2007/03/04 06:02:17 christos Exp $ */
+/* $NetBSD: cac_pci.c,v 1.26 2007/10/19 12:00:41 ad Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cac_pci.c,v 1.25 2007/03/04 06:02:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cac_pci.c,v 1.26 2007/10/19 12:00:41 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: cac_pci.c,v 1.25 2007/03/04 06:02:17 christos Exp $"
#include <sys/queue.h>
#include <machine/endian.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcidevs.h>
#include <dev/pci/pcivar.h>
diff --git a/sys/dev/pci/ciss_pci.c b/sys/dev/pci/ciss_pci.c
index bb55a7e9a09..ab3b3a82904 100644
--- a/sys/dev/pci/ciss_pci.c
+++ b/sys/dev/pci/ciss_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ciss_pci.c,v 1.3 2006/11/16 01:33:08 christos Exp $ */
+/* $NetBSD: ciss_pci.c,v 1.4 2007/10/19 12:00:41 ad Exp $ */
/* $OpenBSD: ciss_pci.c,v 1.9 2005/12/13 15:56:01 brad Exp $ */
/*
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ciss_pci.c,v 1.3 2006/11/16 01:33:08 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ciss_pci.c,v 1.4 2007/10/19 12:00:41 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -30,7 +30,7 @@ __KERNEL_RCSID(0, "$NetBSD: ciss_pci.c,v 1.3 2006/11/16 01:33:08 christos Exp $"
#include <dev/pci/pcidevs.h>
#include <dev/pci/pcivar.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/scsipi/scsipi_all.h>
#include <dev/scsipi/scsipi_disk.h>
diff --git a/sys/dev/pci/cmpci.c b/sys/dev/pci/cmpci.c
index 3dddfc8b05b..9dec927e3b5 100644
--- a/sys/dev/pci/cmpci.c
+++ b/sys/dev/pci/cmpci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cmpci.c,v 1.35 2007/03/04 06:02:17 christos Exp $ */
+/* $NetBSD: cmpci.c,v 1.36 2007/10/19 12:00:41 ad Exp $ */
/*
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cmpci.c,v 1.35 2007/03/04 06:02:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cmpci.c,v 1.36 2007/10/19 12:00:41 ad Exp $");
#if defined(AUDIO_DEBUG) || defined(DEBUG)
#define DPRINTF(x) if (cmpcidebug) printf x
@@ -74,8 +74,8 @@ int cmpcidebug = 0;
#include <dev/pci/cmpcivar.h>
#include <dev/ic/mpuvar.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
/*
* Low-level HW interface
diff --git a/sys/dev/pci/com_puc.c b/sys/dev/pci/com_puc.c
index 1bd30a07d8a..36e0f8cb354 100644
--- a/sys/dev/pci/com_puc.c
+++ b/sys/dev/pci/com_puc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: com_puc.c,v 1.16 2006/11/16 01:33:08 christos Exp $ */
+/* $NetBSD: com_puc.c,v 1.17 2007/10/19 12:00:41 ad Exp $ */
/*
* Copyright (c) 1998 Christopher G. Demetriou. All rights reserved.
@@ -38,14 +38,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_puc.c,v 1.16 2006/11/16 01:33:08 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_puc.c,v 1.17 2007/10/19 12:00:41 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/tty.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pucvar.h>
diff --git a/sys/dev/pci/cs4280.c b/sys/dev/pci/cs4280.c
index 429913bd089..96df6aa8b39 100644
--- a/sys/dev/pci/cs4280.c
+++ b/sys/dev/pci/cs4280.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cs4280.c,v 1.46 2007/06/15 13:26:57 joerg Exp $ */
+/* $NetBSD: cs4280.c,v 1.47 2007/10/19 12:00:41 ad Exp $ */
/*
* Copyright (c) 1999, 2000 Tatoku Ogaito. All rights reserved.
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cs4280.c,v 1.46 2007/06/15 13:26:57 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cs4280.c,v 1.47 2007/10/19 12:00:41 ad Exp $");
#include "midi.h"
@@ -82,7 +82,7 @@ __KERNEL_RCSID(0, "$NetBSD: cs4280.c,v 1.46 2007/06/15 13:26:57 joerg Exp $");
#include <dev/pci/cs428x.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/bswap.h>
#define BA1READ4(sc, r) bus_space_read_4((sc)->ba1t, (sc)->ba1h, (r))
diff --git a/sys/dev/pci/cs4281.c b/sys/dev/pci/cs4281.c
index da74e89823b..bf4e8ec5713 100644
--- a/sys/dev/pci/cs4281.c
+++ b/sys/dev/pci/cs4281.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cs4281.c,v 1.34 2007/06/15 13:26:57 joerg Exp $ */
+/* $NetBSD: cs4281.c,v 1.35 2007/10/19 12:00:41 ad Exp $ */
/*
* Copyright (c) 2000 Tatoku Ogaito. All rights reserved.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cs4281.c,v 1.34 2007/06/15 13:26:57 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cs4281.c,v 1.35 2007/10/19 12:00:41 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -69,7 +69,7 @@ __KERNEL_RCSID(0, "$NetBSD: cs4281.c,v 1.34 2007/06/15 13:26:57 joerg Exp $");
#include <dev/pci/cs428x.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#if defined(ENABLE_SECONDARY_CODEC)
#define MAX_CHANNELS (4)
diff --git a/sys/dev/pci/cs428x.c b/sys/dev/pci/cs428x.c
index 2b7a248bfba..311a2d264c0 100644
--- a/sys/dev/pci/cs428x.c
+++ b/sys/dev/pci/cs428x.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cs428x.c,v 1.13 2006/11/16 01:33:08 christos Exp $ */
+/* $NetBSD: cs428x.c,v 1.14 2007/10/19 12:00:41 ad Exp $ */
/*
* Copyright (c) 2000 Tatoku Ogaito. All rights reserved.
@@ -33,7 +33,7 @@
/* Common functions for CS4280 and CS4281 */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cs428x.c,v 1.13 2006/11/16 01:33:08 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cs428x.c,v 1.14 2007/10/19 12:00:41 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -53,7 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: cs428x.c,v 1.13 2006/11/16 01:33:08 christos Exp $")
#include <dev/ic/ac97reg.h>
#include <dev/ic/ac97var.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/cs428xreg.h>
#include <dev/pci/cs428x.h>
diff --git a/sys/dev/pci/cxgb_adapter.h b/sys/dev/pci/cxgb_adapter.h
index e8e34b9f2f4..d62d95cdd5d 100644
--- a/sys/dev/pci/cxgb_adapter.h
+++ b/sys/dev/pci/cxgb_adapter.h
@@ -58,7 +58,7 @@ __FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_adapter.h,v 1.10 2007/05/28 22:57:26 k
#include <net/if.h>
#include <net/if_media.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#ifdef __FreeBSD__
#include <machine/resource.h>
#include <sys/bus_dma.h>
diff --git a/sys/dev/pci/cxgb_lro.c b/sys/dev/pci/cxgb_lro.c
index ca5b676124b..e783411d4ec 100644
--- a/sys/dev/pci/cxgb_lro.c
+++ b/sys/dev/pci/cxgb_lro.c
@@ -41,7 +41,7 @@ __FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_lro.c,v 1.7 2007/06/13 05:35:59 kmacy
#include <sys/bus.h>
#endif
#include <sys/conf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#ifdef __FreeBSD__
#include <machine/resource.h>
#include <sys/bus_dma.h>
diff --git a/sys/dev/pci/cxgb_main.c b/sys/dev/pci/cxgb_main.c
index 7ac56867a2c..526d65d7319 100644
--- a/sys/dev/pci/cxgb_main.c
+++ b/sys/dev/pci/cxgb_main.c
@@ -41,7 +41,7 @@ __FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_main.c,v 1.21 2007/05/29 04:18:21 kmac
#include <sys/pciio.h>
#endif
#include <sys/conf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#ifdef __FreeBSD__
#include <machine/resource.h>
#include <sys/bus_dma.h>
diff --git a/sys/dev/pci/cxgb_offload.c b/sys/dev/pci/cxgb_offload.c
index c119b95bc04..175309dcc96 100644
--- a/sys/dev/pci/cxgb_offload.c
+++ b/sys/dev/pci/cxgb_offload.c
@@ -44,7 +44,7 @@ __FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_offload.c,v 1.5 2007/06/17 04:33:38 km
#include <sys/pciio.h>
#endif
#include <sys/conf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#ifdef __FreeBSD__
#include <machine/resource.h>
#include <sys/bus_dma.h>
diff --git a/sys/dev/pci/cxgb_osdep.h b/sys/dev/pci/cxgb_osdep.h
index 09f851e060a..d25a127cebb 100644
--- a/sys/dev/pci/cxgb_osdep.h
+++ b/sys/dev/pci/cxgb_osdep.h
@@ -54,7 +54,7 @@ typedef char *caddr_t;
#include <dev/pci/cxgb_version.h>
#include <dev/pci/cxgb_config.h>
#include <sys/mbuf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/simplelock.h>
diff --git a/sys/dev/pci/cxgb_sge.c b/sys/dev/pci/cxgb_sge.c
index a47a733c6be..8a5ec344617 100644
--- a/sys/dev/pci/cxgb_sge.c
+++ b/sys/dev/pci/cxgb_sge.c
@@ -40,7 +40,7 @@ __FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_sge.c,v 1.18 2007/05/28 22:57:26 kmacy
#include <sys/bus.h>
#endif
#include <sys/conf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#ifdef __FreeBSD__
#include <machine/resource.h>
#include <sys/bus_dma.h>
diff --git a/sys/dev/pci/cy82c693.c b/sys/dev/pci/cy82c693.c
index 0fa385ef341..5e36ed07e01 100644
--- a/sys/dev/pci/cy82c693.c
+++ b/sys/dev/pci/cy82c693.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cy82c693.c,v 1.3 2001/11/13 07:35:02 lukem Exp $ */
+/* $NetBSD: cy82c693.c,v 1.4 2007/10/19 12:00:42 ad Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cy82c693.c,v 1.3 2001/11/13 07:35:02 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cy82c693.c,v 1.4 2007/10/19 12:00:42 ad Exp $");
#include "opt_multiprocessor.h"
#include "opt_lockdebug.h"
@@ -52,7 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: cy82c693.c,v 1.3 2001/11/13 07:35:02 lukem Exp $");
#include <sys/systm.h>
#include <sys/lock.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
diff --git a/sys/dev/pci/cy_pci.c b/sys/dev/pci/cy_pci.c
index 17dd4a62729..41487378fe3 100644
--- a/sys/dev/pci/cy_pci.c
+++ b/sys/dev/pci/cy_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cy_pci.c,v 1.21 2006/11/16 01:33:08 christos Exp $ */
+/* $NetBSD: cy_pci.c,v 1.22 2007/10/19 12:00:42 ad Exp $ */
/*
* cy_pci.c
@@ -10,14 +10,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cy_pci.c,v 1.21 2006/11/16 01:33:08 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cy_pci.c,v 1.22 2007/10/19 12:00:42 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
diff --git a/sys/dev/pci/cyber.c b/sys/dev/pci/cyber.c
index c89715a8c64..183eda794a7 100644
--- a/sys/dev/pci/cyber.c
+++ b/sys/dev/pci/cyber.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cyber.c,v 1.3 2005/12/11 12:22:49 christos Exp $ */
+/* $NetBSD: cyber.c,v 1.4 2007/10/19 12:00:42 ad Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -39,13 +39,13 @@
/* Store one "Usr" register on an SIIG Cyberserial multiport PCI card. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cyber.c,v 1.3 2005/12/11 12:22:49 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cyber.c,v 1.4 2007/10/19 12:00:42 ad Exp $");
#include <sys/param.h>
#include <sys/device.h>
#include <sys/termios.h> /* XXX for tcflag_t in comvar.h */
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/cyberreg.h>
#include <dev/pci/cybervar.h>
diff --git a/sys/dev/pci/dpt_pci.c b/sys/dev/pci/dpt_pci.c
index d1747ca6c84..a97ffebf900 100644
--- a/sys/dev/pci/dpt_pci.c
+++ b/sys/dev/pci/dpt_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dpt_pci.c,v 1.19 2006/11/16 01:33:08 christos Exp $ */
+/* $NetBSD: dpt_pci.c,v 1.20 2007/10/19 12:00:43 ad Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Andrew Doran <ad@NetBSD.org>
@@ -32,15 +32,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dpt_pci.c,v 1.19 2006/11/16 01:33:08 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dpt_pci.c,v 1.20 2007/10/19 12:00:43 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/queue.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/scsipi/scsipi_all.h>
#include <dev/scsipi/scsiconf.h>
diff --git a/sys/dev/pci/eap.c b/sys/dev/pci/eap.c
index 721935a5ca3..cdb0b35ca43 100644
--- a/sys/dev/pci/eap.c
+++ b/sys/dev/pci/eap.c
@@ -1,4 +1,4 @@
-/* $NetBSD: eap.c,v 1.89 2007/03/04 06:02:17 christos Exp $ */
+/* $NetBSD: eap.c,v 1.90 2007/10/19 12:00:43 ad Exp $ */
/* $OpenBSD: eap.c,v 1.6 1999/10/05 19:24:42 csapuntz Exp $ */
/*
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: eap.c,v 1.89 2007/03/04 06:02:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eap.c,v 1.90 2007/10/19 12:00:43 ad Exp $");
#include "midi.h"
#include "joy_eap.h"
@@ -83,7 +83,7 @@ __KERNEL_RCSID(0, "$NetBSD: eap.c,v 1.89 2007/03/04 06:02:17 christos Exp $");
#include <dev/auconv.h>
#include <dev/ic/ac97var.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/eapreg.h>
#include <dev/pci/eapvar.h>
diff --git a/sys/dev/pci/ehci_pci.c b/sys/dev/pci/ehci_pci.c
index 6662ca5444b..9d8d06cbdb9 100644
--- a/sys/dev/pci/ehci_pci.c
+++ b/sys/dev/pci/ehci_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci_pci.c,v 1.30 2007/08/04 10:36:06 tsutsui Exp $ */
+/* $NetBSD: ehci_pci.c,v 1.31 2007/10/19 12:00:43 ad Exp $ */
/*
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci_pci.c,v 1.30 2007/08/04 10:36:06 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci_pci.c,v 1.31 2007/10/19 12:00:43 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: ehci_pci.c,v 1.30 2007/08/04 10:36:06 tsutsui Exp $"
#include <sys/proc.h>
#include <sys/queue.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcidevs.h>
#include <dev/pci/pcivar.h>
diff --git a/sys/dev/pci/esa.c b/sys/dev/pci/esa.c
index dbd38eae979..396a56bd2e4 100644
--- a/sys/dev/pci/esa.c
+++ b/sys/dev/pci/esa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: esa.c,v 1.41 2007/03/04 06:02:18 christos Exp $ */
+/* $NetBSD: esa.c,v 1.42 2007/10/19 12:00:43 ad Exp $ */
/*
* Copyright (c) 2001, 2002, 2006 Jared D. McNeill <jmcneill@invisible.ca>
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esa.c,v 1.41 2007/03/04 06:02:18 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esa.c,v 1.42 2007/10/19 12:00:43 ad Exp $");
#include <sys/types.h>
#include <sys/errno.h>
@@ -53,8 +53,8 @@ __KERNEL_RCSID(0, "$NetBSD: esa.c,v 1.41 2007/03/04 06:02:18 christos Exp $");
#include <sys/select.h>
#include <sys/audioio.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/pci/pcidevs.h>
#include <dev/pci/pcivar.h>
diff --git a/sys/dev/pci/esm.c b/sys/dev/pci/esm.c
index 7135bf052d7..af6f11e37fa 100644
--- a/sys/dev/pci/esm.c
+++ b/sys/dev/pci/esm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: esm.c,v 1.42 2007/03/04 06:02:18 christos Exp $ */
+/* $NetBSD: esm.c,v 1.43 2007/10/19 12:00:43 ad Exp $ */
/*-
* Copyright (c) 2002, 2003 Matt Fredette
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esm.c,v 1.42 2007/03/04 06:02:18 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esm.c,v 1.43 2007/10/19 12:00:43 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -74,7 +74,7 @@ __KERNEL_RCSID(0, "$NetBSD: esm.c,v 1.42 2007/03/04 06:02:18 christos Exp $");
#include <sys/malloc.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/audioio.h>
#include <dev/audio_if.h>
diff --git a/sys/dev/pci/eso.c b/sys/dev/pci/eso.c
index 513beecafc2..f7b61c807ed 100644
--- a/sys/dev/pci/eso.c
+++ b/sys/dev/pci/eso.c
@@ -1,4 +1,4 @@
-/* $NetBSD: eso.c,v 1.50 2007/03/04 06:02:18 christos Exp $ */
+/* $NetBSD: eso.c,v 1.51 2007/10/19 12:00:43 ad Exp $ */
/*
* Copyright (c) 1999, 2000, 2004 Klaus J. Klein
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: eso.c,v 1.50 2007/03/04 06:02:18 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eso.c,v 1.51 2007/10/19 12:00:43 ad Exp $");
#include "mpu.h"
@@ -60,8 +60,8 @@ __KERNEL_RCSID(0, "$NetBSD: eso.c,v 1.50 2007/03/04 06:02:18 christos Exp $");
#include <dev/pci/esoreg.h>
#include <dev/pci/esovar.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
/*
* XXX Work around the 24-bit implementation limit of the Audio 1 DMA
diff --git a/sys/dev/pci/fms.c b/sys/dev/pci/fms.c
index b0e7eecfd61..74fc983aeb3 100644
--- a/sys/dev/pci/fms.c
+++ b/sys/dev/pci/fms.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fms.c,v 1.29 2007/03/04 06:02:18 christos Exp $ */
+/* $NetBSD: fms.c,v 1.30 2007/10/19 12:00:43 ad Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fms.c,v 1.29 2007/03/04 06:02:18 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fms.c,v 1.30 2007/10/19 12:00:43 ad Exp $");
#include "mpu.h"
@@ -54,8 +54,8 @@ __KERNEL_RCSID(0, "$NetBSD: fms.c,v 1.29 2007/03/04 06:02:18 christos Exp $");
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
-#include <machine/cpu.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
#include <dev/pci/pcidevs.h>
#include <dev/pci/pcivar.h>
diff --git a/sys/dev/pci/fwlynx_pci.c b/sys/dev/pci/fwlynx_pci.c
index 3b89a00104c..1619d5be114 100644
--- a/sys/dev/pci/fwlynx_pci.c
+++ b/sys/dev/pci/fwlynx_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fwlynx_pci.c,v 1.11 2005/12/11 12:22:49 christos Exp $ */
+/* $NetBSD: fwlynx_pci.c,v 1.12 2007/10/19 12:00:43 ad Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -37,15 +37,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fwlynx_pci.c,v 1.11 2005/12/11 12:22:49 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fwlynx_pci.c,v 1.12 2007/10/19 12:00:43 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/socket.h>
#include <sys/device.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
diff --git a/sys/dev/pci/fwohci_pci.c b/sys/dev/pci/fwohci_pci.c
index 04e705d0d90..96c165f075e 100644
--- a/sys/dev/pci/fwohci_pci.c
+++ b/sys/dev/pci/fwohci_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fwohci_pci.c,v 1.25 2006/11/16 01:33:08 christos Exp $ */
+/* $NetBSD: fwohci_pci.c,v 1.26 2007/10/19 12:00:44 ad Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fwohci_pci.c,v 1.25 2006/11/16 01:33:08 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fwohci_pci.c,v 1.26 2007/10/19 12:00:44 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -45,8 +45,8 @@ __KERNEL_RCSID(0, "$NetBSD: fwohci_pci.c,v 1.25 2006/11/16 01:33:08 christos Exp
#include <sys/device.h>
#include <sys/select.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
diff --git a/sys/dev/pci/gtp.c b/sys/dev/pci/gtp.c
index 9da64d695fe..9264b2c746e 100644
--- a/sys/dev/pci/gtp.c
+++ b/sys/dev/pci/gtp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: gtp.c,v 1.13 2006/11/16 01:33:08 christos Exp $ */
+/* $NetBSD: gtp.c,v 1.14 2007/10/19 12:00:44 ad Exp $ */
/* $OpenBSD: gtp.c,v 1.1 2002/06/03 16:13:21 mickey Exp $ */
/*
@@ -29,7 +29,7 @@
/* Gemtek PCI Radio Card Device Driver */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gtp.c,v 1.13 2006/11/16 01:33:08 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gtp.c,v 1.14 2007/10/19 12:00:44 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: gtp.c,v 1.13 2006/11/16 01:33:08 christos Exp $");
#include <sys/proc.h>
#include <sys/radioio.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
diff --git a/sys/dev/pci/iavc_pci.c b/sys/dev/pci/iavc_pci.c
index 8472d7bcb55..cdfc05defe0 100644
--- a/sys/dev/pci/iavc_pci.c
+++ b/sys/dev/pci/iavc_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: iavc_pci.c,v 1.6 2006/11/16 01:33:08 christos Exp $ */
+/* $NetBSD: iavc_pci.c,v 1.7 2007/10/19 12:00:44 ad Exp $ */
/*
* Copyright (c) 2001-2003 Cubical Solutions Ltd.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iavc_pci.c,v 1.6 2006/11/16 01:33:08 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iavc_pci.c,v 1.7 2007/10/19 12:00:44 ad Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: iavc_pci.c,v 1.6 2006/11/16 01:33:08 christos Exp $"
#include <sys/device.h>
#include <net/if.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
diff --git a/sys/dev/pci/ichsmb.c b/sys/dev/pci/ichsmb.c
index 46be0ad085c..bcd13d04aef 100644
--- a/sys/dev/pci/ichsmb.c
+++ b/sys/dev/pci/ichsmb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ichsmb.c,v 1.9 2007/09/01 22:19:25 riz Exp $ */
+/* $NetBSD: ichsmb.c,v 1.10 2007/10/19 12:00:44 ad Exp $ */
/* $OpenBSD: ichiic.c,v 1.18 2007/05/03 09:36:26 dlg Exp $ */
/*
@@ -22,7 +22,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.9 2007/09/01 22:19:25 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.10 2007/10/19 12:00:44 ad Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -31,7 +31,7 @@ __KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.9 2007/09/01 22:19:25 riz Exp $");
#include <sys/rwlock.h>
#include <sys/proc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcidevs.h>
#include <dev/pci/pcireg.h>
diff --git a/sys/dev/pci/icp_pci.c b/sys/dev/pci/icp_pci.c
index bd9be81ffe3..4ab7d58faaf 100644
--- a/sys/dev/pci/icp_pci.c
+++ b/sys/dev/pci/icp_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: icp_pci.c,v 1.13 2006/11/16 01:33:08 christos Exp $ */
+/* $NetBSD: icp_pci.c,v 1.14 2007/10/19 12:00:44 ad Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: icp_pci.c,v 1.13 2006/11/16 01:33:08 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icp_pci.c,v 1.14 2007/10/19 12:00:44 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -89,7 +89,7 @@ __KERNEL_RCSID(0, "$NetBSD: icp_pci.c,v 1.13 2006/11/16 01:33:08 christos Exp $"
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
diff --git a/sys/dev/pci/if_an_pci.c b/sys/dev/pci/if_an_pci.c
index 63bd078cf31..083974a0525 100644
--- a/sys/dev/pci/if_an_pci.c
+++ b/sys/dev/pci/if_an_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_an_pci.c,v 1.22 2007/04/06 18:16:29 rumble Exp $ */
+/* $NetBSD: if_an_pci.c,v 1.23 2007/10/19 12:00:44 ad Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_an_pci.c,v 1.22 2007/04/06 18:16:29 rumble Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_an_pci.c,v 1.23 2007/10/19 12:00:44 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -66,8 +66,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_an_pci.c,v 1.22 2007/04/06 18:16:29 rumble Exp $"
#include <net80211/ieee80211_netbsd.h>
#include <net80211/ieee80211_var.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/ic/anreg.h>
#include <dev/ic/anvar.h>
diff --git a/sys/dev/pci/if_atw_pci.c b/sys/dev/pci/if_atw_pci.c
index 582ebea74de..8efa6f02a21 100644
--- a/sys/dev/pci/if_atw_pci.c
+++ b/sys/dev/pci/if_atw_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_atw_pci.c,v 1.14 2006/11/16 01:33:08 christos Exp $ */
+/* $NetBSD: if_atw_pci.c,v 1.15 2007/10/19 12:00:44 ad Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2002 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_atw_pci.c,v 1.14 2006/11/16 01:33:08 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_atw_pci.c,v 1.15 2007/10/19 12:00:44 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -67,8 +67,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_atw_pci.c,v 1.14 2006/11/16 01:33:08 christos Exp
#include <net80211/ieee80211_radiotap.h>
#include <net80211/ieee80211_var.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/ic/atwreg.h>
#include <dev/ic/rf3000reg.h>
diff --git a/sys/dev/pci/if_de.c b/sys/dev/pci/if_de.c
index 3008f943b75..d8044c5ffcd 100644
--- a/sys/dev/pci/if_de.c
+++ b/sys/dev/pci/if_de.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_de.c,v 1.125 2007/09/01 07:32:29 dyoung Exp $ */
+/* $NetBSD: if_de.c,v 1.126 2007/10/19 12:00:44 ad Exp $ */
/*-
* Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
@@ -37,7 +37,7 @@
* board which support 21040, 21041, or 21140 (mostly).
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.125 2007/09/01 07:32:29 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.126 2007/10/19 12:00:44 ad Exp $");
#define TULIP_HDR_DATA
@@ -138,8 +138,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.125 2007/09/01 07:32:29 dyoung Exp $");
#if defined(INET)
#include <netinet/if_inarp.h>
#endif
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcidevs.h>
diff --git a/sys/dev/pci/if_dge.c b/sys/dev/pci/if_dge.c
index b68ebbe57ec..17d93b3c2e0 100644
--- a/sys/dev/pci/if_dge.c
+++ b/sys/dev/pci/if_dge.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_dge.c,v 1.16 2007/08/26 22:45:58 dyoung Exp $ */
+/* $NetBSD: if_dge.c,v 1.17 2007/10/19 12:00:45 ad Exp $ */
/*
* Copyright (c) 2004, SUNET, Swedish University Computer Network.
@@ -80,7 +80,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_dge.c,v 1.16 2007/08/26 22:45:58 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_dge.c,v 1.17 2007/10/19 12:00:45 ad Exp $");
#include "bpfilter.h"
#include "rnd.h"
@@ -117,8 +117,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_dge.c,v 1.16 2007/08/26 22:45:58 dyoung Exp $");
#include <netinet/ip.h> /* XXX for struct ip */
#include <netinet/tcp.h> /* XXX for struct tcphdr */
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <machine/endian.h>
#include <dev/mii/mii.h>
diff --git a/sys/dev/pci/if_ep_pci.c b/sys/dev/pci/if_ep_pci.c
index 68371a9f72a..d737213d9dd 100644
--- a/sys/dev/pci/if_ep_pci.c
+++ b/sys/dev/pci/if_ep_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ep_pci.c,v 1.45 2006/11/16 01:33:08 christos Exp $ */
+/* $NetBSD: if_ep_pci.c,v 1.46 2007/10/19 12:00:45 ad Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ep_pci.c,v 1.45 2006/11/16 01:33:08 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ep_pci.c,v 1.46 2007/10/19 12:00:45 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -86,9 +86,9 @@ __KERNEL_RCSID(0, "$NetBSD: if_ep_pci.c,v 1.45 2006/11/16 01:33:08 christos Exp
#include <net/if_ether.h>
#include <net/if_media.h>
-#include <machine/cpu.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/cpu.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/mii/miivar.h>
diff --git a/sys/dev/pci/if_epic_pci.c b/sys/dev/pci/if_epic_pci.c
index 9cc339dbc42..158f42c4be1 100644
--- a/sys/dev/pci/if_epic_pci.c
+++ b/sys/dev/pci/if_epic_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_epic_pci.c,v 1.32 2006/11/16 01:33:08 christos Exp $ */
+/* $NetBSD: if_epic_pci.c,v 1.33 2007/10/19 12:00:45 ad Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_epic_pci.c,v 1.32 2006/11/16 01:33:08 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_epic_pci.c,v 1.33 2007/10/19 12:00:45 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -60,8 +60,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_epic_pci.c,v 1.32 2006/11/16 01:33:08 christos Ex
#include <net/if_media.h>
#include <net/if_ether.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/mii/miivar.h>
diff --git a/sys/dev/pci/if_esh_pci.c b/sys/dev/pci/if_esh_pci.c
index 455d9e4745a..77fbd885104 100644
--- a/sys/dev/pci/if_esh_pci.c
+++ b/sys/dev/pci/if_esh_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_esh_pci.c,v 1.21 2006/11/16 01:33:08 christos Exp $ */
+/* $NetBSD: if_esh_pci.c,v 1.22 2007/10/19 12:00:45 ad Exp $ */
/*
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_esh_pci.c,v 1.21 2006/11/16 01:33:08 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_esh_pci.c,v 1.22 2007/10/19 12:00:45 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -60,9 +60,9 @@ __KERNEL_RCSID(0, "$NetBSD: if_esh_pci.c,v 1.21 2006/11/16 01:33:08 christos Exp
#include <net/if_hippi.h>
#include <net/if_media.h>
-#include <machine/cpu.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/cpu.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/ic/rrunnerreg.h>
#include <dev/ic/rrunnervar.h>
diff --git a/sys/dev/pci/if_ex_pci.c b/sys/dev/pci/if_ex_pci.c
index dbb2c2dd73e..1538c831f43 100644
--- a/sys/dev/pci/if_ex_pci.c
+++ b/sys/dev/pci/if_ex_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ex_pci.c,v 1.43 2006/11/16 01:33:08 christos Exp $ */
+/* $NetBSD: if_ex_pci.c,v 1.44 2007/10/19 12:00:45 ad Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ex_pci.c,v 1.43 2006/11/16 01:33:08 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ex_pci.c,v 1.44 2007/10/19 12:00:45 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -55,9 +55,9 @@ __KERNEL_RCSID(0, "$NetBSD: if_ex_pci.c,v 1.43 2006/11/16 01:33:08 christos Exp
#include <net/if_ether.h>
#include <net/if_media.h>
-#include <machine/cpu.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/cpu.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/mii/miivar.h>
#include <dev/mii/mii.h>
diff --git a/sys/dev/pci/if_fxp_pci.c b/sys/dev/pci/if_fxp_pci.c
index 2742b260db6..3c8d5bd77dd 100644
--- a/sys/dev/pci/if_fxp_pci.c
+++ b/sys/dev/pci/if_fxp_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fxp_pci.c,v 1.52 2006/11/26 01:15:39 enami Exp $ */
+/* $NetBSD: if_fxp_pci.c,v 1.53 2007/10/19 12:00:45 ad Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_fxp_pci.c,v 1.52 2006/11/26 01:15:39 enami Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fxp_pci.c,v 1.53 2007/10/19 12:00:45 ad Exp $");
#include "rnd.h"
@@ -68,8 +68,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_fxp_pci.c,v 1.52 2006/11/26 01:15:39 enami Exp $"
#include <net/if_media.h>
#include <net/if_ether.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/mii/miivar.h>
diff --git a/sys/dev/pci/if_gem_pci.c b/sys/dev/pci/if_gem_pci.c
index bfb97f73d3f..0d8e3c641a5 100644
--- a/sys/dev/pci/if_gem_pci.c
+++ b/sys/dev/pci/if_gem_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gem_pci.c,v 1.23 2007/06/25 11:11:00 aymeric Exp $ */
+/* $NetBSD: if_gem_pci.c,v 1.24 2007/10/19 12:00:45 ad Exp $ */
/*
*
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_gem_pci.c,v 1.23 2007/06/25 11:11:00 aymeric Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gem_pci.c,v 1.24 2007/10/19 12:00:45 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -57,8 +57,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_gem_pci.c,v 1.23 2007/06/25 11:11:00 aymeric Exp
#include <net/bpf.h>
#endif
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
diff --git a/sys/dev/pci/if_hme_pci.c b/sys/dev/pci/if_hme_pci.c
index 2b8c6070dd5..c451541cfab 100644
--- a/sys/dev/pci/if_hme_pci.c
+++ b/sys/dev/pci/if_hme_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_hme_pci.c,v 1.22 2006/11/16 01:33:08 christos Exp $ */
+/* $NetBSD: if_hme_pci.c,v 1.23 2007/10/19 12:00:45 ad Exp $ */
/*
* Copyright (c) 2000 Matthew R. Green
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_hme_pci.c,v 1.22 2006/11/16 01:33:08 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_hme_pci.c,v 1.23 2007/10/19 12:00:45 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_hme_pci.c,v 1.22 2006/11/16 01:33:08 christos Exp
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
-#include <machine/intr.h>
+#include <sys/intr.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
diff --git a/sys/dev/pci/if_ipw.c b/sys/dev/pci/if_ipw.c
index 8d356c017e5..9c28578fe4b 100644
--- a/sys/dev/pci/if_ipw.c
+++ b/sys/dev/pci/if_ipw.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ipw.c,v 1.33 2007/09/01 07:32:29 dyoung Exp $ */
+/* $NetBSD: if_ipw.c,v 1.34 2007/10/19 12:00:45 ad Exp $ */
/* FreeBSD: src/sys/dev/ipw/if_ipw.c,v 1.15 2005/11/13 17:17:40 damien Exp */
/*-
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ipw.c,v 1.33 2007/09/01 07:32:29 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ipw.c,v 1.34 2007/10/19 12:00:45 ad Exp $");
/*-
* Intel(R) PRO/Wireless 2100 MiniPCI driver
@@ -48,9 +48,9 @@ __KERNEL_RCSID(0, "$NetBSD: if_ipw.c,v 1.33 2007/09/01 07:32:29 dyoung Exp $");
#include <sys/malloc.h>
#include <sys/conf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/endian.h>
-#include <machine/intr.h>
+#include <sys/intr.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
diff --git a/sys/dev/pci/if_iwi.c b/sys/dev/pci/if_iwi.c
index 1e7775ee9f0..e476110f7c2 100644
--- a/sys/dev/pci/if_iwi.c
+++ b/sys/dev/pci/if_iwi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_iwi.c,v 1.64 2007/09/01 07:32:29 dyoung Exp $ */
+/* $NetBSD: if_iwi.c,v 1.65 2007/10/19 12:00:46 ad Exp $ */
/*-
* Copyright (c) 2004, 2005
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_iwi.c,v 1.64 2007/09/01 07:32:29 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iwi.c,v 1.65 2007/10/19 12:00:46 ad Exp $");
/*-
* Intel(R) PRO/Wireless 2200BG/2225BG/2915ABG driver
@@ -48,9 +48,9 @@ __KERNEL_RCSID(0, "$NetBSD: if_iwi.c,v 1.64 2007/09/01 07:32:29 dyoung Exp $");
#include <sys/conf.h>
#include <sys/kauth.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/endian.h>
-#include <machine/intr.h>
+#include <sys/intr.h>
#include <dev/firmload.h>
diff --git a/sys/dev/pci/if_kse.c b/sys/dev/pci/if_kse.c
index dddbac774f8..acf7964058a 100644
--- a/sys/dev/pci/if_kse.c
+++ b/sys/dev/pci/if_kse.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_kse.c,v 1.9 2007/10/19 07:25:02 nisimura Exp $ */
+/* $NetBSD: if_kse.c,v 1.10 2007/10/19 12:00:46 ad Exp $ */
/*
* Copyright (c) 2006 Tohru Nishimura
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_kse.c,v 1.9 2007/10/19 07:25:02 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_kse.c,v 1.10 2007/10/19 12:00:46 ad Exp $");
#include "bpfilter.h"
@@ -46,8 +46,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_kse.c,v 1.9 2007/10/19 07:25:02 nisimura Exp $");
#include <sys/queue.h>
#include <machine/endian.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <net/if.h>
#include <net/if_media.h>
diff --git a/sys/dev/pci/if_le_pci.c b/sys/dev/pci/if_le_pci.c
index f0cd672e896..41fcbcb6d6b 100644
--- a/sys/dev/pci/if_le_pci.c
+++ b/sys/dev/pci/if_le_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le_pci.c,v 1.46 2007/03/04 06:02:20 christos Exp $ */
+/* $NetBSD: if_le_pci.c,v 1.47 2007/10/19 12:00:46 ad Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le_pci.c,v 1.46 2007/03/04 06:02:20 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le_pci.c,v 1.47 2007/10/19 12:00:46 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -87,9 +87,9 @@ __KERNEL_RCSID(0, "$NetBSD: if_le_pci.c,v 1.46 2007/03/04 06:02:20 christos Exp
#include <net/if_ether.h>
#include <net/if_media.h>
-#include <machine/cpu.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/cpu.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
diff --git a/sys/dev/pci/if_lmc.c b/sys/dev/pci/if_lmc.c
index 321c4f505bd..b649ff13df2 100644
--- a/sys/dev/pci/if_lmc.c
+++ b/sys/dev/pci/if_lmc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_lmc.c,v 1.35 2007/07/09 21:00:54 ad Exp $ */
+/* $NetBSD: if_lmc.c,v 1.36 2007/10/19 12:00:46 ad Exp $ */
/*-
* Copyright (c) 2002-2006 David Boggs. <boggs@boggs.palo-alto.ca.us>
@@ -107,7 +107,7 @@
# include <net/if_types.h>
# include <net/if_media.h>
# include <net/netisr.h>
-# include <machine/bus.h>
+# include <sys/bus.h>
# include <machine/resource.h>
# include <machine/clock.h>
# include <sys/rman.h>
@@ -172,8 +172,8 @@
# include <net/if_types.h>
# include <net/if_media.h>
# include <net/netisr.h>
-# include <machine/bus.h>
-# include <machine/intr.h>
+# include <sys/bus.h>
+# include <sys/intr.h>
# include <machine/lock.h>
# include <machine/types.h>
# include <dev/pci/pcivar.h>
@@ -224,8 +224,8 @@
# include <net/if_types.h>
# include <net/if_media.h>
# include <net/netisr.h>
-# include <machine/bus.h>
-# include <machine/intr.h>
+# include <sys/bus.h>
+# include <sys/intr.h>
# include <machine/lock.h>
# include <uvm/uvm_extern.h>
# include <dev/pci/pcivar.h>
diff --git a/sys/dev/pci/if_mtd_pci.c b/sys/dev/pci/if_mtd_pci.c
index b42bc4765be..6544683c71d 100644
--- a/sys/dev/pci/if_mtd_pci.c
+++ b/sys/dev/pci/if_mtd_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mtd_pci.c,v 1.9 2006/11/16 01:33:09 christos Exp $ */
+/* $NetBSD: if_mtd_pci.c,v 1.10 2007/10/19 12:00:46 ad Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
/* TODO: Check why in IO space, the MII won't work. Memory mapped works */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mtd_pci.c,v 1.9 2006/11/16 01:33:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mtd_pci.c,v 1.10 2007/10/19 12:00:46 ad Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -53,7 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_mtd_pci.c,v 1.9 2006/11/16 01:33:09 christos Exp
#include <net/if.h>
#include <net/if_ether.h>
#include <net/if_media.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/mii/miivar.h>
#include <dev/ic/mtd803reg.h>
#include <dev/ic/mtd803var.h>
diff --git a/sys/dev/pci/if_ne_pci.c b/sys/dev/pci/if_ne_pci.c
index 47564f70b4c..7bb2b3e4360 100644
--- a/sys/dev/pci/if_ne_pci.c
+++ b/sys/dev/pci/if_ne_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ne_pci.c,v 1.29 2006/11/16 01:33:09 christos Exp $ */
+/* $NetBSD: if_ne_pci.c,v 1.30 2007/10/19 12:00:47 ad Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ne_pci.c,v 1.29 2006/11/16 01:33:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ne_pci.c,v 1.30 2007/10/19 12:00:47 ad Exp $");
#include "opt_ipkdb.h"
@@ -53,8 +53,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_ne_pci.c,v 1.29 2006/11/16 01:33:09 christos Exp
#include <net/if_ether.h>
#include <net/if_media.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#ifdef IPKDB_NE_PCI
#include <ipkdb/ipkdb.h>
diff --git a/sys/dev/pci/if_nfe.c b/sys/dev/pci/if_nfe.c
index 203bc23788f..49323372003 100644
--- a/sys/dev/pci/if_nfe.c
+++ b/sys/dev/pci/if_nfe.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_nfe.c,v 1.19 2007/09/24 13:17:53 cube Exp $ */
+/* $NetBSD: if_nfe.c,v 1.20 2007/10/19 12:00:47 ad Exp $ */
/* $OpenBSD: if_nfe.c,v 1.52 2006/03/02 09:04:00 jsg Exp $ */
/*-
@@ -21,7 +21,7 @@
/* Driver for NVIDIA nForce MCP Fast Ethernet and Gigabit Ethernet */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_nfe.c,v 1.19 2007/09/24 13:17:53 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_nfe.c,v 1.20 2007/10/19 12:00:47 ad Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_nfe.c,v 1.19 2007/09/24 13:17:53 cube Exp $");
#include <sys/device.h>
#include <sys/socket.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <net/if.h>
#include <net/if_dl.h>
diff --git a/sys/dev/pci/if_ntwoc_pci.c b/sys/dev/pci/if_ntwoc_pci.c
index b116cae47c5..96e61b5641e 100644
--- a/sys/dev/pci/if_ntwoc_pci.c
+++ b/sys/dev/pci/if_ntwoc_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ntwoc_pci.c,v 1.19 2006/11/16 01:33:09 christos Exp $ */
+/* $NetBSD: if_ntwoc_pci.c,v 1.20 2007/10/19 12:00:47 ad Exp $ */
/*
* Copyright (c) 1998 Vixie Enterprises
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ntwoc_pci.c,v 1.19 2006/11/16 01:33:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ntwoc_pci.c,v 1.20 2007/10/19 12:00:47 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -47,9 +47,9 @@ __KERNEL_RCSID(0, "$NetBSD: if_ntwoc_pci.c,v 1.19 2006/11/16 01:33:09 christos E
#include <net/if.h>
-#include <machine/cpu.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/cpu.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
diff --git a/sys/dev/pci/if_pcn.c b/sys/dev/pci/if_pcn.c
index 860010d20bc..45399dd5bf7 100644
--- a/sys/dev/pci/if_pcn.c
+++ b/sys/dev/pci/if_pcn.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_pcn.c,v 1.40 2007/08/29 22:33:43 dyoung Exp $ */
+/* $NetBSD: if_pcn.c,v 1.41 2007/10/19 12:00:47 ad Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_pcn.c,v 1.40 2007/08/29 22:33:43 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_pcn.c,v 1.41 2007/10/19 12:00:47 ad Exp $");
#include "bpfilter.h"
#include "rnd.h"
@@ -97,8 +97,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_pcn.c,v 1.40 2007/08/29 22:33:43 dyoung Exp $");
#include <net/bpf.h>
#endif
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <machine/endian.h>
#include <dev/mii/mii.h>
diff --git a/sys/dev/pci/if_ral_pci.c b/sys/dev/pci/if_ral_pci.c
index daaaba55d5d..20319388534 100644
--- a/sys/dev/pci/if_ral_pci.c
+++ b/sys/dev/pci/if_ral_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ral_pci.c,v 1.6 2006/11/16 01:33:09 christos Exp $ */
+/* $NetBSD: if_ral_pci.c,v 1.7 2007/10/19 12:00:47 ad Exp $ */
/* $OpenBSD: if_ral_pci.c,v 1.6 2006/01/09 20:03:43 damien Exp $ */
/*-
@@ -22,7 +22,7 @@
* PCI front-end for the Ralink RT2560/RT2561/RT2561S/RT2661 driver.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ral_pci.c,v 1.6 2006/11/16 01:33:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ral_pci.c,v 1.7 2007/10/19 12:00:47 ad Exp $");
#include "bpfilter.h"
@@ -35,8 +35,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_ral_pci.c,v 1.6 2006/11/16 01:33:09 christos Exp
#include <sys/malloc.h>
#include <sys/device.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <net/if.h>
#include <net/if_dl.h>
diff --git a/sys/dev/pci/if_re_pci.c b/sys/dev/pci/if_re_pci.c
index bb434eba3a1..3d1c610432b 100644
--- a/sys/dev/pci/if_re_pci.c
+++ b/sys/dev/pci/if_re_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_re_pci.c,v 1.29 2007/08/07 07:48:57 simonb Exp $ */
+/* $NetBSD: if_re_pci.c,v 1.30 2007/10/19 12:00:47 ad Exp $ */
/*
* Copyright (c) 1997, 1998-2003
@@ -69,7 +69,7 @@
#include <net/if_media.h>
#include <net/if_vlanvar.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
diff --git a/sys/dev/pci/if_rtk_pci.c b/sys/dev/pci/if_rtk_pci.c
index 9afa2180d26..7623b93e63d 100644
--- a/sys/dev/pci/if_rtk_pci.c
+++ b/sys/dev/pci/if_rtk_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_rtk_pci.c,v 1.32 2007/03/21 12:17:32 tsutsui Exp $ */
+/* $NetBSD: if_rtk_pci.c,v 1.33 2007/10/19 12:00:47 ad Exp $ */
/*
* Copyright (c) 1997, 1998
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_rtk_pci.c,v 1.32 2007/03/21 12:17:32 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rtk_pci.c,v 1.33 2007/10/19 12:00:47 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -65,7 +65,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_rtk_pci.c,v 1.32 2007/03/21 12:17:32 tsutsui Exp
#include <net/if_dl.h>
#include <net/if_media.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
diff --git a/sys/dev/pci/if_rtw_pci.c b/sys/dev/pci/if_rtw_pci.c
index 3cb2b3c95dd..6ad91c81117 100644
--- a/sys/dev/pci/if_rtw_pci.c
+++ b/sys/dev/pci/if_rtw_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_rtw_pci.c,v 1.7 2006/09/01 03:24:58 dyoung Exp $ */
+/* $NetBSD: if_rtw_pci.c,v 1.8 2007/10/19 12:00:47 ad Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2002 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_rtw_pci.c,v 1.7 2006/09/01 03:24:58 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rtw_pci.c,v 1.8 2007/10/19 12:00:47 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -69,8 +69,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_rtw_pci.c,v 1.7 2006/09/01 03:24:58 dyoung Exp $"
#include <net80211/ieee80211_radiotap.h>
#include <net80211/ieee80211_var.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/ic/rtwreg.h>
#include <dev/ic/sa2400reg.h>
diff --git a/sys/dev/pci/if_sf_pci.c b/sys/dev/pci/if_sf_pci.c
index db24874fcca..2f9591c59a2 100644
--- a/sys/dev/pci/if_sf_pci.c
+++ b/sys/dev/pci/if_sf_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sf_pci.c,v 1.12 2006/11/16 01:33:09 christos Exp $ */
+/* $NetBSD: if_sf_pci.c,v 1.13 2007/10/19 12:00:47 ad Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sf_pci.c,v 1.12 2006/11/16 01:33:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sf_pci.c,v 1.13 2007/10/19 12:00:47 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -59,8 +59,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_sf_pci.c,v 1.12 2006/11/16 01:33:09 christos Exp
#include <net/if_media.h>
#include <net/if_ether.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/mii/miivar.h>
diff --git a/sys/dev/pci/if_sip.c b/sys/dev/pci/if_sip.c
index 211c9108c50..3de3ab1817a 100644
--- a/sys/dev/pci/if_sip.c
+++ b/sys/dev/pci/if_sip.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sip.c,v 1.114 2007/08/29 22:33:43 dyoung Exp $ */
+/* $NetBSD: if_sip.c,v 1.115 2007/10/19 12:00:48 ad Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -80,7 +80,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sip.c,v 1.114 2007/08/29 22:33:43 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sip.c,v 1.115 2007/10/19 12:00:48 ad Exp $");
#include "bpfilter.h"
#include "rnd.h"
@@ -112,8 +112,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_sip.c,v 1.114 2007/08/29 22:33:43 dyoung Exp $");
#include <net/bpf.h>
#endif
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <machine/endian.h>
#include <dev/mii/mii.h>
diff --git a/sys/dev/pci/if_ste.c b/sys/dev/pci/if_ste.c
index cfb7d701fbf..e525e8ab7f7 100644
--- a/sys/dev/pci/if_ste.c
+++ b/sys/dev/pci/if_ste.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ste.c,v 1.30 2007/10/14 00:40:17 xtraeme Exp $ */
+/* $NetBSD: if_ste.c,v 1.31 2007/10/19 12:00:48 ad Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ste.c,v 1.30 2007/10/14 00:40:17 xtraeme Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ste.c,v 1.31 2007/10/19 12:00:48 ad Exp $");
#include "bpfilter.h"
@@ -69,8 +69,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_ste.c,v 1.30 2007/10/14 00:40:17 xtraeme Exp $");
#include <net/bpf.h>
#endif
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
diff --git a/sys/dev/pci/if_stge.c b/sys/dev/pci/if_stge.c
index 3797e09f301..95cb1341385 100644
--- a/sys/dev/pci/if_stge.c
+++ b/sys/dev/pci/if_stge.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_stge.c,v 1.38 2007/08/26 22:45:58 dyoung Exp $ */
+/* $NetBSD: if_stge.c,v 1.39 2007/10/19 12:00:48 ad Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_stge.c,v 1.38 2007/08/26 22:45:58 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_stge.c,v 1.39 2007/10/19 12:00:48 ad Exp $");
#include "bpfilter.h"
@@ -69,8 +69,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_stge.c,v 1.38 2007/08/26 22:45:58 dyoung Exp $");
#include <net/bpf.h>
#endif
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
diff --git a/sys/dev/pci/if_ti.c b/sys/dev/pci/if_ti.c
index b8ddf2bccbc..14a9b15434d 100644
--- a/sys/dev/pci/if_ti.c
+++ b/sys/dev/pci/if_ti.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ti.c,v 1.77 2007/09/07 23:05:27 tnn Exp $ */
+/* $NetBSD: if_ti.c,v 1.78 2007/10/19 12:00:48 ad Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -81,7 +81,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ti.c,v 1.77 2007/09/07 23:05:27 tnn Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ti.c,v 1.78 2007/10/19 12:00:48 ad Exp $");
#include "bpfilter.h"
#include "opt_inet.h"
@@ -117,7 +117,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_ti.c,v 1.77 2007/09/07 23:05:27 tnn Exp $");
#endif
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
diff --git a/sys/dev/pci/if_tl.c b/sys/dev/pci/if_tl.c
index 117f60d403e..641cd31e616 100644
--- a/sys/dev/pci/if_tl.c
+++ b/sys/dev/pci/if_tl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tl.c,v 1.83 2007/07/09 21:00:55 ad Exp $ */
+/* $NetBSD: if_tl.c,v 1.84 2007/10/19 12:00:48 ad Exp $ */
/*
* Copyright (c) 1997 Manuel Bouyer. All rights reserved.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tl.c,v 1.83 2007/07/09 21:00:55 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tl.c,v 1.84 2007/10/19 12:00:48 ad Exp $");
#undef TLDEBUG
#define TL_PRIV_STATS
@@ -93,8 +93,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_tl.c,v 1.83 2007/07/09 21:00:55 ad Exp $");
#include <netinet/if_inarp.h>
#endif
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
diff --git a/sys/dev/pci/if_tlp_pci.c b/sys/dev/pci/if_tlp_pci.c
index b6235e9c67f..dc35777c78a 100644
--- a/sys/dev/pci/if_tlp_pci.c
+++ b/sys/dev/pci/if_tlp_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tlp_pci.c,v 1.101 2007/02/18 12:16:14 tsutsui Exp $ */
+/* $NetBSD: if_tlp_pci.c,v 1.102 2007/10/19 12:00:49 ad Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2002 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tlp_pci.c,v 1.101 2007/02/18 12:16:14 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tlp_pci.c,v 1.102 2007/10/19 12:00:49 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -62,8 +62,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_tlp_pci.c,v 1.101 2007/02/18 12:16:14 tsutsui Exp
#include <net/if_media.h>
#include <net/if_ether.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#ifdef __sparc__
#include <machine/promlib.h>
#endif
diff --git a/sys/dev/pci/if_txp.c b/sys/dev/pci/if_txp.c
index 7ddaec1a092..af993b30271 100644
--- a/sys/dev/pci/if_txp.c
+++ b/sys/dev/pci/if_txp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_txp.c,v 1.21 2007/09/01 07:32:30 dyoung Exp $ */
+/* $NetBSD: if_txp.c,v 1.22 2007/10/19 12:00:49 ad Exp $ */
/*
* Copyright (c) 2001
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_txp.c,v 1.21 2007/09/01 07:32:30 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_txp.c,v 1.22 2007/10/19 12:00:49 ad Exp $");
#include "bpfilter.h"
#include "opt_inet.h"
@@ -68,7 +68,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_txp.c,v 1.21 2007/09/01 07:32:30 dyoung Exp $");
#endif
#include <uvm/uvm_extern.h> /* for PAGE_SIZE */
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
diff --git a/sys/dev/pci/if_vge.c b/sys/dev/pci/if_vge.c
index 9fd23174aa5..b60dd771a13 100644
--- a/sys/dev/pci/if_vge.c
+++ b/sys/dev/pci/if_vge.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vge.c,v 1.37 2007/09/01 07:32:30 dyoung Exp $ */
+/* $NetBSD: if_vge.c,v 1.38 2007/10/19 12:00:49 ad Exp $ */
/*-
* Copyright (c) 2004
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vge.c,v 1.37 2007/09/01 07:32:30 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vge.c,v 1.38 2007/10/19 12:00:49 ad Exp $");
/*
* VIA Networking Technologies VT612x PCI gigabit ethernet NIC driver.
@@ -104,7 +104,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_vge.c,v 1.37 2007/09/01 07:32:30 dyoung Exp $");
#include <net/bpf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
diff --git a/sys/dev/pci/if_vr.c b/sys/dev/pci/if_vr.c
index 0c6716a7c30..a99bcb59b17 100644
--- a/sys/dev/pci/if_vr.c
+++ b/sys/dev/pci/if_vr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vr.c,v 1.87 2007/07/09 21:00:56 ad Exp $ */
+/* $NetBSD: if_vr.c,v 1.88 2007/10/19 12:00:49 ad Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -104,7 +104,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vr.c,v 1.87 2007/07/09 21:00:56 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vr.c,v 1.88 2007/10/19 12:00:49 ad Exp $");
#include "rnd.h"
@@ -135,8 +135,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_vr.c,v 1.87 2007/07/09 21:00:56 ad Exp $");
#include <net/bpf.h>
#endif
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <machine/endian.h>
#include <dev/mii/mii.h>
diff --git a/sys/dev/pci/if_wi_pci.c b/sys/dev/pci/if_wi_pci.c
index 4f15ec9010c..d113cda1900 100644
--- a/sys/dev/pci/if_wi_pci.c
+++ b/sys/dev/pci/if_wi_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wi_pci.c,v 1.41 2006/11/16 01:33:09 christos Exp $ */
+/* $NetBSD: if_wi_pci.c,v 1.42 2007/10/19 12:00:49 ad Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wi_pci.c,v 1.41 2006/11/16 01:33:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wi_pci.c,v 1.42 2007/10/19 12:00:49 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -62,8 +62,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_wi_pci.c,v 1.41 2006/11/16 01:33:09 christos Exp
#include <net80211/ieee80211_radiotap.h>
#include <net80211/ieee80211_rssadapt.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
diff --git a/sys/dev/pci/if_wm.c b/sys/dev/pci/if_wm.c
index f2010939f95..65d07249695 100644
--- a/sys/dev/pci/if_wm.c
+++ b/sys/dev/pci/if_wm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.146 2007/08/30 05:48:50 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.147 2007/10/19 12:00:49 ad Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.146 2007/08/30 05:48:50 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.147 2007/10/19 12:00:49 ad Exp $");
#include "bpfilter.h"
#include "rnd.h"
@@ -118,8 +118,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.146 2007/08/30 05:48:50 msaitoh Exp $");
#include <netinet/ip6.h> /* XXX for struct ip6_hdr */
#include <netinet/tcp.h> /* XXX for struct tcphdr */
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <machine/endian.h>
#include <dev/mii/mii.h>
diff --git a/sys/dev/pci/if_wpi.c b/sys/dev/pci/if_wpi.c
index 143b54966b8..c52b67bf5ef 100644
--- a/sys/dev/pci/if_wpi.c
+++ b/sys/dev/pci/if_wpi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wpi.c,v 1.24 2007/09/02 12:18:05 degroote Exp $ */
+/* $NetBSD: if_wpi.c,v 1.25 2007/10/19 12:00:49 ad Exp $ */
/*-
* Copyright (c) 2006, 2007
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wpi.c,v 1.24 2007/09/02 12:18:05 degroote Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wpi.c,v 1.25 2007/10/19 12:00:49 ad Exp $");
/*
* Driver for Intel PRO/Wireless 3945ABG 802.11 network adapters.
@@ -38,9 +38,9 @@ __KERNEL_RCSID(0, "$NetBSD: if_wpi.c,v 1.24 2007/09/02 12:18:05 degroote Exp $")
#include <sys/kauth.h>
#include <sys/callout.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/endian.h>
-#include <machine/intr.h>
+#include <sys/intr.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
diff --git a/sys/dev/pci/if_xge.c b/sys/dev/pci/if_xge.c
index ceea57f1714..70fefeb160d 100644
--- a/sys/dev/pci/if_xge.c
+++ b/sys/dev/pci/if_xge.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_xge.c,v 1.5 2007/03/04 06:02:24 christos Exp $ */
+/* $NetBSD: if_xge.c,v 1.6 2007/10/19 12:00:50 ad Exp $ */
/*
* Copyright (c) 2004, SUNET, Swedish University Computer Network.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_xge.c,v 1.5 2007/03/04 06:02:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_xge.c,v 1.6 2007/10/19 12:00:50 ad Exp $");
#include "bpfilter.h"
#include "rnd.h"
@@ -69,8 +69,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_xge.c,v 1.5 2007/03/04 06:02:24 christos Exp $");
#include <net/bpf.h>
#endif
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <machine/endian.h>
#include <dev/mii/mii.h>
diff --git a/sys/dev/pci/ifpci.c b/sys/dev/pci/ifpci.c
index a6f695e7b85..fbbe94a8cca 100644
--- a/sys/dev/pci/ifpci.c
+++ b/sys/dev/pci/ifpci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ifpci.c,v 1.23 2007/07/09 21:00:56 ad Exp $ */
+/* $NetBSD: ifpci.c,v 1.24 2007/10/19 12:00:50 ad Exp $ */
/*
* Copyright (c) 1999 Gary Jennejohn. All rights reserved.
*
@@ -36,14 +36,14 @@
* Fritz!Card PCI driver
* ------------------------------------------------
*
- * $Id: ifpci.c,v 1.23 2007/07/09 21:00:56 ad Exp $
+ * $Id: ifpci.c,v 1.24 2007/10/19 12:00:50 ad Exp $
*
* last edit-date: [Fri Jan 5 11:38:58 2001]
*
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ifpci.c,v 1.23 2007/07/09 21:00:56 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ifpci.c,v 1.24 2007/10/19 12:00:50 ad Exp $");
#include <sys/param.h>
@@ -52,7 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: ifpci.c,v 1.23 2007/07/09 21:00:56 ad Exp $");
#include <sys/systm.h>
#include <sys/mbuf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/device.h>
#include <sys/socket.h>
diff --git a/sys/dev/pci/ifpci2.c b/sys/dev/pci/ifpci2.c
index eb8d3207de3..934707935ec 100644
--- a/sys/dev/pci/ifpci2.c
+++ b/sys/dev/pci/ifpci2.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ifpci2.c,v 1.11 2007/07/09 21:00:57 ad Exp $ */
+/* $NetBSD: ifpci2.c,v 1.12 2007/10/19 12:00:50 ad Exp $ */
/*
* Copyright (c) 1999 Gary Jennejohn. All rights reserved.
*
@@ -36,14 +36,14 @@
* Fritz!Card PCI driver
* ------------------------------------------------
*
- * $Id: ifpci2.c,v 1.11 2007/07/09 21:00:57 ad Exp $
+ * $Id: ifpci2.c,v 1.12 2007/10/19 12:00:50 ad Exp $
*
* last edit-date: [Fri Jan 5 11:38:58 2001]
*
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ifpci2.c,v 1.11 2007/07/09 21:00:57 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ifpci2.c,v 1.12 2007/10/19 12:00:50 ad Exp $");
#include <sys/param.h>
@@ -52,7 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: ifpci2.c,v 1.11 2007/07/09 21:00:57 ad Exp $");
#include <sys/systm.h>
#include <sys/mbuf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/device.h>
#include <sys/socket.h>
diff --git a/sys/dev/pci/igsfb_pci.c b/sys/dev/pci/igsfb_pci.c
index 61a89032d74..eec8a4c859d 100644
--- a/sys/dev/pci/igsfb_pci.c
+++ b/sys/dev/pci/igsfb_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: igsfb_pci.c,v 1.16 2007/01/13 19:03:49 cube Exp $ */
+/* $NetBSD: igsfb_pci.c,v 1.17 2007/10/19 12:00:50 ad Exp $ */
/*
* Copyright (c) 2002, 2003 Valeriy E. Ushakov
@@ -31,7 +31,7 @@
* Integraphics Systems IGA 168x and CyberPro series.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: igsfb_pci.c,v 1.16 2007/01/13 19:03:49 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: igsfb_pci.c,v 1.17 2007/10/19 12:00:50 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -43,8 +43,8 @@ __KERNEL_RCSID(0, "$NetBSD: igsfb_pci.c,v 1.16 2007/01/13 19:03:49 cube Exp $");
#ifdef __sparc__ /* XXX: this doesn't belong here */
#include <machine/autoconf.h>
#endif
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
diff --git a/sys/dev/pci/iop_pci.c b/sys/dev/pci/iop_pci.c
index b546edf9a54..bdd8ad25270 100644
--- a/sys/dev/pci/iop_pci.c
+++ b/sys/dev/pci/iop_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: iop_pci.c,v 1.20 2007/07/09 21:00:57 ad Exp $ */
+/* $NetBSD: iop_pci.c,v 1.21 2007/10/19 12:00:50 ad Exp $ */
/*-
* Copyright (c) 2000, 2001, 2002 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iop_pci.c,v 1.20 2007/07/09 21:00:57 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iop_pci.c,v 1.21 2007/10/19 12:00:50 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: iop_pci.c,v 1.20 2007/07/09 21:00:57 ad Exp $");
#include <sys/proc.h>
#include <machine/endian.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcidevs.h>
#include <dev/pci/pcivar.h>
diff --git a/sys/dev/pci/isic_pci.c b/sys/dev/pci/isic_pci.c
index d9e2fe66a8d..e4c54ae67b9 100644
--- a/sys/dev/pci/isic_pci.c
+++ b/sys/dev/pci/isic_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isic_pci.c,v 1.28 2007/07/09 21:00:57 ad Exp $ */
+/* $NetBSD: isic_pci.c,v 1.29 2007/10/19 12:00:50 ad Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_pci.c,v 1.28 2007/07/09 21:00:57 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_pci.c,v 1.29 2007/10/19 12:00:50 ad Exp $");
#include <sys/param.h>
#include <sys/errno.h>
@@ -49,13 +49,13 @@ __KERNEL_RCSID(0, "$NetBSD: isic_pci.c,v 1.28 2007/07/09 21:00:57 ad Exp $");
#include <sys/malloc.h>
#include <sys/callout.h>
-#include <machine/cpu.h>
-#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/cpu.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcidevs.h>
diff --git a/sys/dev/pci/isic_pci_elsa_qs1p.c b/sys/dev/pci/isic_pci_elsa_qs1p.c
index 87393e145b8..3ab3c0b9b1d 100644
--- a/sys/dev/pci/isic_pci_elsa_qs1p.c
+++ b/sys/dev/pci/isic_pci_elsa_qs1p.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isic_pci_elsa_qs1p.c,v 1.16 2007/07/09 21:00:57 ad Exp $ */
+/* $NetBSD: isic_pci_elsa_qs1p.c,v 1.17 2007/10/19 12:00:50 ad Exp $ */
/*
* Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved.
@@ -32,7 +32,7 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_pci_elsa_qs1p.c,v 1.16 2007/07/09 21:00:57 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_pci_elsa_qs1p.c,v 1.17 2007/10/19 12:00:50 ad Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: isic_pci_elsa_qs1p.c,v 1.16 2007/07/09 21:00:57 ad E
#include <net/if.h>
#include <sys/callout.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/device.h>
#include <dev/pci/pcireg.h>
diff --git a/sys/dev/pci/iwic_bchan.c b/sys/dev/pci/iwic_bchan.c
index 3859ba1f1f8..b23acb25428 100644
--- a/sys/dev/pci/iwic_bchan.c
+++ b/sys/dev/pci/iwic_bchan.c
@@ -1,4 +1,4 @@
-/* $NetBSD: iwic_bchan.c,v 1.5 2005/12/11 12:22:50 christos Exp $ */
+/* $NetBSD: iwic_bchan.c,v 1.6 2007/10/19 12:00:50 ad Exp $ */
/*
* Copyright (c) 1999, 2000 Dave Boyce. All rights reserved.
@@ -38,7 +38,7 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iwic_bchan.c,v 1.5 2005/12/11 12:22:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iwic_bchan.c,v 1.6 2007/10/19 12:00:50 ad Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: iwic_bchan.c,v 1.5 2005/12/11 12:22:50 christos Exp
#include <sys/device.h>
#include <net/if.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
diff --git a/sys/dev/pci/iwic_dchan.c b/sys/dev/pci/iwic_dchan.c
index 67244c9abb3..234d276e252 100644
--- a/sys/dev/pci/iwic_dchan.c
+++ b/sys/dev/pci/iwic_dchan.c
@@ -1,4 +1,4 @@
-/* $NetBSD: iwic_dchan.c,v 1.4 2005/12/11 12:22:50 christos Exp $ */
+/* $NetBSD: iwic_dchan.c,v 1.5 2007/10/19 12:00:50 ad Exp $ */
/*
* Copyright (c) 1999, 2000 Dave Boyce. All rights reserved.
@@ -36,7 +36,7 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iwic_dchan.c,v 1.4 2005/12/11 12:22:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iwic_dchan.c,v 1.5 2007/10/19 12:00:50 ad Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: iwic_dchan.c,v 1.4 2005/12/11 12:22:50 christos Exp
#include <sys/callout.h>
#include <net/if.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
diff --git a/sys/dev/pci/iwic_fsm.c b/sys/dev/pci/iwic_fsm.c
index 39602ba78a9..81419efe107 100644
--- a/sys/dev/pci/iwic_fsm.c
+++ b/sys/dev/pci/iwic_fsm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: iwic_fsm.c,v 1.3 2005/12/11 12:22:50 christos Exp $ */
+/* $NetBSD: iwic_fsm.c,v 1.4 2007/10/19 12:00:51 ad Exp $ */
/*
* Copyright (c) 1999, 2000 Dave Boyce. All rights reserved.
@@ -36,7 +36,7 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iwic_fsm.c,v 1.3 2005/12/11 12:22:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iwic_fsm.c,v 1.4 2007/10/19 12:00:51 ad Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -47,7 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: iwic_fsm.c,v 1.3 2005/12/11 12:22:50 christos Exp $"
#include <sys/device.h>
#include <net/if.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
diff --git a/sys/dev/pci/iwic_pci.c b/sys/dev/pci/iwic_pci.c
index 1c820766eb7..318882802b4 100644
--- a/sys/dev/pci/iwic_pci.c
+++ b/sys/dev/pci/iwic_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: iwic_pci.c,v 1.10 2006/11/16 01:33:09 christos Exp $ */
+/* $NetBSD: iwic_pci.c,v 1.11 2007/10/19 12:00:51 ad Exp $ */
/*
* Copyright (c) 1999, 2000 Dave Boyce. All rights reserved.
@@ -36,7 +36,7 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iwic_pci.c,v 1.10 2006/11/16 01:33:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iwic_pci.c,v 1.11 2007/10/19 12:00:51 ad Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: iwic_pci.c,v 1.10 2006/11/16 01:33:09 christos Exp $
#include <sys/callout.h>
#include <net/if.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcidevs.h>
diff --git a/sys/dev/pci/iwicvar.h b/sys/dev/pci/iwicvar.h
index d8bda4afeac..7731557bab1 100644
--- a/sys/dev/pci/iwicvar.h
+++ b/sys/dev/pci/iwicvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: iwicvar.h,v 1.4 2005/12/11 12:22:50 christos Exp $ */
+/* $NetBSD: iwicvar.h,v 1.5 2007/10/19 12:00:51 ad Exp $ */
/*
* Copyright (c) 1999, 2000 Dave Boyce. All rights reserved.
@@ -126,7 +126,7 @@ struct iwic_softc {
* rd/wr register/fifo macros
*---------------------------------------------------------------------------*/
-#include <machine/bus.h>
+#include <sys/bus.h>
#define IWIC_READ(sc,reg) bus_space_read_1((sc)->sc_io_bt,(sc)->sc_io_bh,(reg))
#define IWIC_WRITE(sc,reg,val) bus_space_write_1((sc)->sc_io_bt,(sc)->sc_io_bh,(reg),(val))
diff --git a/sys/dev/pci/joy_eap.c b/sys/dev/pci/joy_eap.c
index 4a749c122fa..4040a950799 100644
--- a/sys/dev/pci/joy_eap.c
+++ b/sys/dev/pci/joy_eap.c
@@ -1,4 +1,4 @@
-/* $NetBSD: joy_eap.c,v 1.6 2006/11/16 01:33:09 christos Exp $ */
+/* $NetBSD: joy_eap.c,v 1.7 2007/10/19 12:00:51 ad Exp $ */
#include <sys/param.h>
#include <sys/systm.h>
@@ -6,7 +6,7 @@
#include <sys/device.h>
#include <sys/audioio.h>
#include <dev/audio_if.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/eapreg.h>
#include <dev/pci/eapvar.h>
diff --git a/sys/dev/pci/joy_eso.c b/sys/dev/pci/joy_eso.c
index 0b856e5b42b..31ceec69fc7 100644
--- a/sys/dev/pci/joy_eso.c
+++ b/sys/dev/pci/joy_eso.c
@@ -1,4 +1,4 @@
-/* $NetBSD: joy_eso.c,v 1.11 2006/11/16 01:33:09 christos Exp $ */
+/* $NetBSD: joy_eso.c,v 1.12 2007/10/19 12:00:51 ad Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: joy_eso.c,v 1.11 2006/11/16 01:33:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: joy_eso.c,v 1.12 2007/10/19 12:00:51 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: joy_eso.c,v 1.11 2006/11/16 01:33:09 christos Exp $"
#include <sys/select.h>
#include <sys/audioio.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/audio_if.h>
diff --git a/sys/dev/pci/joy_pci.c b/sys/dev/pci/joy_pci.c
index 6a8cb540017..0d07d36b26f 100644
--- a/sys/dev/pci/joy_pci.c
+++ b/sys/dev/pci/joy_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: joy_pci.c,v 1.14 2006/11/16 01:33:09 christos Exp $ */
+/* $NetBSD: joy_pci.c,v 1.15 2007/10/19 12:00:51 ad Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -37,14 +37,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: joy_pci.c,v 1.14 2006/11/16 01:33:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: joy_pci.c,v 1.15 2007/10/19 12:00:51 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
diff --git a/sys/dev/pci/ld_amr.c b/sys/dev/pci/ld_amr.c
index 1b841c9b0ff..b54e400db80 100644
--- a/sys/dev/pci/ld_amr.c
+++ b/sys/dev/pci/ld_amr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_amr.c,v 1.13 2007/07/29 12:50:22 ad Exp $ */
+/* $NetBSD: ld_amr.c,v 1.14 2007/10/19 12:00:51 ad Exp $ */
/*-
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_amr.c,v 1.13 2007/07/29 12:50:22 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_amr.c,v 1.14 2007/10/19 12:00:51 ad Exp $");
#include "rnd.h"
@@ -60,7 +60,7 @@ __KERNEL_RCSID(0, "$NetBSD: ld_amr.c,v 1.13 2007/07/29 12:50:22 ad Exp $");
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ldvar.h>
diff --git a/sys/dev/pci/ld_twa.c b/sys/dev/pci/ld_twa.c
index 45bec164fa7..c68f802204e 100644
--- a/sys/dev/pci/ld_twa.c
+++ b/sys/dev/pci/ld_twa.c
@@ -1,5 +1,5 @@
/* $wasabi: ld_twa.c,v 1.9 2006/02/14 18:44:37 jordanr Exp $ */
-/* $NetBSD: ld_twa.c,v 1.8 2007/08/07 08:00:46 simonb Exp $ */
+/* $NetBSD: ld_twa.c,v 1.9 2007/10/19 12:00:51 ad Exp $ */
/*-
* Copyright (c) 2000, 2001, 2002, 2003, 2004 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_twa.c,v 1.8 2007/08/07 08:00:46 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_twa.c,v 1.9 2007/10/19 12:00:51 ad Exp $");
#include "rnd.h"
@@ -61,7 +61,7 @@ __KERNEL_RCSID(0, "$NetBSD: ld_twa.c,v 1.8 2007/08/07 08:00:46 simonb Exp $");
#include <sys/rnd.h>
#endif
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <uvm/uvm_extern.h>
diff --git a/sys/dev/pci/ld_twe.c b/sys/dev/pci/ld_twe.c
index 030f3385d8e..ab39f8f51ff 100644
--- a/sys/dev/pci/ld_twe.c
+++ b/sys/dev/pci/ld_twe.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_twe.c,v 1.28 2007/07/29 12:50:22 ad Exp $ */
+/* $NetBSD: ld_twe.c,v 1.29 2007/10/19 12:00:51 ad Exp $ */
/*-
* Copyright (c) 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_twe.c,v 1.28 2007/07/29 12:50:22 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_twe.c,v 1.29 2007/10/19 12:00:51 ad Exp $");
#include "rnd.h"
@@ -59,7 +59,7 @@ __KERNEL_RCSID(0, "$NetBSD: ld_twe.c,v 1.28 2007/07/29 12:50:22 ad Exp $");
#include <sys/rnd.h>
#endif
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <uvm/uvm_extern.h>
diff --git a/sys/dev/pci/lpt_puc.c b/sys/dev/pci/lpt_puc.c
index e29509e1ba2..7c8ef94d3b9 100644
--- a/sys/dev/pci/lpt_puc.c
+++ b/sys/dev/pci/lpt_puc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lpt_puc.c,v 1.12 2006/11/16 01:33:09 christos Exp $ */
+/* $NetBSD: lpt_puc.c,v 1.13 2007/10/19 12:00:52 ad Exp $ */
/*
* Copyright (c) 1998 Christopher G. Demetriou. All rights reserved.
@@ -38,13 +38,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lpt_puc.c,v 1.12 2006/11/16 01:33:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lpt_puc.c,v 1.13 2007/10/19 12:00:52 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pucvar.h>
diff --git a/sys/dev/pci/mfi_pci.c b/sys/dev/pci/mfi_pci.c
index c718b417775..4e2b4f907ec 100644
--- a/sys/dev/pci/mfi_pci.c
+++ b/sys/dev/pci/mfi_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mfi_pci.c,v 1.2 2006/12/20 21:44:06 bouyer Exp $ */
+/* $NetBSD: mfi_pci.c,v 1.3 2007/10/19 12:00:52 ad Exp $ */
/* $OpenBSD: mfi_pci.c,v 1.11 2006/08/06 04:40:08 brad Exp $ */
/*
* Copyright (c) 2006 Marco Peereboom <marco@peereboom.us>
@@ -17,7 +17,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mfi_pci.c,v 1.2 2006/12/20 21:44:06 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfi_pci.c,v 1.3 2007/10/19 12:00:52 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -28,7 +28,7 @@ __KERNEL_RCSID(0, "$NetBSD: mfi_pci.c,v 1.2 2006/12/20 21:44:06 bouyer Exp $");
#include <dev/pci/pcidevs.h>
#include <dev/pci/pcivar.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/scsipi/scsipi_all.h>
#include <dev/scsipi/scsipi_disk.h>
diff --git a/sys/dev/pci/mlx_pci.c b/sys/dev/pci/mlx_pci.c
index fa66d9a636b..2da435f160c 100644
--- a/sys/dev/pci/mlx_pci.c
+++ b/sys/dev/pci/mlx_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mlx_pci.c,v 1.16 2006/11/16 01:33:09 christos Exp $ */
+/* $NetBSD: mlx_pci.c,v 1.17 2007/10/19 12:00:52 ad Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mlx_pci.c,v 1.16 2006/11/16 01:33:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mlx_pci.c,v 1.17 2007/10/19 12:00:52 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -79,7 +79,7 @@ __KERNEL_RCSID(0, "$NetBSD: mlx_pci.c,v 1.16 2006/11/16 01:33:09 christos Exp $"
#include <sys/callout.h>
#include <machine/endian.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/mlxreg.h>
#include <dev/ic/mlxio.h>
diff --git a/sys/dev/pci/mly.c b/sys/dev/pci/mly.c
index de3d55bad1e..d1903869f6d 100644
--- a/sys/dev/pci/mly.c
+++ b/sys/dev/pci/mly.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mly.c,v 1.35 2007/07/09 21:00:57 ad Exp $ */
+/* $NetBSD: mly.c,v 1.36 2007/10/19 12:00:52 ad Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mly.c,v 1.35 2007/07/09 21:00:57 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mly.c,v 1.36 2007/10/19 12:00:52 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -95,7 +95,7 @@ __KERNEL_RCSID(0, "$NetBSD: mly.c,v 1.35 2007/07/09 21:00:57 ad Exp $");
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/scsipi/scsi_all.h>
#include <dev/scsipi/scsipi_all.h>
diff --git a/sys/dev/pci/mpu_cmpci.c b/sys/dev/pci/mpu_cmpci.c
index 07816b13093..7f29e9a8ea4 100644
--- a/sys/dev/pci/mpu_cmpci.c
+++ b/sys/dev/pci/mpu_cmpci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mpu_cmpci.c,v 1.12 2006/11/16 01:33:09 christos Exp $ */
+/* $NetBSD: mpu_cmpci.c,v 1.13 2007/10/19 12:00:52 ad Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpu_cmpci.c,v 1.12 2006/11/16 01:33:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpu_cmpci.c,v 1.13 2007/10/19 12:00:52 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: mpu_cmpci.c,v 1.12 2006/11/16 01:33:09 christos Exp
#include <sys/audioio.h>
#include <sys/midiio.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/audio_if.h>
#include <dev/midi_if.h>
diff --git a/sys/dev/pci/mpu_eso.c b/sys/dev/pci/mpu_eso.c
index 463fcedf338..74f2a0e71ea 100644
--- a/sys/dev/pci/mpu_eso.c
+++ b/sys/dev/pci/mpu_eso.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mpu_eso.c,v 1.13 2006/11/16 01:33:09 christos Exp $ */
+/* $NetBSD: mpu_eso.c,v 1.14 2007/10/19 12:00:52 ad Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpu_eso.c,v 1.13 2006/11/16 01:33:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpu_eso.c,v 1.14 2007/10/19 12:00:52 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: mpu_eso.c,v 1.13 2006/11/16 01:33:09 christos Exp $"
#include <sys/audioio.h>
#include <sys/midiio.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/audio_if.h>
#include <dev/midi_if.h>
diff --git a/sys/dev/pci/mpu_fms.c b/sys/dev/pci/mpu_fms.c
index 752c502003b..ad91663bf8b 100644
--- a/sys/dev/pci/mpu_fms.c
+++ b/sys/dev/pci/mpu_fms.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mpu_fms.c,v 1.13 2006/11/16 01:33:09 christos Exp $ */
+/* $NetBSD: mpu_fms.c,v 1.14 2007/10/19 12:00:52 ad Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpu_fms.c,v 1.13 2006/11/16 01:33:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpu_fms.c,v 1.14 2007/10/19 12:00:52 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: mpu_fms.c,v 1.13 2006/11/16 01:33:09 christos Exp $"
#include <sys/audioio.h>
#include <sys/midiio.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/audio_if.h>
#include <dev/midi_if.h>
diff --git a/sys/dev/pci/mpu_yds.c b/sys/dev/pci/mpu_yds.c
index 34d8bd1ff80..ee525243168 100644
--- a/sys/dev/pci/mpu_yds.c
+++ b/sys/dev/pci/mpu_yds.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mpu_yds.c,v 1.12 2006/11/16 01:33:09 christos Exp $ */
+/* $NetBSD: mpu_yds.c,v 1.13 2007/10/19 12:00:52 ad Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpu_yds.c,v 1.12 2006/11/16 01:33:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpu_yds.c,v 1.13 2007/10/19 12:00:52 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: mpu_yds.c,v 1.12 2006/11/16 01:33:09 christos Exp $"
#include <sys/audioio.h>
#include <sys/midiio.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/audio_if.h>
#include <dev/midi_if.h>
diff --git a/sys/dev/pci/neo.c b/sys/dev/pci/neo.c
index 9234eb09cfe..7b02a93e142 100644
--- a/sys/dev/pci/neo.c
+++ b/sys/dev/pci/neo.c
@@ -1,4 +1,4 @@
-/* $NetBSD: neo.c,v 1.35 2006/11/16 01:33:09 christos Exp $ */
+/* $NetBSD: neo.c,v 1.36 2007/10/19 12:00:52 ad Exp $ */
/*
* Copyright (c) 1999 Cameron Grant <gandalf@vilnya.demon.co.uk>
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: neo.c,v 1.35 2006/11/16 01:33:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: neo.c,v 1.36 2007/10/19 12:00:52 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -40,7 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: neo.c,v 1.35 2006/11/16 01:33:09 christos Exp $");
#include <sys/malloc.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcidevs.h>
#include <dev/pci/pcivar.h>
diff --git a/sys/dev/pci/nfsmb.c b/sys/dev/pci/nfsmb.c
index dbdecd25b28..2e663d34fd4 100644
--- a/sys/dev/pci/nfsmb.c
+++ b/sys/dev/pci/nfsmb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nfsmb.c,v 1.6 2007/09/01 22:19:25 riz Exp $ */
+/* $NetBSD: nfsmb.c,v 1.7 2007/10/19 12:00:53 ad Exp $ */
/*
* Copyright (c) 2007 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfsmb.c,v 1.6 2007/09/01 22:19:25 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfsmb.c,v 1.7 2007/10/19 12:00:53 ad Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -35,7 +35,7 @@ __KERNEL_RCSID(0, "$NetBSD: nfsmb.c,v 1.6 2007/09/01 22:19:25 riz Exp $");
#include <sys/rwlock.h>
#include <sys/proc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/i2c/i2cvar.h>
diff --git a/sys/dev/pci/njs_pci.c b/sys/dev/pci/njs_pci.c
index d361793198c..18752db2917 100644
--- a/sys/dev/pci/njs_pci.c
+++ b/sys/dev/pci/njs_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: njs_pci.c,v 1.5 2006/11/16 01:33:09 christos Exp $ */
+/* $NetBSD: njs_pci.c,v 1.6 2007/10/19 12:00:53 ad Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -37,15 +37,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: njs_pci.c,v 1.5 2006/11/16 01:33:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: njs_pci.c,v 1.6 2007/10/19 12:00:53 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/scsipi/scsi_all.h>
#include <dev/scsipi/scsipi_all.h>
diff --git a/sys/dev/pci/oboe.c b/sys/dev/pci/oboe.c
index 66d39587be3..d2138141b02 100644
--- a/sys/dev/pci/oboe.c
+++ b/sys/dev/pci/oboe.c
@@ -1,4 +1,4 @@
-/* $NetBSD: oboe.c,v 1.26 2007/07/09 21:00:57 ad Exp $ */
+/* $NetBSD: oboe.c,v 1.27 2007/10/19 12:00:53 ad Exp $ */
/* XXXXFVDL THIS DRIVER IS BROKEN FOR NON-i386 -- vtophys() usage */
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: oboe.c,v 1.26 2007/07/09 21:00:57 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: oboe.c,v 1.27 2007/10/19 12:00:53 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -65,8 +65,8 @@ __KERNEL_RCSID(0, "$NetBSD: oboe.c,v 1.26 2007/07/09 21:00:57 ad Exp $");
#include <dev/pci/pcidevs.h>
#include <dev/pci/pcivar.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <uvm/uvm_extern.h>
#include <dev/pci/oboereg.h>
diff --git a/sys/dev/pci/ohci_pci.c b/sys/dev/pci/ohci_pci.c
index d6bcdd49168..e96804ae48d 100644
--- a/sys/dev/pci/ohci_pci.c
+++ b/sys/dev/pci/ohci_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci_pci.c,v 1.31 2006/11/16 01:33:09 christos Exp $ */
+/* $NetBSD: ohci_pci.c,v 1.32 2007/10/19 12:00:53 ad Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci_pci.c,v 1.31 2006/11/16 01:33:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci_pci.c,v 1.32 2007/10/19 12:00:53 ad Exp $");
#include "ehci.h"
@@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: ohci_pci.c,v 1.31 2006/11/16 01:33:09 christos Exp $
#include <sys/proc.h>
#include <sys/queue.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/usb_pci.h>
diff --git a/sys/dev/pci/opl_cmpci.c b/sys/dev/pci/opl_cmpci.c
index 5e92fca2437..0bdd82df4f5 100644
--- a/sys/dev/pci/opl_cmpci.c
+++ b/sys/dev/pci/opl_cmpci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: opl_cmpci.c,v 1.12 2006/11/16 01:33:09 christos Exp $ */
+/* $NetBSD: opl_cmpci.c,v 1.13 2007/10/19 12:00:53 ad Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opl_cmpci.c,v 1.12 2006/11/16 01:33:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opl_cmpci.c,v 1.13 2007/10/19 12:00:53 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: opl_cmpci.c,v 1.12 2006/11/16 01:33:09 christos Exp
#include <sys/audioio.h>
#include <sys/midiio.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/audio_if.h>
#include <dev/midi_if.h>
diff --git a/sys/dev/pci/opl_eso.c b/sys/dev/pci/opl_eso.c
index 6b463f62949..ca678c7beb4 100644
--- a/sys/dev/pci/opl_eso.c
+++ b/sys/dev/pci/opl_eso.c
@@ -1,4 +1,4 @@
-/* $NetBSD: opl_eso.c,v 1.13 2006/11/16 01:33:09 christos Exp $ */
+/* $NetBSD: opl_eso.c,v 1.14 2007/10/19 12:00:53 ad Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opl_eso.c,v 1.13 2006/11/16 01:33:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opl_eso.c,v 1.14 2007/10/19 12:00:53 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: opl_eso.c,v 1.13 2006/11/16 01:33:09 christos Exp $"
#include <sys/audioio.h>
#include <sys/midiio.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/audio_if.h>
#include <dev/midi_if.h>
diff --git a/sys/dev/pci/opl_fms.c b/sys/dev/pci/opl_fms.c
index 6d504f7a054..824d835805a 100644
--- a/sys/dev/pci/opl_fms.c
+++ b/sys/dev/pci/opl_fms.c
@@ -1,4 +1,4 @@
-/* $NetBSD: opl_fms.c,v 1.12 2006/11/16 01:33:09 christos Exp $ */
+/* $NetBSD: opl_fms.c,v 1.13 2007/10/19 12:00:53 ad Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opl_fms.c,v 1.12 2006/11/16 01:33:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opl_fms.c,v 1.13 2007/10/19 12:00:53 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: opl_fms.c,v 1.12 2006/11/16 01:33:09 christos Exp $"
#include <sys/audioio.h>
#include <sys/midiio.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/audio_if.h>
#include <dev/midi_if.h>
diff --git a/sys/dev/pci/opl_sv.c b/sys/dev/pci/opl_sv.c
index 6efe7a16121..f139e41af5a 100644
--- a/sys/dev/pci/opl_sv.c
+++ b/sys/dev/pci/opl_sv.c
@@ -1,4 +1,4 @@
-/* $NetBSD: opl_sv.c,v 1.11 2006/11/16 01:33:09 christos Exp $ */
+/* $NetBSD: opl_sv.c,v 1.12 2007/10/19 12:00:53 ad Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opl_sv.c,v 1.11 2006/11/16 01:33:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opl_sv.c,v 1.12 2007/10/19 12:00:53 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: opl_sv.c,v 1.11 2006/11/16 01:33:09 christos Exp $")
#include <sys/audioio.h>
#include <sys/midiio.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/audio_if.h>
#include <dev/midi_if.h>
diff --git a/sys/dev/pci/opl_yds.c b/sys/dev/pci/opl_yds.c
index 8ec767d7274..82ae4e904a5 100644
--- a/sys/dev/pci/opl_yds.c
+++ b/sys/dev/pci/opl_yds.c
@@ -1,4 +1,4 @@
-/* $NetBSD: opl_yds.c,v 1.12 2006/11/16 01:33:09 christos Exp $ */
+/* $NetBSD: opl_yds.c,v 1.13 2007/10/19 12:00:53 ad Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opl_yds.c,v 1.12 2006/11/16 01:33:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opl_yds.c,v 1.13 2007/10/19 12:00:53 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: opl_yds.c,v 1.12 2006/11/16 01:33:09 christos Exp $"
#include <sys/audioio.h>
#include <sys/midiio.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/audio_if.h>
#include <dev/midi_if.h>
diff --git a/sys/dev/pci/pccbb.c b/sys/dev/pci/pccbb.c
index 1a6d7f5147f..5e30ca8756d 100644
--- a/sys/dev/pci/pccbb.c
+++ b/sys/dev/pci/pccbb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pccbb.c,v 1.147 2007/08/11 00:45:35 dyoung Exp $ */
+/* $NetBSD: pccbb.c,v 1.148 2007/10/19 12:00:53 ad Exp $ */
/*
* Copyright (c) 1998, 1999 and 2000
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pccbb.c,v 1.147 2007/08/11 00:45:35 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pccbb.c,v 1.148 2007/10/19 12:00:53 ad Exp $");
/*
#define CBB_DEBUG
@@ -57,8 +57,8 @@ __KERNEL_RCSID(0, "$NetBSD: pccbb.c,v 1.147 2007/08/11 00:45:35 dyoung Exp $");
#include <sys/malloc.h>
#include <sys/proc.h>
-#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
diff --git a/sys/dev/pci/pci_subr.c b/sys/dev/pci/pci_subr.c
index c17df95d1b0..2f4bafdf212 100644
--- a/sys/dev/pci/pci_subr.c
+++ b/sys/dev/pci/pci_subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_subr.c,v 1.72 2007/10/07 23:00:47 joerg Exp $ */
+/* $NetBSD: pci_subr.c,v 1.73 2007/10/19 12:00:54 ad Exp $ */
/*
* Copyright (c) 1997 Zubin D. Dittia. All rights reserved.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.72 2007/10/07 23:00:47 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.73 2007/10/19 12:00:54 ad Exp $");
#ifdef _KERNEL_OPT
#include "opt_pci.h"
@@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.72 2007/10/07 23:00:47 joerg Exp $");
#ifdef _KERNEL
#include <sys/systm.h>
-#include <machine/intr.h>
+#include <sys/intr.h>
#else
#include <pci.h>
#include <stdbool.h>
diff --git a/sys/dev/pci/pcivar.h b/sys/dev/pci/pcivar.h
index e159cb1c9e5..33520b2ec5a 100644
--- a/sys/dev/pci/pcivar.h
+++ b/sys/dev/pci/pcivar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pcivar.h,v 1.74 2007/03/04 06:02:25 christos Exp $ */
+/* $NetBSD: pcivar.h,v 1.75 2007/10/19 12:00:54 ad Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -42,7 +42,7 @@
*/
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcireg.h>
/*
diff --git a/sys/dev/pci/pcscp.c b/sys/dev/pci/pcscp.c
index f54405fab39..d30585bdcb4 100644
--- a/sys/dev/pci/pcscp.c
+++ b/sys/dev/pci/pcscp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pcscp.c,v 1.39 2007/03/04 06:02:25 christos Exp $ */
+/* $NetBSD: pcscp.c,v 1.40 2007/10/19 12:00:54 ad Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
@@ -46,15 +46,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcscp.c,v 1.39 2007/03/04 06:02:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcscp.c,v 1.40 2007/10/19 12:00:54 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/buf.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <uvm/uvm_extern.h>
diff --git a/sys/dev/pci/piixpm.c b/sys/dev/pci/piixpm.c
index dfd197db2e3..01e316c7cc9 100644
--- a/sys/dev/pci/piixpm.c
+++ b/sys/dev/pci/piixpm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: piixpm.c,v 1.16 2007/08/27 15:57:13 xtraeme Exp $ */
+/* $NetBSD: piixpm.c,v 1.17 2007/10/19 12:00:54 ad Exp $ */
/* $OpenBSD: piixpm.c,v 1.20 2006/02/27 08:25:02 grange Exp $ */
/*
@@ -28,7 +28,7 @@
#include <sys/rwlock.h>
#include <sys/proc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcidevs.h>
#include <dev/pci/pcireg.h>
diff --git a/sys/dev/pci/radeonfb.c b/sys/dev/pci/radeonfb.c
index eef7752f7ac..0d5f6361a28 100644
--- a/sys/dev/pci/radeonfb.c
+++ b/sys/dev/pci/radeonfb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: radeonfb.c,v 1.20 2007/09/03 02:45:06 macallan Exp $ */
+/* $NetBSD: radeonfb.c,v 1.21 2007/10/19 12:00:54 ad Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeonfb.c,v 1.20 2007/09/03 02:45:06 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeonfb.c,v 1.21 2007/10/19 12:00:54 ad Exp $");
#define RADEONFB_DEFAULT_DEPTH 32
@@ -78,7 +78,7 @@ __KERNEL_RCSID(0, "$NetBSD: radeonfb.c,v 1.20 2007/09/03 02:45:06 macallan Exp $
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/kernel.h>
#include <sys/lwp.h>
#include <sys/kauth.h>
diff --git a/sys/dev/pci/radeonfb_bios.c b/sys/dev/pci/radeonfb_bios.c
index 7d9cf73b014..3bd91cab570 100644
--- a/sys/dev/pci/radeonfb_bios.c
+++ b/sys/dev/pci/radeonfb_bios.c
@@ -1,4 +1,4 @@
-/* $NetBSD: radeonfb_bios.c,v 1.1 2006/08/16 22:46:45 gdamore Exp $ */
+/* $NetBSD: radeonfb_bios.c,v 1.2 2007/10/19 12:00:55 ad Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -39,13 +39,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeonfb_bios.c,v 1.1 2006/08/16 22:46:45 gdamore Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeonfb_bios.c,v 1.2 2007/10/19 12:00:55 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcidevs.h>
#include <dev/pci/pcireg.h>
diff --git a/sys/dev/pci/radeonfb_i2c.c b/sys/dev/pci/radeonfb_i2c.c
index 1fdfe730296..07397c3bf12 100644
--- a/sys/dev/pci/radeonfb_i2c.c
+++ b/sys/dev/pci/radeonfb_i2c.c
@@ -37,14 +37,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeonfb_i2c.c,v 1.1 2006/08/16 22:46:45 gdamore Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeonfb_i2c.c,v 1.2 2007/10/19 12:00:55 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/malloc.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/i2c/i2cvar.h>
#include <dev/i2c/i2c_bitbang.h>
diff --git a/sys/dev/pci/sv.c b/sys/dev/pci/sv.c
index 4c5297d975e..ab1fb06333b 100644
--- a/sys/dev/pci/sv.c
+++ b/sys/dev/pci/sv.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sv.c,v 1.36 2007/03/04 06:02:25 christos Exp $ */
+/* $NetBSD: sv.c,v 1.37 2007/10/19 12:00:55 ad Exp $ */
/* $OpenBSD: sv.c,v 1.2 1998/07/13 01:50:15 csapuntz Exp $ */
/*
@@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sv.c,v 1.36 2007/03/04 06:02:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sv.c,v 1.37 2007/10/19 12:00:55 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -95,7 +95,7 @@ __KERNEL_RCSID(0, "$NetBSD: sv.c,v 1.36 2007/03/04 06:02:25 christos Exp $");
#include <dev/pci/svreg.h>
#include <dev/pci/svvar.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
/* XXX
* The SonicVibes DMA is broken and only works on 24-bit addresses.
diff --git a/sys/dev/pci/tga.c b/sys/dev/pci/tga.c
index 73b948909f0..3bd65881b40 100644
--- a/sys/dev/pci/tga.c
+++ b/sys/dev/pci/tga.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tga.c,v 1.66 2007/03/04 15:59:31 yamt Exp $ */
+/* $NetBSD: tga.c,v 1.67 2007/10/19 12:00:55 ad Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tga.c,v 1.66 2007/03/04 15:59:31 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tga.c,v 1.67 2007/10/19 12:00:55 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -39,8 +39,8 @@ __KERNEL_RCSID(0, "$NetBSD: tga.c,v 1.66 2007/03/04 15:59:31 yamt Exp $");
#include <sys/buf.h>
#include <sys/ioctl.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
diff --git a/sys/dev/pci/trm.c b/sys/dev/pci/trm.c
index 1cf7a8f7ddb..afcd21d1c4f 100644
--- a/sys/dev/pci/trm.c
+++ b/sys/dev/pci/trm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: trm.c,v 1.26 2007/03/04 06:02:25 christos Exp $ */
+/* $NetBSD: trm.c,v 1.27 2007/10/19 12:00:55 ad Exp $ */
/*
* Device Driver for Tekram DC395U/UW/F, DC315/U
* PCI SCSI Bus Master Host Adapter
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trm.c,v 1.26 2007/03/04 06:02:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trm.c,v 1.27 2007/10/19 12:00:55 ad Exp $");
/* #define TRM_DEBUG */
#ifdef TRM_DEBUG
@@ -60,8 +60,8 @@ int trm_debug = 1;
#include <sys/device.h>
#include <sys/queue.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <uvm/uvm_extern.h>
diff --git a/sys/dev/pci/twa.c b/sys/dev/pci/twa.c
index ba19f5334c6..170b53dba08 100644
--- a/sys/dev/pci/twa.c
+++ b/sys/dev/pci/twa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: twa.c,v 1.17 2007/03/04 06:02:26 christos Exp $ */
+/* $NetBSD: twa.c,v 1.18 2007/10/19 12:00:55 ad Exp $ */
/* $wasabi: twa.c,v 1.27 2006/07/28 18:17:21 wrstuden Exp $ */
/*-
@@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: twa.c,v 1.17 2007/03/04 06:02:26 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: twa.c,v 1.18 2007/10/19 12:00:55 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -97,7 +97,7 @@ __KERNEL_RCSID(0, "$NetBSD: twa.c,v 1.17 2007/03/04 06:02:26 christos Exp $");
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
diff --git a/sys/dev/pci/twareg.h b/sys/dev/pci/twareg.h
index 72e01263b7f..15c9c178c98 100644
--- a/sys/dev/pci/twareg.h
+++ b/sys/dev/pci/twareg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: twareg.h,v 1.6 2006/09/23 22:16:35 manu Exp $ */
+/* $NetBSD: twareg.h,v 1.7 2007/10/19 12:00:56 ad Exp $ */
/* $wasabi: twareg.h,v 1.14 2006/07/28 18:29:51 wrstuden Exp $ */
/*-
@@ -39,7 +39,7 @@
#define _PCI_TWAREG_H_
#if defined(_KERNEL)
-#include <machine/bus.h>
+#include <sys/bus.h>
/*
* The following macro has no business being in twa_reg.h. It should probably
diff --git a/sys/dev/pci/twe.c b/sys/dev/pci/twe.c
index 37988f968aa..0bfdaa0d00f 100644
--- a/sys/dev/pci/twe.c
+++ b/sys/dev/pci/twe.c
@@ -1,4 +1,4 @@
-/* $NetBSD: twe.c,v 1.83 2007/03/04 06:02:26 christos Exp $ */
+/* $NetBSD: twe.c,v 1.84 2007/10/19 12:00:56 ad Exp $ */
/*-
* Copyright (c) 2000, 2001, 2002, 2003, 2004 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: twe.c,v 1.83 2007/03/04 06:02:26 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: twe.c,v 1.84 2007/10/19 12:00:56 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -90,7 +90,7 @@ __KERNEL_RCSID(0, "$NetBSD: twe.c,v 1.83 2007/03/04 06:02:26 christos Exp $");
#include <uvm/uvm_extern.h>
#include <sys/bswap.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
diff --git a/sys/dev/pci/uhci_pci.c b/sys/dev/pci/uhci_pci.c
index d46e2858fd9..df49ff102c3 100644
--- a/sys/dev/pci/uhci_pci.c
+++ b/sys/dev/pci/uhci_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uhci_pci.c,v 1.36 2007/08/01 10:39:43 christos Exp $ */
+/* $NetBSD: uhci_pci.c,v 1.37 2007/10/19 12:00:56 ad Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhci_pci.c,v 1.36 2007/08/01 10:39:43 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci_pci.c,v 1.37 2007/10/19 12:00:56 ad Exp $");
#include "ehci.h"
@@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: uhci_pci.c,v 1.36 2007/08/01 10:39:43 christos Exp $
#include <sys/proc.h>
#include <sys/queue.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/usb_pci.h>
diff --git a/sys/dev/pci/unichromefb.c b/sys/dev/pci/unichromefb.c
index e92ceb2dbd0..3f41cb4ced3 100644
--- a/sys/dev/pci/unichromefb.c
+++ b/sys/dev/pci/unichromefb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: unichromefb.c,v 1.7 2007/03/23 22:17:30 jmcneill Exp $ */
+/* $NetBSD: unichromefb.c,v 1.8 2007/10/19 12:00:56 ad Exp $ */
/*-
* Copyright (c) 2006 Jared D. McNeill <jmcneill@invisible.ca>
@@ -57,14 +57,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: unichromefb.c,v 1.7 2007/03/23 22:17:30 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: unichromefb.c,v 1.8 2007/10/19 12:00:56 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
diff --git a/sys/dev/pci/universe_pci.c b/sys/dev/pci/universe_pci.c
index 9b764542c44..7aa2381c174 100644
--- a/sys/dev/pci/universe_pci.c
+++ b/sys/dev/pci/universe_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: universe_pci.c,v 1.7 2005/12/11 12:22:51 christos Exp $ */
+/* $NetBSD: universe_pci.c,v 1.8 2007/10/19 12:00:56 ad Exp $ */
/*
* Copyright (c) 1999
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: universe_pci.c,v 1.7 2005/12/11 12:22:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: universe_pci.c,v 1.8 2007/10/19 12:00:56 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: universe_pci.c,v 1.7 2005/12/11 12:22:51 christos Ex
#include <dev/pci/pcivar.h>
/*#include <dev/pci/pcidevs.h>*/
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/vme/vmereg.h>
#include <dev/vme/vmevar.h>
diff --git a/sys/dev/pci/viaenv.c b/sys/dev/pci/viaenv.c
index 17ef9c8477b..5073641ce88 100644
--- a/sys/dev/pci/viaenv.c
+++ b/sys/dev/pci/viaenv.c
@@ -1,4 +1,4 @@
-/* $NetBSD: viaenv.c,v 1.23 2007/08/26 17:15:42 xtraeme Exp $ */
+/* $NetBSD: viaenv.c,v 1.24 2007/10/19 12:00:56 ad Exp $ */
/*
* Copyright (c) 2000 Johan Danielsson
@@ -38,14 +38,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: viaenv.c,v 1.23 2007/08/26 17:15:42 xtraeme Exp $");
+__KERNEL_RCSID(0, "$NetBSD: viaenv.c,v 1.24 2007/10/19 12:00:56 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/acpipmtimer.h>
#include <dev/pci/pcivar.h>
diff --git a/sys/dev/pci/weasel_pci.c b/sys/dev/pci/weasel_pci.c
index ae516250a10..b19049a1a48 100644
--- a/sys/dev/pci/weasel_pci.c
+++ b/sys/dev/pci/weasel_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: weasel_pci.c,v 1.9 2006/11/16 01:33:10 christos Exp $ */
+/* $NetBSD: weasel_pci.c,v 1.10 2007/10/19 12:00:56 ad Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: weasel_pci.c,v 1.9 2006/11/16 01:33:10 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: weasel_pci.c,v 1.10 2007/10/19 12:00:56 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -54,7 +54,7 @@ __KERNEL_RCSID(0, "$NetBSD: weasel_pci.c,v 1.9 2006/11/16 01:33:10 christos Exp
#include <sys/wdog.h>
#include <sys/endian.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
diff --git a/sys/dev/pci/yds.c b/sys/dev/pci/yds.c
index 33c5a02274a..08cb974906e 100644
--- a/sys/dev/pci/yds.c
+++ b/sys/dev/pci/yds.c
@@ -1,4 +1,4 @@
-/* $NetBSD: yds.c,v 1.37 2006/11/16 01:33:10 christos Exp $ */
+/* $NetBSD: yds.c,v 1.38 2007/10/19 12:00:56 ad Exp $ */
/*
* Copyright (c) 2000, 2001 Kazuki Sakamoto and Minoura Makoto.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: yds.c,v 1.37 2006/11/16 01:33:10 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: yds.c,v 1.38 2007/10/19 12:00:56 ad Exp $");
#include "mpu.h"
@@ -63,8 +63,8 @@ __KERNEL_RCSID(0, "$NetBSD: yds.c,v 1.37 2006/11/16 01:33:10 christos Exp $");
#include <dev/ic/ac97var.h>
#include <dev/ic/mpuvar.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/microcode/yds/yds_hwmcode.h>
#include <dev/pci/ydsreg.h>
diff --git a/sys/dev/pckbport/pckbd.c b/sys/dev/pckbport/pckbd.c
index 2aeff64ff99..05b379f4b69 100644
--- a/sys/dev/pckbport/pckbd.c
+++ b/sys/dev/pckbport/pckbd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbd.c,v 1.15 2007/03/04 06:02:27 christos Exp $ */
+/* $NetBSD: pckbd.c,v 1.16 2007/10/19 12:01:03 ad Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pckbd.c,v 1.15 2007/03/04 06:02:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbd.c,v 1.16 2007/10/19 12:01:03 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -83,7 +83,7 @@ __KERNEL_RCSID(0, "$NetBSD: pckbd.c,v 1.15 2007/03/04 06:02:27 christos Exp $");
#include <sys/malloc.h>
#include <sys/ioctl.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pckbport/pckbportvar.h>
diff --git a/sys/dev/pckbport/pms.c b/sys/dev/pckbport/pms.c
index 3d1a2bb60ac..1118aeec040 100644
--- a/sys/dev/pckbport/pms.c
+++ b/sys/dev/pckbport/pms.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pms.c,v 1.19 2007/07/19 22:18:54 dsl Exp $ */
+/* $NetBSD: pms.c,v 1.20 2007/10/19 12:01:03 ad Exp $ */
/*-
* Copyright (c) 2004 Kentaro Kurahone.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pms.c,v 1.19 2007/07/19 22:18:54 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pms.c,v 1.20 2007/10/19 12:01:03 ad Exp $");
#include "opt_pms.h"
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: pms.c,v 1.19 2007/07/19 22:18:54 dsl Exp $");
#include <sys/kernel.h>
#include <sys/kthread.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pckbport/pckbportvar.h>
#ifdef PMS_SYNAPTICS_TOUCHPAD
diff --git a/sys/dev/pckbport/synaptics.c b/sys/dev/pckbport/synaptics.c
index a7386eb3925..9354bf9275f 100644
--- a/sys/dev/pckbport/synaptics.c
+++ b/sys/dev/pckbport/synaptics.c
@@ -1,4 +1,4 @@
-/* $NetBSD: synaptics.c,v 1.15 2007/03/25 20:28:03 mlelstv Exp $ */
+/* $NetBSD: synaptics.c,v 1.16 2007/10/19 12:01:03 ad Exp $ */
/*
* Copyright (c) 2005, Steve C. Woodford
@@ -56,7 +56,7 @@
#include <sys/sysctl.h>
#include <sys/kernel.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pckbport/pckbportvar.h>
diff --git a/sys/dev/pcmcia/aic_pcmcia.c b/sys/dev/pcmcia/aic_pcmcia.c
index d7746cc1851..122839a584f 100644
--- a/sys/dev/pcmcia/aic_pcmcia.c
+++ b/sys/dev/pcmcia/aic_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aic_pcmcia.c,v 1.35 2006/11/16 01:33:20 christos Exp $ */
+/* $NetBSD: aic_pcmcia.c,v 1.36 2007/10/19 12:01:03 ad Exp $ */
/*
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
@@ -30,16 +30,16 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aic_pcmcia.c,v 1.35 2006/11/16 01:33:20 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic_pcmcia.c,v 1.36 2007/10/19 12:01:03 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/select.h>
#include <sys/device.h>
-#include <machine/cpu.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/cpu.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/scsipi/scsipi_all.h>
#include <dev/scsipi/scsipiconf.h>
diff --git a/sys/dev/pcmcia/bt3c.c b/sys/dev/pcmcia/bt3c.c
index 6230e0cb515..054de85752b 100644
--- a/sys/dev/pcmcia/bt3c.c
+++ b/sys/dev/pcmcia/bt3c.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bt3c.c,v 1.11 2007/10/02 05:37:50 plunky Exp $ */
+/* $NetBSD: bt3c.c,v 1.12 2007/10/19 12:01:03 ad Exp $ */
/*-
* Copyright (c) 2005 Iain D. Hibbert,
@@ -69,16 +69,16 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bt3c.c,v 1.11 2007/10/02 05:37:50 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bt3c.c,v 1.12 2007/10/19 12:01:03 ad Exp $");
#include <sys/param.h>
#include <sys/device.h>
#include <sys/mbuf.h>
#include <sys/systm.h>
-#include <machine/cpu.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/cpu.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/pcmcia/pcmciareg.h>
#include <dev/pcmcia/pcmciavar.h>
diff --git a/sys/dev/pcmcia/btbc.c b/sys/dev/pcmcia/btbc.c
index e8d3bbd3c5a..94165baf479 100644
--- a/sys/dev/pcmcia/btbc.c
+++ b/sys/dev/pcmcia/btbc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: btbc.c,v 1.4 2007/10/16 13:47:17 kiyohara Exp $ */
+/* $NetBSD: btbc.c,v 1.5 2007/10/19 12:01:03 ad Exp $ */
/*
* Copyright (c) 2007 KIYOHARA Takashi
* All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: btbc.c,v 1.4 2007/10/16 13:47:17 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btbc.c,v 1.5 2007/10/19 12:01:03 ad Exp $");
#include <sys/param.h>
#include <sys/callout.h>
@@ -40,8 +40,8 @@ __KERNEL_RCSID(0, "$NetBSD: btbc.c,v 1.4 2007/10/16 13:47:17 kiyohara Exp $");
#include <sys/mbuf.h>
#include <sys/proc.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/pcmcia/pcmciareg.h>
#include <dev/pcmcia/pcmciavar.h>
diff --git a/sys/dev/pcmcia/com_pcmcia.c b/sys/dev/pcmcia/com_pcmcia.c
index 71b90029f36..be0e06f41f5 100644
--- a/sys/dev/pcmcia/com_pcmcia.c
+++ b/sys/dev/pcmcia/com_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: com_pcmcia.c,v 1.55 2007/09/22 19:59:56 kiyohara Exp $ */
+/* $NetBSD: com_pcmcia.c,v 1.56 2007/10/19 12:01:03 ad Exp $ */
/*-
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_pcmcia.c,v 1.55 2007/09/22 19:59:56 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_pcmcia.c,v 1.56 2007/10/19 12:01:03 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -84,8 +84,8 @@ __KERNEL_RCSID(0, "$NetBSD: com_pcmcia.c,v 1.55 2007/09/22 19:59:56 kiyohara Exp
#include <sys/syslog.h>
#include <sys/device.h>
-#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
#include <dev/pcmcia/pcmciavar.h>
#include <dev/pcmcia/pcmciareg.h>
diff --git a/sys/dev/pcmcia/esl.c b/sys/dev/pcmcia/esl.c
index 4926cf1d732..1e62968d8c1 100644
--- a/sys/dev/pcmcia/esl.c
+++ b/sys/dev/pcmcia/esl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: esl.c,v 1.21 2006/11/16 01:33:20 christos Exp $ */
+/* $NetBSD: esl.c,v 1.22 2007/10/19 12:01:04 ad Exp $ */
/*
* Copyright (c) 2001 Jared D. McNeill <jmcneill@invisible.ca>
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esl.c,v 1.21 2006/11/16 01:33:20 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esl.c,v 1.22 2007/10/19 12:01:04 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -46,9 +46,9 @@ __KERNEL_RCSID(0, "$NetBSD: esl.c,v 1.21 2006/11/16 01:33:20 christos Exp $");
#include <sys/kernel.h>
#include <sys/audioio.h>
-#include <machine/cpu.h>
-#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/cpu.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
#include <machine/pio.h>
#include <dev/audio_if.h>
diff --git a/sys/dev/pcmcia/esl_pcmcia.c b/sys/dev/pcmcia/esl_pcmcia.c
index c5c6eba3097..0115ae33a3d 100644
--- a/sys/dev/pcmcia/esl_pcmcia.c
+++ b/sys/dev/pcmcia/esl_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: esl_pcmcia.c,v 1.17 2006/11/16 01:33:20 christos Exp $ */
+/* $NetBSD: esl_pcmcia.c,v 1.18 2007/10/19 12:01:04 ad Exp $ */
/*
* Copyright (c) 2000 Jared D. McNeill <jmcneill@invisible.ca>
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esl_pcmcia.c,v 1.17 2006/11/16 01:33:20 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esl_pcmcia.c,v 1.18 2007/10/19 12:01:04 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -42,8 +42,8 @@ __KERNEL_RCSID(0, "$NetBSD: esl_pcmcia.c,v 1.17 2006/11/16 01:33:20 christos Exp
#include <sys/buf.h>
#include <sys/audioio.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/audio_if.h>
diff --git a/sys/dev/pcmcia/esp_pcmcia.c b/sys/dev/pcmcia/esp_pcmcia.c
index 3f16a841abe..1b09c5a4baf 100644
--- a/sys/dev/pcmcia/esp_pcmcia.c
+++ b/sys/dev/pcmcia/esp_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: esp_pcmcia.c,v 1.32 2007/07/09 21:01:19 ad Exp $ */
+/* $NetBSD: esp_pcmcia.c,v 1.33 2007/10/19 12:01:04 ad Exp $ */
/*-
* Copyright (c) 2000, 2004 The NetBSD Foundation, Inc.
@@ -37,15 +37,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esp_pcmcia.c,v 1.32 2007/07/09 21:01:19 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esp_pcmcia.c,v 1.33 2007/10/19 12:01:04 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/buf.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/scsipi/scsi_all.h>
#include <dev/scsipi/scsipi_all.h>
diff --git a/sys/dev/pcmcia/fdc_pcmcia.c b/sys/dev/pcmcia/fdc_pcmcia.c
index 0c584284209..84cdf4e46d6 100644
--- a/sys/dev/pcmcia/fdc_pcmcia.c
+++ b/sys/dev/pcmcia/fdc_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fdc_pcmcia.c,v 1.17 2005/12/11 12:23:23 christos Exp $ */
+/* $NetBSD: fdc_pcmcia.c,v 1.18 2007/10/19 12:01:04 ad Exp $ */
/*-
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdc_pcmcia.c,v 1.17 2005/12/11 12:23:23 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdc_pcmcia.c,v 1.18 2007/10/19 12:01:04 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -46,8 +46,8 @@ __KERNEL_RCSID(0, "$NetBSD: fdc_pcmcia.c,v 1.17 2005/12/11 12:23:23 christos Exp
#include <sys/disk.h>
#include <sys/buf.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/pcmcia/pcmciareg.h>
#include <dev/pcmcia/pcmciavar.h>
diff --git a/sys/dev/pcmcia/if_an_pcmcia.c b/sys/dev/pcmcia/if_an_pcmcia.c
index fc6368fa1ea..2762f9c247c 100644
--- a/sys/dev/pcmcia/if_an_pcmcia.c
+++ b/sys/dev/pcmcia/if_an_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_an_pcmcia.c,v 1.31 2006/11/16 01:33:20 christos Exp $ */
+/* $NetBSD: if_an_pcmcia.c,v 1.32 2007/10/19 12:01:04 ad Exp $ */
/*-
* Copyright (c) 2000, 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_an_pcmcia.c,v 1.31 2006/11/16 01:33:20 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_an_pcmcia.c,v 1.32 2007/10/19 12:01:04 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -58,9 +58,9 @@ __KERNEL_RCSID(0, "$NetBSD: if_an_pcmcia.c,v 1.31 2006/11/16 01:33:20 christos E
#include <net80211/ieee80211_netbsd.h>
#include <net80211/ieee80211_var.h>
-#include <machine/cpu.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/cpu.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/ic/anreg.h>
#include <dev/ic/anvar.h>
diff --git a/sys/dev/pcmcia/if_awi_pcmcia.c b/sys/dev/pcmcia/if_awi_pcmcia.c
index 198a545f6f7..b69917b5218 100644
--- a/sys/dev/pcmcia/if_awi_pcmcia.c
+++ b/sys/dev/pcmcia/if_awi_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_awi_pcmcia.c,v 1.37 2006/11/16 01:33:20 christos Exp $ */
+/* $NetBSD: if_awi_pcmcia.c,v 1.38 2007/10/19 12:01:04 ad Exp $ */
/*-
* Copyright (c) 1999, 2004 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_awi_pcmcia.c,v 1.37 2006/11/16 01:33:20 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_awi_pcmcia.c,v 1.38 2007/10/19 12:01:04 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -65,9 +65,9 @@ __KERNEL_RCSID(0, "$NetBSD: if_awi_pcmcia.c,v 1.37 2006/11/16 01:33:20 christos
#include <net80211/ieee80211_netbsd.h>
#include <net80211/ieee80211_var.h>
-#include <machine/cpu.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/cpu.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/ic/am79c930reg.h>
#include <dev/ic/am79c930var.h>
diff --git a/sys/dev/pcmcia/if_cs_pcmcia.c b/sys/dev/pcmcia/if_cs_pcmcia.c
index ef4084181b7..70842df41b4 100644
--- a/sys/dev/pcmcia/if_cs_pcmcia.c
+++ b/sys/dev/pcmcia/if_cs_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cs_pcmcia.c,v 1.14 2006/11/16 01:33:20 christos Exp $ */
+/* $NetBSD: if_cs_pcmcia.c,v 1.15 2007/10/19 12:01:04 ad Exp $ */
/*-
* Copyright (c)2001 YAMAMOTO Takashi,
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cs_pcmcia.c,v 1.14 2006/11/16 01:33:20 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cs_pcmcia.c,v 1.15 2007/10/19 12:01:04 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -44,8 +44,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_cs_pcmcia.c,v 1.14 2006/11/16 01:33:20 christos E
#include <net/if_ether.h>
#include <net/if_media.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/pcmcia/pcmciareg.h>
#include <dev/pcmcia/pcmciavar.h>
diff --git a/sys/dev/pcmcia/if_ep_pcmcia.c b/sys/dev/pcmcia/if_ep_pcmcia.c
index 9f50d067785..22e6e961958 100644
--- a/sys/dev/pcmcia/if_ep_pcmcia.c
+++ b/sys/dev/pcmcia/if_ep_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ep_pcmcia.c,v 1.58 2006/11/16 01:33:20 christos Exp $ */
+/* $NetBSD: if_ep_pcmcia.c,v 1.59 2007/10/19 12:01:04 ad Exp $ */
/*-
* Copyright (c) 1998, 2000, 2004 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ep_pcmcia.c,v 1.58 2006/11/16 01:33:20 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ep_pcmcia.c,v 1.59 2007/10/19 12:01:04 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -84,9 +84,9 @@ __KERNEL_RCSID(0, "$NetBSD: if_ep_pcmcia.c,v 1.58 2006/11/16 01:33:20 christos E
#include <net/if_ether.h>
#include <net/if_media.h>
-#include <machine/cpu.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/cpu.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/mii/miivar.h>
diff --git a/sys/dev/pcmcia/if_mbe_pcmcia.c b/sys/dev/pcmcia/if_mbe_pcmcia.c
index a71bc2ba7a3..45dd768c419 100644
--- a/sys/dev/pcmcia/if_mbe_pcmcia.c
+++ b/sys/dev/pcmcia/if_mbe_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mbe_pcmcia.c,v 1.41 2006/11/16 01:33:20 christos Exp $ */
+/* $NetBSD: if_mbe_pcmcia.c,v 1.42 2007/10/19 12:01:04 ad Exp $ */
/*-
* Copyright (c) 1998, 2000, 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mbe_pcmcia.c,v 1.41 2006/11/16 01:33:20 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mbe_pcmcia.c,v 1.42 2007/10/19 12:01:04 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -48,8 +48,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_mbe_pcmcia.c,v 1.41 2006/11/16 01:33:20 christos
#include <net/if_ether.h>
#include <net/if_media.h>
-#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
#include <dev/ic/mb86960reg.h>
#include <dev/ic/mb86960var.h>
diff --git a/sys/dev/pcmcia/if_ne_pcmcia.c b/sys/dev/pcmcia/if_ne_pcmcia.c
index 39e0132621b..6e0b0bf06b5 100644
--- a/sys/dev/pcmcia/if_ne_pcmcia.c
+++ b/sys/dev/pcmcia/if_ne_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ne_pcmcia.c,v 1.149 2006/11/16 01:33:20 christos Exp $ */
+/* $NetBSD: if_ne_pcmcia.c,v 1.150 2007/10/19 12:01:04 ad Exp $ */
/*
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ne_pcmcia.c,v 1.149 2006/11/16 01:33:20 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ne_pcmcia.c,v 1.150 2007/10/19 12:01:04 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -43,8 +43,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_ne_pcmcia.c,v 1.149 2006/11/16 01:33:20 christos
#include <net/if_media.h>
#include <net/if_ether.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/pcmcia/pcmciareg.h>
#include <dev/pcmcia/pcmciavar.h>
diff --git a/sys/dev/pcmcia/if_ray.c b/sys/dev/pcmcia/if_ray.c
index a44bf8a7e74..db6213f6387 100644
--- a/sys/dev/pcmcia/if_ray.c
+++ b/sys/dev/pcmcia/if_ray.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ray.c,v 1.66 2007/09/01 07:32:31 dyoung Exp $ */
+/* $NetBSD: if_ray.c,v 1.67 2007/10/19 12:01:05 ad Exp $ */
/*
* Copyright (c) 2000 Christian E. Hopps
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ray.c,v 1.66 2007/09/01 07:32:31 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ray.c,v 1.67 2007/10/19 12:01:05 ad Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -95,9 +95,9 @@ __KERNEL_RCSID(0, "$NetBSD: if_ray.c,v 1.66 2007/09/01 07:32:31 dyoung Exp $");
#include <net/bpfdesc.h>
#endif
-#include <machine/cpu.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/cpu.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/pcmcia/pcmciareg.h>
#include <dev/pcmcia/pcmciavar.h>
diff --git a/sys/dev/pcmcia/if_sm_pcmcia.c b/sys/dev/pcmcia/if_sm_pcmcia.c
index 42208ea3637..588088f5c70 100644
--- a/sys/dev/pcmcia/if_sm_pcmcia.c
+++ b/sys/dev/pcmcia/if_sm_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sm_pcmcia.c,v 1.48 2006/11/16 01:33:20 christos Exp $ */
+/* $NetBSD: if_sm_pcmcia.c,v 1.49 2007/10/19 12:01:05 ad Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000, 2004 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sm_pcmcia.c,v 1.48 2006/11/16 01:33:20 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sm_pcmcia.c,v 1.49 2007/10/19 12:01:05 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -55,8 +55,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_sm_pcmcia.c,v 1.48 2006/11/16 01:33:20 christos E
#include <net/if_ether.h>
#include <net/if_media.h>
-#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
diff --git a/sys/dev/pcmcia/if_tr_pcmcia.c b/sys/dev/pcmcia/if_tr_pcmcia.c
index c8ff5335dec..a9b544da0ce 100644
--- a/sys/dev/pcmcia/if_tr_pcmcia.c
+++ b/sys/dev/pcmcia/if_tr_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tr_pcmcia.c,v 1.18 2006/11/16 01:33:20 christos Exp $ */
+/* $NetBSD: if_tr_pcmcia.c,v 1.19 2007/10/19 12:01:05 ad Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang. All rights reserved.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tr_pcmcia.c,v 1.18 2006/11/16 01:33:20 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tr_pcmcia.c,v 1.19 2007/10/19 12:01:05 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -59,8 +59,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_tr_pcmcia.c,v 1.18 2006/11/16 01:33:20 christos E
#include <net/if_ether.h>
#include <net/if_media.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/ic/tropicreg.h>
#include <dev/ic/tropicvar.h>
diff --git a/sys/dev/pcmcia/if_wi_pcmcia.c b/sys/dev/pcmcia/if_wi_pcmcia.c
index 780ebf2cfe5..769621aa38f 100644
--- a/sys/dev/pcmcia/if_wi_pcmcia.c
+++ b/sys/dev/pcmcia/if_wi_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wi_pcmcia.c,v 1.75 2006/12/10 03:44:28 uwe Exp $ */
+/* $NetBSD: if_wi_pcmcia.c,v 1.76 2007/10/19 12:01:05 ad Exp $ */
/*-
* Copyright (c) 2001, 2004 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wi_pcmcia.c,v 1.75 2006/12/10 03:44:28 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wi_pcmcia.c,v 1.76 2007/10/19 12:01:05 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -59,9 +59,9 @@ __KERNEL_RCSID(0, "$NetBSD: if_wi_pcmcia.c,v 1.75 2006/12/10 03:44:28 uwe Exp $"
#include <net80211/ieee80211_radiotap.h>
#include <net80211/ieee80211_rssadapt.h>
-#include <machine/cpu.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/cpu.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/ic/wi_ieee.h>
#include <dev/ic/wireg.h>
diff --git a/sys/dev/pcmcia/isic_pcmcia.c b/sys/dev/pcmcia/isic_pcmcia.c
index 120d01dca87..63747529d67 100644
--- a/sys/dev/pcmcia/isic_pcmcia.c
+++ b/sys/dev/pcmcia/isic_pcmcia.c
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_pcmcia.c,v 1.32 2007/07/09 21:01:20 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_pcmcia.c,v 1.33 2007/10/19 12:01:05 ad Exp $");
#include <sys/param.h>
#include <sys/errno.h>
@@ -50,9 +50,9 @@ __KERNEL_RCSID(0, "$NetBSD: isic_pcmcia.c,v 1.32 2007/07/09 21:01:20 ad Exp $");
#include <sys/callout.h>
#endif
-#include <machine/cpu.h>
-#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/cpu.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
#include <dev/pcmcia/pcmciareg.h>
#include <dev/pcmcia/pcmciavar.h>
diff --git a/sys/dev/pcmcia/isic_pcmcia_avm_fritz.c b/sys/dev/pcmcia/isic_pcmcia_avm_fritz.c
index f417dfd84c7..31b7e42c4a1 100644
--- a/sys/dev/pcmcia/isic_pcmcia_avm_fritz.c
+++ b/sys/dev/pcmcia/isic_pcmcia_avm_fritz.c
@@ -33,7 +33,7 @@
* Fritz!Card pcmcia specific routines for isic driver
* ---------------------------------------------------
*
- * $Id: isic_pcmcia_avm_fritz.c,v 1.11 2007/03/04 06:02:28 christos Exp $
+ * $Id: isic_pcmcia_avm_fritz.c,v 1.12 2007/10/19 12:01:05 ad Exp $
*
* last edit-date: [Fri Jan 5 11:39:32 2001]
*
@@ -43,7 +43,7 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_pcmcia_avm_fritz.c,v 1.11 2007/03/04 06:02:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_pcmcia_avm_fritz.c,v 1.12 2007/10/19 12:01:05 ad Exp $");
#include "opt_isicpcmcia.h"
#ifdef ISICPCMCIA_AVM_A1
@@ -62,7 +62,7 @@ __KERNEL_RCSID(0, "$NetBSD: isic_pcmcia_avm_fritz.c,v 1.11 2007/03/04 06:02:28 c
#include <machine/clock.h>
#include <i386/isa/isa_device.h>
#else
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/device.h>
#endif
diff --git a/sys/dev/pcmcia/isic_pcmcia_elsa_isdnmc.c b/sys/dev/pcmcia/isic_pcmcia_elsa_isdnmc.c
index 7cf7b55ee6b..f5d9fc57c18 100644
--- a/sys/dev/pcmcia/isic_pcmcia_elsa_isdnmc.c
+++ b/sys/dev/pcmcia/isic_pcmcia_elsa_isdnmc.c
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_pcmcia_elsa_isdnmc.c,v 1.11 2005/12/11 12:23:23 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_pcmcia_elsa_isdnmc.c,v 1.12 2007/10/19 12:01:05 ad Exp $");
#include "opt_isicpcmcia.h"
#ifdef ISICPCMCIA_ELSA_ISDNMC
@@ -54,7 +54,7 @@ __KERNEL_RCSID(0, "$NetBSD: isic_pcmcia_elsa_isdnmc.c,v 1.11 2005/12/11 12:23:23
#include <machine/clock.h>
#include <i386/isa/isa_device.h>
#else
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/device.h>
#endif
diff --git a/sys/dev/pcmcia/isic_pcmcia_elsa_mcall.c b/sys/dev/pcmcia/isic_pcmcia_elsa_mcall.c
index a080129ecfd..8d7e0bd478c 100644
--- a/sys/dev/pcmcia/isic_pcmcia_elsa_mcall.c
+++ b/sys/dev/pcmcia/isic_pcmcia_elsa_mcall.c
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_pcmcia_elsa_mcall.c,v 1.12 2006/11/16 01:33:20 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_pcmcia_elsa_mcall.c,v 1.13 2007/10/19 12:01:05 ad Exp $");
#include "opt_isicpcmcia.h"
#ifdef ISICPCMCIA_ELSA_MCALL
@@ -54,7 +54,7 @@ __KERNEL_RCSID(0, "$NetBSD: isic_pcmcia_elsa_mcall.c,v 1.12 2006/11/16 01:33:20
#include <machine/clock.h>
#include <i386/isa/isa_device.h>
#else
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/device.h>
#endif
diff --git a/sys/dev/pcmcia/isic_pcmcia_sbspeedstar2.c b/sys/dev/pcmcia/isic_pcmcia_sbspeedstar2.c
index 21b9965780a..064bca24fa7 100644
--- a/sys/dev/pcmcia/isic_pcmcia_sbspeedstar2.c
+++ b/sys/dev/pcmcia/isic_pcmcia_sbspeedstar2.c
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_pcmcia_sbspeedstar2.c,v 1.10 2005/12/11 12:23:23 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_pcmcia_sbspeedstar2.c,v 1.11 2007/10/19 12:01:06 ad Exp $");
#include "opt_isicpcmcia.h"
#ifdef ISICPCMCIA_SBSPEEDSTAR2
@@ -64,7 +64,7 @@ __KERNEL_RCSID(0, "$NetBSD: isic_pcmcia_sbspeedstar2.c,v 1.10 2005/12/11 12:23:2
#include <sys/systm.h>
#include <sys/mbuf.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/socket.h>
#include <net/if.h>
#include <netisdn/i4b_debug.h>
diff --git a/sys/dev/pcmcia/mhzc.c b/sys/dev/pcmcia/mhzc.c
index d767d609500..2c7831012b7 100644
--- a/sys/dev/pcmcia/mhzc.c
+++ b/sys/dev/pcmcia/mhzc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mhzc.c,v 1.39 2006/11/16 01:33:20 christos Exp $ */
+/* $NetBSD: mhzc.c,v 1.40 2007/10/19 12:01:06 ad Exp $ */
/*-
* Copyright (c) 1999, 2000, 2004 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mhzc.c,v 1.39 2006/11/16 01:33:20 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mhzc.c,v 1.40 2007/10/19 12:01:06 ad Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -83,8 +83,8 @@ __KERNEL_RCSID(0, "$NetBSD: mhzc.c,v 1.39 2006/11/16 01:33:20 christos Exp $");
#include <net/bpfdesc.h>
#endif
-#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
#include <dev/ic/comreg.h>
#include <dev/ic/comvar.h>
diff --git a/sys/dev/pcmcia/nca_pcmcia.c b/sys/dev/pcmcia/nca_pcmcia.c
index 81a574a425d..8e04a04b544 100644
--- a/sys/dev/pcmcia/nca_pcmcia.c
+++ b/sys/dev/pcmcia/nca_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nca_pcmcia.c,v 1.21 2005/12/11 12:23:23 christos Exp $ */
+/* $NetBSD: nca_pcmcia.c,v 1.22 2007/10/19 12:01:06 ad Exp $ */
/*-
* Copyright (c) 2000, 2004 The NetBSD Foundation, Inc.
@@ -37,15 +37,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nca_pcmcia.c,v 1.21 2005/12/11 12:23:23 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nca_pcmcia.c,v 1.22 2007/10/19 12:01:06 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/buf.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/scsipi/scsi_all.h>
#include <dev/scsipi/scsipi_all.h>
diff --git a/sys/dev/pcmcia/opl_esl.c b/sys/dev/pcmcia/opl_esl.c
index 36ab301887e..30da32e643a 100644
--- a/sys/dev/pcmcia/opl_esl.c
+++ b/sys/dev/pcmcia/opl_esl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: opl_esl.c,v 1.14 2006/11/16 01:33:20 christos Exp $ */
+/* $NetBSD: opl_esl.c,v 1.15 2007/10/19 12:01:06 ad Exp $ */
/*
* Copyright (c) 2001 Jared D. McNeill <jmcneill@invisible.ca>
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opl_esl.c,v 1.14 2006/11/16 01:33:20 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opl_esl.c,v 1.15 2007/10/19 12:01:06 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: opl_esl.c,v 1.14 2006/11/16 01:33:20 christos Exp $"
#include <sys/audioio.h>
#include <sys/midiio.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/audio_if.h>
#include <dev/midi_if.h>
diff --git a/sys/dev/pcmcia/pcmciachip.h b/sys/dev/pcmcia/pcmciachip.h
index d63c55a5f16..c8c009ab108 100644
--- a/sys/dev/pcmcia/pcmciachip.h
+++ b/sys/dev/pcmcia/pcmciachip.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pcmciachip.h,v 1.13 2005/12/11 12:23:23 christos Exp $ */
+/* $NetBSD: pcmciachip.h,v 1.14 2007/10/19 12:01:06 ad Exp $ */
/*
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
@@ -32,7 +32,7 @@
#ifndef _PCMCIA_PCMCIACHIP_H_
#define _PCMCIA_PCMCIACHIP_H_
-#include <machine/bus.h>
+#include <sys/bus.h>
struct pcmcia_function;
struct pcmcia_mem_handle;
diff --git a/sys/dev/pcmcia/pcmcom.c b/sys/dev/pcmcia/pcmcom.c
index 5b0a2bf313e..e650012e0b1 100644
--- a/sys/dev/pcmcia/pcmcom.c
+++ b/sys/dev/pcmcia/pcmcom.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pcmcom.c,v 1.30 2006/11/16 01:33:20 christos Exp $ */
+/* $NetBSD: pcmcom.c,v 1.31 2007/10/19 12:01:06 ad Exp $ */
/*-
* Copyright (c) 1998, 2000, 2004 The NetBSD Foundation, Inc.
@@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcmcom.c,v 1.30 2006/11/16 01:33:20 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcmcom.c,v 1.31 2007/10/19 12:01:06 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -59,8 +59,8 @@ __KERNEL_RCSID(0, "$NetBSD: pcmcom.c,v 1.30 2006/11/16 01:33:20 christos Exp $")
#include <sys/termios.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/ic/comreg.h>
#include <dev/ic/comvar.h>
diff --git a/sys/dev/pcmcia/slhci_pcmcia.c b/sys/dev/pcmcia/slhci_pcmcia.c
index d3e5432d836..94324adfbea 100644
--- a/sys/dev/pcmcia/slhci_pcmcia.c
+++ b/sys/dev/pcmcia/slhci_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: slhci_pcmcia.c,v 1.2 2007/08/16 02:30:22 kiyohara Exp $ */
+/* $NetBSD: slhci_pcmcia.c,v 1.3 2007/10/19 12:01:06 ad Exp $ */
/*
* Not (c) 2007 Matthew Orgass
* This file is public domain, meaning anyone can make any use of part or all
@@ -11,7 +11,7 @@
/* Glue for RATOC USB HOST CF+ Card (SL811HS chip) */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: slhci_pcmcia.c,v 1.2 2007/08/16 02:30:22 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: slhci_pcmcia.c,v 1.3 2007/10/19 12:01:06 ad Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -20,7 +20,7 @@ __KERNEL_RCSID(0, "$NetBSD: slhci_pcmcia.c,v 1.2 2007/08/16 02:30:22 kiyohara Ex
#include <sys/systm.h>
#include <sys/errno.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pcmcia/pcmciareg.h>
#include <dev/pcmcia/pcmciavar.h>
#include <dev/pcmcia/pcmciadevs.h>
diff --git a/sys/dev/pcmcia/spc_pcmcia.c b/sys/dev/pcmcia/spc_pcmcia.c
index 2027bb4ae33..6974e478812 100644
--- a/sys/dev/pcmcia/spc_pcmcia.c
+++ b/sys/dev/pcmcia/spc_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: spc_pcmcia.c,v 1.17 2006/11/16 01:33:20 christos Exp $ */
+/* $NetBSD: spc_pcmcia.c,v 1.18 2007/10/19 12:01:06 ad Exp $ */
/*-
* Copyright (c) 2000, 2004 The NetBSD Foundation, Inc.
@@ -37,15 +37,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spc_pcmcia.c,v 1.17 2006/11/16 01:33:20 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spc_pcmcia.c,v 1.18 2007/10/19 12:01:06 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/buf.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/scsipi/scsi_all.h>
#include <dev/scsipi/scsipi_all.h>
diff --git a/sys/dev/pcmcia/wdc_pcmcia.c b/sys/dev/pcmcia/wdc_pcmcia.c
index 6c7b25f5e4d..aea72b413d8 100644
--- a/sys/dev/pcmcia/wdc_pcmcia.c
+++ b/sys/dev/pcmcia/wdc_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc_pcmcia.c,v 1.108 2006/11/16 01:33:20 christos Exp $ */
+/* $NetBSD: wdc_pcmcia.c,v 1.109 2007/10/19 12:01:06 ad Exp $ */
/*-
* Copyright (c) 1998, 2003, 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_pcmcia.c,v 1.108 2006/11/16 01:33:20 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_pcmcia.c,v 1.109 2007/10/19 12:01:06 ad Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -46,8 +46,8 @@ __KERNEL_RCSID(0, "$NetBSD: wdc_pcmcia.c,v 1.108 2006/11/16 01:33:20 christos Ex
#include <sys/systm.h>
#include <sys/proc.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/pcmcia/pcmciareg.h>
#include <dev/pcmcia/pcmciavar.h>
diff --git a/sys/dev/pcmcia/xirc.c b/sys/dev/pcmcia/xirc.c
index df9fb5cfa48..8db49419247 100644
--- a/sys/dev/pcmcia/xirc.c
+++ b/sys/dev/pcmcia/xirc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: xirc.c,v 1.20 2006/11/16 01:33:20 christos Exp $ */
+/* $NetBSD: xirc.c,v 1.21 2007/10/19 12:01:06 ad Exp $ */
/*-
* Copyright (c) 1999, 2000, 2004 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xirc.c,v 1.20 2006/11/16 01:33:20 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xirc.c,v 1.21 2007/10/19 12:01:06 ad Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -73,8 +73,8 @@ __KERNEL_RCSID(0, "$NetBSD: xirc.c,v 1.20 2006/11/16 01:33:20 christos Exp $");
#include <net/bpfdesc.h>
#endif
-#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
#include <dev/pcmcia/pcmciareg.h>
#include <dev/pcmcia/pcmciavar.h>
diff --git a/sys/dev/podulebus/acemidi.c b/sys/dev/podulebus/acemidi.c
index b1491ef2812..f6394abf673 100644
--- a/sys/dev/podulebus/acemidi.c
+++ b/sys/dev/podulebus/acemidi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: acemidi.c,v 1.12 2006/07/13 22:56:02 gdamore Exp $ */
+/* $NetBSD: acemidi.c,v 1.13 2007/10/19 12:01:07 ad Exp $ */
/*-
* Copyright (c) 2001 Ben Harris
@@ -28,14 +28,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acemidi.c,v 1.12 2006/07/13 22:56:02 gdamore Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acemidi.c,v 1.13 2007/10/19 12:01:07 ad Exp $");
#include <sys/param.h>
#include <sys/device.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/podulebus/podulebus.h>
#include <dev/podulebus/podules.h>
diff --git a/sys/dev/podulebus/dtide.c b/sys/dev/podulebus/dtide.c
index 37e6ad3c9df..9e3a7882a68 100644
--- a/sys/dev/podulebus/dtide.c
+++ b/sys/dev/podulebus/dtide.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dtide.c,v 1.23 2006/10/01 21:34:30 bjh21 Exp $ */
+/* $NetBSD: dtide.c,v 1.24 2007/10/19 12:01:07 ad Exp $ */
/*-
* Copyright (c) 2000, 2001 Ben Harris
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dtide.c,v 1.23 2006/10/01 21:34:30 bjh21 Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dtide.c,v 1.24 2007/10/19 12:01:07 ad Exp $");
#include <sys/param.h>
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: dtide.c,v 1.23 2006/10/01 21:34:30 bjh21 Exp $");
#include <sys/malloc.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/podulebus/podulebus.h>
#include <dev/podulebus/podules.h>
diff --git a/sys/dev/podulebus/hcide.c b/sys/dev/podulebus/hcide.c
index d5045428d20..528dd2871cd 100644
--- a/sys/dev/podulebus/hcide.c
+++ b/sys/dev/podulebus/hcide.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hcide.c,v 1.20 2006/10/01 21:34:30 bjh21 Exp $ */
+/* $NetBSD: hcide.c,v 1.21 2007/10/19 12:01:07 ad Exp $ */
/*-
* Copyright (c) 2000, 2001 Ben Harris
@@ -31,14 +31,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hcide.c,v 1.20 2006/10/01 21:34:30 bjh21 Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hcide.c,v 1.21 2007/10/19 12:01:07 ad Exp $");
#include <sys/param.h>
#include <sys/device.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/podulebus/podulebus.h>
#include <dev/podulebus/podules.h>
diff --git a/sys/dev/podulebus/if_ea.c b/sys/dev/podulebus/if_ea.c
index 84b1ce44b96..179e66507d9 100644
--- a/sys/dev/podulebus/if_ea.c
+++ b/sys/dev/podulebus/if_ea.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ea.c,v 1.12 2006/03/29 07:12:56 thorpej Exp $ */
+/* $NetBSD: if_ea.c,v 1.13 2007/10/19 12:01:07 ad Exp $ */
/*
* Copyright (c) 2000, 2001 Ben Harris
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ea.c,v 1.12 2006/03/29 07:12:56 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ea.c,v 1.13 2007/10/19 12:01:07 ad Exp $");
#include <sys/param.h>
@@ -45,8 +45,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_ea.c,v 1.12 2006/03/29 07:12:56 thorpej Exp $");
#include <sys/socket.h>
#include <sys/systm.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <net/if.h>
#include <net/if_ether.h>
diff --git a/sys/dev/podulebus/if_eb.c b/sys/dev/podulebus/if_eb.c
index 2a22ae1979b..5b6be70cba4 100644
--- a/sys/dev/podulebus/if_eb.c
+++ b/sys/dev/podulebus/if_eb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_eb.c,v 1.10 2006/03/29 07:12:56 thorpej Exp $ */
+/* $NetBSD: if_eb.c,v 1.11 2007/10/19 12:01:07 ad Exp $ */
/*
* Copyright (c) 2000, 2001 Ben Harris
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_eb.c,v 1.10 2006/03/29 07:12:56 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_eb.c,v 1.11 2007/10/19 12:01:07 ad Exp $");
#include <sys/param.h>
@@ -45,8 +45,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_eb.c,v 1.10 2006/03/29 07:12:56 thorpej Exp $");
#include <sys/socket.h>
#include <sys/systm.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <net/if.h>
#include <net/if_ether.h>
diff --git a/sys/dev/podulebus/if_ei.c b/sys/dev/podulebus/if_ei.c
index 2c7845dce0c..00ad9431954 100644
--- a/sys/dev/podulebus/if_ei.c
+++ b/sys/dev/podulebus/if_ei.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ei.c,v 1.12 2006/03/29 07:12:56 thorpej Exp $ */
+/* $NetBSD: if_ei.c,v 1.13 2007/10/19 12:01:07 ad Exp $ */
/*-
* Copyright (c) 2000, 2001 Ben Harris
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ei.c,v 1.12 2006/03/29 07:12:56 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ei.c,v 1.13 2007/10/19 12:01:07 ad Exp $");
#include <sys/param.h>
@@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_ei.c,v 1.12 2006/03/29 07:12:56 thorpej Exp $");
#include <net/if.h>
#include <net/if_ether.h>
#include <net/if_media.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/i82586reg.h>
#include <dev/ic/i82586var.h>
#include <dev/podulebus/podulebus.h>
diff --git a/sys/dev/podulebus/sec.c b/sys/dev/podulebus/sec.c
index 1366fd52821..1f9282c74b2 100644
--- a/sys/dev/podulebus/sec.c
+++ b/sys/dev/podulebus/sec.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sec.c,v 1.8 2007/03/07 23:17:01 bjh21 Exp $ */
+/* $NetBSD: sec.c,v 1.9 2007/10/19 12:01:07 ad Exp $ */
/*-
* Copyright (c) 2000, 2001, 2006 Ben Harris
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sec.c,v 1.8 2007/03/07 23:17:01 bjh21 Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sec.c,v 1.9 2007/10/19 12:01:07 ad Exp $");
#include <sys/param.h>
@@ -53,7 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: sec.c,v 1.8 2007/03/07 23:17:01 bjh21 Exp $");
#include <dev/scsipi/scsipi_all.h>
#include <dev/scsipi/scsiconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/wd33c93reg.h>
#include <dev/ic/wd33c93var.h>
diff --git a/sys/dev/ppbus/if_plip.c b/sys/dev/ppbus/if_plip.c
index ee7d4746d65..c089ef5a4d1 100644
--- a/sys/dev/ppbus/if_plip.c
+++ b/sys/dev/ppbus/if_plip.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_plip.c,v 1.14 2007/09/01 04:32:50 dyoung Exp $ */
+/* $NetBSD: if_plip.c,v 1.15 2007/10/19 12:01:07 ad Exp $ */
/*-
* Copyright (c) 1997 Poul-Henning Kamp
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_plip.c,v 1.14 2007/09/01 04:32:50 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_plip.c,v 1.15 2007/10/19 12:01:07 ad Exp $");
/*
* Parallel port TCP/IP interfaces added. I looked at the driver from
@@ -119,7 +119,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_plip.c,v 1.14 2007/09/01 04:32:50 dyoung Exp $");
#include <dev/ppbus/ppbus_var.h>
#include <machine/types.h>
-#include <machine/intr.h>
+#include <sys/intr.h>
#ifndef LPMTU /* MTU for the lp# interfaces */
#define LPMTU 1500
diff --git a/sys/dev/ppbus/lpt.c b/sys/dev/ppbus/lpt.c
index 00df6045a60..46222340dd6 100644
--- a/sys/dev/ppbus/lpt.c
+++ b/sys/dev/ppbus/lpt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lpt.c,v 1.19 2007/03/04 06:02:28 christos Exp $ */
+/* $NetBSD: lpt.c,v 1.20 2007/10/19 12:01:07 ad Exp $ */
/*
* Copyright (c) 1990 William F. Jolitz, TeleMuse
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lpt.c,v 1.19 2007/03/04 06:02:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lpt.c,v 1.20 2007/10/19 12:01:07 ad Exp $");
#include "opt_ppbus_lpt.h"
@@ -80,7 +80,7 @@ __KERNEL_RCSID(0, "$NetBSD: lpt.c,v 1.19 2007/03/04 06:02:28 christos Exp $");
#include <sys/types.h>
#include <sys/syslog.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ppbus/ppbus_1284.h>
#include <dev/ppbus/ppbus_base.h>
diff --git a/sys/dev/ppbus/ppbus_base.h b/sys/dev/ppbus/ppbus_base.h
index 083125b43c4..384a9ea9b74 100644
--- a/sys/dev/ppbus/ppbus_base.h
+++ b/sys/dev/ppbus/ppbus_base.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ppbus_base.h,v 1.6 2007/03/04 06:02:28 christos Exp $ */
+/* $NetBSD: ppbus_base.h,v 1.7 2007/10/19 12:01:07 ad Exp $ */
/*
* Copyright (c) 1997, 1998, 1999 Nicolas Souchu
@@ -31,7 +31,7 @@
#ifndef __PPBUS_BASE_H
#define __PPBUS_BASE_H
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ppbus/ppbus_msq.h>
diff --git a/sys/dev/ppbus/ppbus_conf.h b/sys/dev/ppbus/ppbus_conf.h
index ae6de7c205c..91a29eb3d8d 100644
--- a/sys/dev/ppbus/ppbus_conf.h
+++ b/sys/dev/ppbus/ppbus_conf.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ppbus_conf.h,v 1.7 2007/03/04 06:02:28 christos Exp $ */
+/* $NetBSD: ppbus_conf.h,v 1.8 2007/10/19 12:01:08 ad Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999 Nicolas Souchu
@@ -35,7 +35,7 @@
#include <sys/lock.h>
#include <sys/queue.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ppbus/ppbus_msq.h>
#include <dev/ppbus/ppbus_device.h>
diff --git a/sys/dev/qbus/dhu.c b/sys/dev/qbus/dhu.c
index 41b2a0a9698..b305734f9b8 100644
--- a/sys/dev/qbus/dhu.c
+++ b/sys/dev/qbus/dhu.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dhu.c,v 1.47 2007/03/04 06:02:29 christos Exp $ */
+/* $NetBSD: dhu.c,v 1.48 2007/10/19 12:01:08 ad Exp $ */
/*
* Copyright (c) 2003, Hugh Graham.
* Copyright (c) 1992, 1993
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dhu.c,v 1.47 2007/03/04 06:02:29 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dhu.c,v 1.48 2007/10/19 12:01:08 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -84,7 +84,7 @@ __KERNEL_RCSID(0, "$NetBSD: dhu.c,v 1.47 2007/03/04 06:02:29 christos Exp $");
#include <sys/device.h>
#include <sys/kauth.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/scb.h>
#include <dev/qbus/ubavar.h>
diff --git a/sys/dev/qbus/dl.c b/sys/dev/qbus/dl.c
index 11031875dd3..7f559be0677 100644
--- a/sys/dev/qbus/dl.c
+++ b/sys/dev/qbus/dl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dl.c,v 1.37 2007/03/04 06:02:29 christos Exp $ */
+/* $NetBSD: dl.c,v 1.38 2007/10/19 12:01:08 ad Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -111,7 +111,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dl.c,v 1.37 2007/03/04 06:02:29 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dl.c,v 1.38 2007/10/19 12:01:08 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -127,7 +127,7 @@ __KERNEL_RCSID(0, "$NetBSD: dl.c,v 1.37 2007/03/04 06:02:29 christos Exp $");
#include <sys/device.h>
#include <sys/kauth.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/qbus/ubavar.h>
diff --git a/sys/dev/qbus/dz_uba.c b/sys/dev/qbus/dz_uba.c
index 39cc892a9be..17a5d46a49b 100644
--- a/sys/dev/qbus/dz_uba.c
+++ b/sys/dev/qbus/dz_uba.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dz_uba.c,v 1.25 2006/05/14 21:45:00 elad Exp $ */
+/* $NetBSD: dz_uba.c,v 1.26 2007/10/19 12:01:08 ad Exp $ */
/*
* Copyright (c) 1998 Ludd, University of Lule}, Sweden. All rights reserved.
* Copyright (c) 1996 Ken C. Wellsch. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dz_uba.c,v 1.25 2006/05/14 21:45:00 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dz_uba.c,v 1.26 2007/10/19 12:01:08 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: dz_uba.c,v 1.25 2006/05/14 21:45:00 elad Exp $");
#include <sys/syslog.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/pte.h>
#include <machine/trap.h>
#include <machine/scb.h>
diff --git a/sys/dev/qbus/if_de.c b/sys/dev/qbus/if_de.c
index d602bd8d591..add4bae496a 100644
--- a/sys/dev/qbus/if_de.c
+++ b/sys/dev/qbus/if_de.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_de.c,v 1.21 2007/03/04 06:02:29 christos Exp $ */
+/* $NetBSD: if_de.c,v 1.22 2007/10/19 12:01:08 ad Exp $ */
/*
* Copyright (c) 1982, 1986, 1989 Regents of the University of California.
@@ -81,7 +81,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.21 2007/03/04 06:02:29 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.22 2007/10/19 12:01:08 ad Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -111,7 +111,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.21 2007/03/04 06:02:29 christos Exp $");
#include <net/bpfdesc.h>
#endif
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/qbus/ubavar.h>
#include <dev/qbus/if_dereg.h>
diff --git a/sys/dev/qbus/if_dmc.c b/sys/dev/qbus/if_dmc.c
index 1088ecf54fe..5493d053ff0 100644
--- a/sys/dev/qbus/if_dmc.c
+++ b/sys/dev/qbus/if_dmc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_dmc.c,v 1.14 2007/03/04 06:02:29 christos Exp $ */
+/* $NetBSD: if_dmc.c,v 1.15 2007/10/19 12:01:08 ad Exp $ */
/*
* Copyright (c) 1982, 1986 Regents of the University of California.
* All rights reserved.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_dmc.c,v 1.14 2007/03/04 06:02:29 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_dmc.c,v 1.15 2007/10/19 12:01:08 ad Exp $");
#undef DMCDEBUG /* for base table dump on fatal error */
@@ -63,7 +63,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_dmc.c,v 1.14 2007/03/04 06:02:29 christos Exp $")
#include <netinet/in_var.h>
#endif
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/qbus/ubareg.h>
#include <dev/qbus/ubavar.h>
diff --git a/sys/dev/qbus/if_il.c b/sys/dev/qbus/if_il.c
index a3774a5fc1e..256431cf041 100644
--- a/sys/dev/qbus/if_il.c
+++ b/sys/dev/qbus/if_il.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_il.c,v 1.17 2007/08/26 22:45:59 dyoung Exp $ */
+/* $NetBSD: if_il.c,v 1.18 2007/10/19 12:01:08 ad Exp $ */
/*
* Copyright (c) 1982, 1986 Regents of the University of California.
* All rights reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_il.c,v 1.17 2007/08/26 22:45:59 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_il.c,v 1.18 2007/10/19 12:01:08 ad Exp $");
#include "opt_inet.h"
@@ -59,7 +59,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_il.c,v 1.17 2007/08/26 22:45:59 dyoung Exp $");
#endif
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/qbus/ubareg.h>
#include <dev/qbus/ubavar.h>
diff --git a/sys/dev/qbus/if_qe.c b/sys/dev/qbus/if_qe.c
index c4f9efd18e2..f9aed8d82c9 100644
--- a/sys/dev/qbus/if_qe.c
+++ b/sys/dev/qbus/if_qe.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_qe.c,v 1.64 2007/09/06 08:52:36 he Exp $ */
+/* $NetBSD: if_qe.c,v 1.65 2007/10/19 12:01:08 ad Exp $ */
/*
* Copyright (c) 1999 Ludd, University of Lule}, Sweden. All rights reserved.
*
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_qe.c,v 1.64 2007/09/06 08:52:36 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_qe.c,v 1.65 2007/10/19 12:01:08 ad Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -62,7 +62,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_qe.c,v 1.64 2007/09/06 08:52:36 he Exp $");
#include <net/bpfdesc.h>
#endif
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/qbus/ubavar.h>
#include <dev/qbus/if_qereg.h>
diff --git a/sys/dev/qbus/if_qt.c b/sys/dev/qbus/if_qt.c
index 6e295e41562..9ab1611508b 100644
--- a/sys/dev/qbus/if_qt.c
+++ b/sys/dev/qbus/if_qt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_qt.c,v 1.11 2007/03/04 06:02:29 christos Exp $ */
+/* $NetBSD: if_qt.c,v 1.12 2007/10/19 12:01:08 ad Exp $ */
/*
* Copyright (c) 1992 Steven M. Schultz
* All rights reserved.
@@ -80,7 +80,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_qt.c,v 1.11 2007/03/04 06:02:29 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_qt.c,v 1.12 2007/10/19 12:01:08 ad Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -115,7 +115,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_qt.c,v 1.11 2007/03/04 06:02:29 christos Exp $");
#endif
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/qbus/ubavar.h>
#include <dev/qbus/if_uba.h>
diff --git a/sys/dev/qbus/if_uba.c b/sys/dev/qbus/if_uba.c
index 80f15d50b43..f2b0746235e 100644
--- a/sys/dev/qbus/if_uba.c
+++ b/sys/dev/qbus/if_uba.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_uba.c,v 1.28 2007/03/08 23:25:44 he Exp $ */
+/* $NetBSD: if_uba.c,v 1.29 2007/10/19 12:01:09 ad Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_uba.c,v 1.28 2007/03/08 23:25:44 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_uba.c,v 1.29 2007/10/19 12:01:09 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_uba.c,v 1.28 2007/03/08 23:25:44 he Exp $");
#include <net/if.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/qbus/if_uba.h>
#include <dev/qbus/ubareg.h>
diff --git a/sys/dev/qbus/qd.c b/sys/dev/qbus/qd.c
index 988c27b0450..e0629d6c62e 100644
--- a/sys/dev/qbus/qd.c
+++ b/sys/dev/qbus/qd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: qd.c,v 1.38 2007/07/29 12:15:44 ad Exp $ */
+/* $NetBSD: qd.c,v 1.39 2007/10/19 12:01:09 ad Exp $ */
/*-
* Copyright (c) 1988 Regents of the University of California.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: qd.c,v 1.38 2007/07/29 12:15:44 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: qd.c,v 1.39 2007/10/19 12:01:09 ad Exp $");
#include "opt_ddb.h"
@@ -77,12 +77,12 @@ __KERNEL_RCSID(0, "$NetBSD: qd.c,v 1.38 2007/07/29 12:15:44 ad Exp $");
#include <dev/cons.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/scb.h>
#ifdef __vax__
#include <machine/sid.h>
-#include <machine/cpu.h>
+#include <sys/cpu.h>
#include <machine/pte.h>
#endif
diff --git a/sys/dev/qbus/rf.c b/sys/dev/qbus/rf.c
index 8f59599fd74..2f1919ae964 100644
--- a/sys/dev/qbus/rf.c
+++ b/sys/dev/qbus/rf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf.c,v 1.16 2007/10/08 16:41:12 ad Exp $ */
+/* $NetBSD: rf.c,v 1.17 2007/10/19 12:01:09 ad Exp $ */
/*
* Copyright (c) 2002 Jochen Kunz.
* All rights reserved.
@@ -36,7 +36,7 @@ TODO:
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf.c,v 1.16 2007/10/08 16:41:12 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf.c,v 1.17 2007/10/19 12:01:09 ad Exp $");
/* autoconfig stuff */
#include <sys/param.h>
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: rf.c,v 1.16 2007/10/08 16:41:12 ad Exp $");
#include "ioconf.h"
/* bus_space / bus_dma */
-#include <machine/bus.h>
+#include <sys/bus.h>
/* UniBus / QBus specific stuff */
#include <dev/qbus/ubavar.h>
diff --git a/sys/dev/qbus/rl.c b/sys/dev/qbus/rl.c
index 137e5c92f1e..0bb05f6220b 100644
--- a/sys/dev/qbus/rl.c
+++ b/sys/dev/qbus/rl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rl.c,v 1.36 2007/10/08 16:41:12 ad Exp $ */
+/* $NetBSD: rl.c,v 1.37 2007/10/19 12:01:09 ad Exp $ */
/*
* Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rl.c,v 1.36 2007/10/08 16:41:12 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rl.c,v 1.37 2007/10/19 12:01:09 ad Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -61,7 +61,7 @@ __KERNEL_RCSID(0, "$NetBSD: rl.c,v 1.36 2007/10/08 16:41:12 ad Exp $");
#include <ufs/ufs/dinode.h>
#include <ufs/ffs/fs.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/qbus/ubavar.h>
#include <dev/qbus/rlreg.h>
diff --git a/sys/dev/qbus/ts.c b/sys/dev/qbus/ts.c
index 1a2d5de6437..32fcbdaec5f 100644
--- a/sys/dev/qbus/ts.c
+++ b/sys/dev/qbus/ts.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ts.c,v 1.20 2007/07/29 12:15:44 ad Exp $ */
+/* $NetBSD: ts.c,v 1.21 2007/10/19 12:01:09 ad Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ts.c,v 1.20 2007/07/29 12:15:44 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ts.c,v 1.21 2007/10/19 12:01:09 ad Exp $");
#undef TSDEBUG
@@ -92,7 +92,7 @@ __KERNEL_RCSID(0, "$NetBSD: ts.c,v 1.20 2007/07/29 12:15:44 ad Exp $");
#include <sys/uio.h>
#include <sys/proc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/qbus/ubareg.h>
#include <dev/qbus/ubavar.h>
diff --git a/sys/dev/qbus/uba.c b/sys/dev/qbus/uba.c
index 31249413459..bbc6967938c 100644
--- a/sys/dev/qbus/uba.c
+++ b/sys/dev/qbus/uba.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uba.c,v 1.75 2007/03/04 06:02:30 christos Exp $ */
+/* $NetBSD: uba.c,v 1.76 2007/10/19 12:01:09 ad Exp $ */
/*
* Copyright (c) 1982, 1986 The Regents of the University of California.
* All rights reserved.
@@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uba.c,v 1.75 2007/03/04 06:02:30 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uba.c,v 1.76 2007/10/19 12:01:09 ad Exp $");
#include <sys/param.h>
#include <sys/time.h>
@@ -84,9 +84,9 @@ __KERNEL_RCSID(0, "$NetBSD: uba.c,v 1.75 2007/03/04 06:02:30 christos Exp $");
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/scb.h>
-#include <machine/cpu.h>
+#include <sys/cpu.h>
#include <dev/qbus/ubareg.h>
#include <dev/qbus/ubavar.h>
diff --git a/sys/dev/qbus/uda.c b/sys/dev/qbus/uda.c
index 4fb9600c2af..a96b2b72e51 100644
--- a/sys/dev/qbus/uda.c
+++ b/sys/dev/qbus/uda.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uda.c,v 1.56 2006/03/29 18:17:36 thorpej Exp $ */
+/* $NetBSD: uda.c,v 1.57 2007/10/19 12:01:09 ad Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uda.c,v 1.56 2006/03/29 18:17:36 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uda.c,v 1.57 2007/10/19 12:01:09 ad Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -86,7 +86,7 @@ __KERNEL_RCSID(0, "$NetBSD: uda.c,v 1.56 2006/03/29 18:17:36 thorpej Exp $");
#include <sys/bufq.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/sid.h>
#include <dev/qbus/ubavar.h>
diff --git a/sys/dev/sbus/agten.c b/sys/dev/sbus/agten.c
index d579c1924e8..160c5ea060e 100644
--- a/sys/dev/sbus/agten.c
+++ b/sys/dev/sbus/agten.c
@@ -1,4 +1,4 @@
-/* $NetBSD: agten.c,v 1.7 2007/09/11 00:46:12 macallan Exp $ */
+/* $NetBSD: agten.c,v 1.8 2007/10/19 12:01:09 ad Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agten.c,v 1.7 2007/09/11 00:46:12 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agten.c,v 1.8 2007/10/19 12:01:09 ad Exp $");
/*
* a driver for the Fujitsu AG-10e SBus framebuffer
@@ -60,7 +60,7 @@ __KERNEL_RCSID(0, "$NetBSD: agten.c,v 1.7 2007/09/11 00:46:12 macallan Exp $");
#include <dev/sun/btreg.h>
#include <dev/sun/btvar.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <dev/sbus/sbusvar.h>
diff --git a/sys/dev/sbus/be.c b/sys/dev/sbus/be.c
index 4af4d656240..fdc4da288a7 100644
--- a/sys/dev/sbus/be.c
+++ b/sys/dev/sbus/be.c
@@ -1,4 +1,4 @@
-/* $NetBSD: be.c,v 1.54 2007/09/01 07:32:31 dyoung Exp $ */
+/* $NetBSD: be.c,v 1.55 2007/10/19 12:01:10 ad Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: be.c,v 1.54 2007/09/01 07:32:31 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: be.c,v 1.55 2007/10/19 12:01:10 ad Exp $");
#include "opt_ddb.h"
#include "opt_inet.h"
@@ -107,8 +107,8 @@ __KERNEL_RCSID(0, "$NetBSD: be.c,v 1.54 2007/09/01 07:32:31 dyoung Exp $");
#include <net/bpfdesc.h>
#endif
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <machine/autoconf.h>
#include <dev/sbus/sbusvar.h>
diff --git a/sys/dev/sbus/bpp.c b/sys/dev/sbus/bpp.c
index 14e993d9c38..597a131fc22 100644
--- a/sys/dev/sbus/bpp.c
+++ b/sys/dev/sbus/bpp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bpp.c,v 1.29 2007/03/04 07:54:11 christos Exp $ */
+/* $NetBSD: bpp.c,v 1.30 2007/10/19 12:01:10 ad Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bpp.c,v 1.29 2007/03/04 07:54:11 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bpp.c,v 1.30 2007/10/19 12:01:10 ad Exp $");
#include <sys/param.h>
#include <sys/ioctl.h>
@@ -54,8 +54,8 @@ __KERNEL_RCSID(0, "$NetBSD: bpp.c,v 1.29 2007/03/04 07:54:11 christos Exp $");
#include <sys/errno.h>
#include <sys/device.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <machine/autoconf.h>
#include <dev/ic/lsi64854reg.h>
diff --git a/sys/dev/sbus/cgsix_sbus.c b/sys/dev/sbus/cgsix_sbus.c
index eb6a6bfc367..1fa08bc23af 100644
--- a/sys/dev/sbus/cgsix_sbus.c
+++ b/sys/dev/sbus/cgsix_sbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cgsix_sbus.c,v 1.21 2007/04/11 05:01:39 macallan Exp $ */
+/* $NetBSD: cgsix_sbus.c,v 1.22 2007/10/19 12:01:10 ad Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgsix_sbus.c,v 1.21 2007/04/11 05:01:39 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgsix_sbus.c,v 1.22 2007/10/19 12:01:10 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -58,7 +58,7 @@ __KERNEL_RCSID(0, "$NetBSD: cgsix_sbus.c,v 1.21 2007/04/11 05:01:39 macallan Exp
#include <sys/syslog.h>
#endif
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <dev/sbus/sbusvar.h>
diff --git a/sys/dev/sbus/cgthree_sbus.c b/sys/dev/sbus/cgthree_sbus.c
index eaece7750d3..97f632c81a0 100644
--- a/sys/dev/sbus/cgthree_sbus.c
+++ b/sys/dev/sbus/cgthree_sbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cgthree_sbus.c,v 1.18 2007/03/04 06:02:40 christos Exp $ */
+/* $NetBSD: cgthree_sbus.c,v 1.19 2007/10/19 12:01:10 ad Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -85,7 +85,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgthree_sbus.c,v 1.18 2007/03/04 06:02:40 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgthree_sbus.c,v 1.19 2007/10/19 12:01:10 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -97,7 +97,7 @@ __KERNEL_RCSID(0, "$NetBSD: cgthree_sbus.c,v 1.18 2007/03/04 06:02:40 christos E
#include <sys/tty.h>
#include <sys/conf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <dev/sun/fbio.h>
diff --git a/sys/dev/sbus/cs4231_sbus.c b/sys/dev/sbus/cs4231_sbus.c
index 6a4f60d4d99..4a7b5d4288e 100644
--- a/sys/dev/sbus/cs4231_sbus.c
+++ b/sys/dev/sbus/cs4231_sbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cs4231_sbus.c,v 1.34 2006/10/15 19:45:06 martin Exp $ */
+/* $NetBSD: cs4231_sbus.c,v 1.35 2007/10/19 12:01:10 ad Exp $ */
/*-
* Copyright (c) 1998, 1999, 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cs4231_sbus.c,v 1.34 2006/10/15 19:45:06 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cs4231_sbus.c,v 1.35 2007/10/19 12:01:10 ad Exp $");
#include "audio.h"
#if NAUDIO > 0
@@ -48,8 +48,8 @@ __KERNEL_RCSID(0, "$NetBSD: cs4231_sbus.c,v 1.34 2006/10/15 19:45:06 martin Exp
#include <sys/device.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/sbus/sbusvar.h>
diff --git a/sys/dev/sbus/dbri.c b/sys/dev/sbus/dbri.c
index ec6e5fb8145..804113b3b14 100644
--- a/sys/dev/sbus/dbri.c
+++ b/sys/dev/sbus/dbri.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dbri.c,v 1.15 2007/07/20 22:21:51 macallan Exp $ */
+/* $NetBSD: dbri.c,v 1.16 2007/10/19 12:01:10 ad Exp $ */
/*
* Copyright (C) 1997 Rudolf Koenig (rfkoenig@immd4.informatik.uni-erlangen.de)
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dbri.c,v 1.15 2007/07/20 22:21:51 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dbri.c,v 1.16 2007/10/19 12:01:10 ad Exp $");
#include "audio.h"
#if NAUDIO > 0
@@ -55,8 +55,8 @@ __KERNEL_RCSID(0, "$NetBSD: dbri.c,v 1.15 2007/07/20 22:21:51 macallan Exp $");
#include <sys/proc.h>
#include <sys/kernel.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/sbus/sbusvar.h>
#include <sparc/sparc/auxreg.h>
diff --git a/sys/dev/sbus/dma_sbus.c b/sys/dev/sbus/dma_sbus.c
index 80860d88438..3ba610eb1b9 100644
--- a/sys/dev/sbus/dma_sbus.c
+++ b/sys/dev/sbus/dma_sbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dma_sbus.c,v 1.28 2006/02/28 23:10:49 kleink Exp $ */
+/* $NetBSD: dma_sbus.c,v 1.29 2007/10/19 12:01:10 ad Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dma_sbus.c,v 1.28 2006/02/28 23:10:49 kleink Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dma_sbus.c,v 1.29 2007/10/19 12:01:10 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -75,8 +75,8 @@ __KERNEL_RCSID(0, "$NetBSD: dma_sbus.c,v 1.28 2006/02/28 23:10:49 kleink Exp $")
#include <sys/device.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <machine/autoconf.h>
#include <dev/sbus/sbusvar.h>
diff --git a/sys/dev/sbus/esp_sbus.c b/sys/dev/sbus/esp_sbus.c
index 34e583153f4..9299c61a3c3 100644
--- a/sys/dev/sbus/esp_sbus.c
+++ b/sys/dev/sbus/esp_sbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: esp_sbus.c,v 1.37 2007/09/22 23:32:27 martin Exp $ */
+/* $NetBSD: esp_sbus.c,v 1.38 2007/10/19 12:01:10 ad Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esp_sbus.c,v 1.37 2007/09/22 23:32:27 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esp_sbus.c,v 1.38 2007/10/19 12:01:10 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -51,8 +51,8 @@ __KERNEL_RCSID(0, "$NetBSD: esp_sbus.c,v 1.37 2007/09/22 23:32:27 martin Exp $")
#include <dev/scsipi/scsiconf.h>
#include <dev/scsipi/scsi_message.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <machine/autoconf.h>
#include <dev/ic/lsi64854reg.h>
diff --git a/sys/dev/sbus/genfb_sbus.c b/sys/dev/sbus/genfb_sbus.c
index 78e359c1d32..b5f9694b666 100644
--- a/sys/dev/sbus/genfb_sbus.c
+++ b/sys/dev/sbus/genfb_sbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: genfb_sbus.c,v 1.2 2007/08/05 03:23:02 macallan Exp $ */
+/* $NetBSD: genfb_sbus.c,v 1.3 2007/10/19 12:01:11 ad Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -32,7 +32,7 @@
/* an SBus frontend for the generic fb console driver */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfb_sbus.c,v 1.2 2007/08/05 03:23:02 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfb_sbus.c,v 1.3 2007/10/19 12:01:11 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: genfb_sbus.c,v 1.2 2007/08/05 03:23:02 macallan Exp
#include <uvm/uvm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/pmap.h>
diff --git a/sys/dev/sbus/if_en.c b/sys/dev/sbus/if_en.c
index 61275a8fac7..c0e56cc4aac 100644
--- a/sys/dev/sbus/if_en.c
+++ b/sys/dev/sbus/if_en.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_en.c,v 1.21 2005/12/11 12:23:44 christos Exp $ */
+/* $NetBSD: if_en.c,v 1.22 2007/10/19 12:01:11 ad Exp $ */
/*
*
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_en.c,v 1.21 2005/12/11 12:23:44 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_en.c,v 1.22 2007/10/19 12:01:11 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -54,9 +54,9 @@ __KERNEL_RCSID(0, "$NetBSD: if_en.c,v 1.21 2005/12/11 12:23:44 christos Exp $");
#include <net/if.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
-#include <machine/cpu.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
+#include <sys/cpu.h>
#include <dev/sbus/sbusvar.h>
diff --git a/sys/dev/sbus/if_gem_sbus.c b/sys/dev/sbus/if_gem_sbus.c
index 2c75089c16f..bf4bf35558a 100644
--- a/sys/dev/sbus/if_gem_sbus.c
+++ b/sys/dev/sbus/if_gem_sbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gem_sbus.c,v 1.1 2006/11/24 13:23:32 martin Exp $ */
+/* $NetBSD: if_gem_sbus.c,v 1.2 2007/10/19 12:01:11 ad Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_gem_sbus.c,v 1.1 2006/11/24 13:23:32 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gem_sbus.c,v 1.2 2007/10/19 12:01:11 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -58,8 +58,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_gem_sbus.c,v 1.1 2006/11/24 13:23:32 martin Exp $
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <machine/autoconf.h>
#include <dev/sbus/sbusvar.h>
diff --git a/sys/dev/sbus/if_hme_sbus.c b/sys/dev/sbus/if_hme_sbus.c
index 6cdb5f589a8..f9a0698c13c 100644
--- a/sys/dev/sbus/if_hme_sbus.c
+++ b/sys/dev/sbus/if_hme_sbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_hme_sbus.c,v 1.21 2005/12/11 12:23:44 christos Exp $ */
+/* $NetBSD: if_hme_sbus.c,v 1.22 2007/10/19 12:01:11 ad Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_hme_sbus.c,v 1.21 2005/12/11 12:23:44 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_hme_sbus.c,v 1.22 2007/10/19 12:01:11 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -58,8 +58,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_hme_sbus.c,v 1.21 2005/12/11 12:23:44 christos Ex
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <machine/autoconf.h>
#include <dev/sbus/sbusvar.h>
diff --git a/sys/dev/sbus/if_le.c b/sys/dev/sbus/if_le.c
index 79ed5e9aba7..233f4902b8f 100644
--- a/sys/dev/sbus/if_le.c
+++ b/sys/dev/sbus/if_le.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le.c,v 1.33 2007/03/04 06:02:40 christos Exp $ */
+/* $NetBSD: if_le.c,v 1.34 2007/10/19 12:01:11 ad Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le.c,v 1.33 2007/03/04 06:02:40 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le.c,v 1.34 2007/10/19 12:01:11 ad Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -55,8 +55,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_le.c,v 1.33 2007/03/04 06:02:40 christos Exp $");
#include <net/if_ether.h>
#include <net/if_media.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <machine/autoconf.h>
#include <dev/sbus/sbusvar.h>
diff --git a/sys/dev/sbus/if_le_lebuffer.c b/sys/dev/sbus/if_le_lebuffer.c
index 51b23df34f5..ef49a157372 100644
--- a/sys/dev/sbus/if_le_lebuffer.c
+++ b/sys/dev/sbus/if_le_lebuffer.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le_lebuffer.c,v 1.21 2005/12/11 12:23:44 christos Exp $ */
+/* $NetBSD: if_le_lebuffer.c,v 1.22 2007/10/19 12:01:11 ad Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le_lebuffer.c,v 1.21 2005/12/11 12:23:44 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le_lebuffer.c,v 1.22 2007/10/19 12:01:11 ad Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -60,8 +60,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_le_lebuffer.c,v 1.21 2005/12/11 12:23:44 christos
#include <netinet/if_inarp.h>
#endif
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <machine/autoconf.h>
#include <dev/sbus/sbusvar.h>
diff --git a/sys/dev/sbus/if_le_ledma.c b/sys/dev/sbus/if_le_ledma.c
index 6cde6c42687..777ac170f44 100644
--- a/sys/dev/sbus/if_le_ledma.c
+++ b/sys/dev/sbus/if_le_ledma.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le_ledma.c,v 1.27 2007/03/04 06:02:40 christos Exp $ */
+/* $NetBSD: if_le_ledma.c,v 1.28 2007/10/19 12:01:11 ad Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le_ledma.c,v 1.27 2007/03/04 06:02:40 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le_ledma.c,v 1.28 2007/10/19 12:01:11 ad Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -60,8 +60,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_le_ledma.c,v 1.27 2007/03/04 06:02:40 christos Ex
#include <netinet/if_inarp.h>
#endif
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <machine/autoconf.h>
#include <dev/sbus/sbusvar.h>
diff --git a/sys/dev/sbus/isp_sbus.c b/sys/dev/sbus/isp_sbus.c
index df8db68493c..585356c6e74 100644
--- a/sys/dev/sbus/isp_sbus.c
+++ b/sys/dev/sbus/isp_sbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isp_sbus.c,v 1.69 2007/07/07 00:04:10 mjacob Exp $ */
+/* $NetBSD: isp_sbus.c,v 1.70 2007/10/19 12:01:11 ad Exp $ */
/*
* SBus specific probe and attach routines for Qlogic ISP SCSI adapters.
*
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isp_sbus.c,v 1.69 2007/07/07 00:04:10 mjacob Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isp_sbus.c,v 1.70 2007/10/19 12:01:11 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: isp_sbus.c,v 1.69 2007/07/07 00:04:10 mjacob Exp $")
#include <sys/malloc.h>
#include <sys/queue.h>
#include <dev/ic/isp_netbsd.h>
-#include <machine/intr.h>
+#include <sys/intr.h>
#include <machine/autoconf.h>
#include <dev/sbus/sbusvar.h>
#include <sys/reboot.h>
diff --git a/sys/dev/sbus/lebuffer.c b/sys/dev/sbus/lebuffer.c
index 9b706c4a74e..685a849d9f2 100644
--- a/sys/dev/sbus/lebuffer.c
+++ b/sys/dev/sbus/lebuffer.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lebuffer.c,v 1.25 2005/12/11 12:23:44 christos Exp $ */
+/* $NetBSD: lebuffer.c,v 1.26 2007/10/19 12:01:11 ad Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lebuffer.c,v 1.25 2005/12/11 12:23:44 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lebuffer.c,v 1.26 2007/10/19 12:01:11 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -46,9 +46,9 @@ __KERNEL_RCSID(0, "$NetBSD: lebuffer.c,v 1.25 2005/12/11 12:23:44 christos Exp $
#include <sys/device.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
-#include <machine/cpu.h>
+#include <sys/cpu.h>
#include <dev/sbus/sbusvar.h>
#include <dev/sbus/lebuffervar.h>
diff --git a/sys/dev/sbus/magma.c b/sys/dev/sbus/magma.c
index 9ac4f3c6a04..2e7598ebbef 100644
--- a/sys/dev/sbus/magma.c
+++ b/sys/dev/sbus/magma.c
@@ -1,4 +1,4 @@
-/* $NetBSD: magma.c,v 1.43 2007/10/08 16:18:03 ad Exp $ */
+/* $NetBSD: magma.c,v 1.44 2007/10/19 12:01:12 ad Exp $ */
/*
* magma.c
*
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: magma.c,v 1.43 2007/10/08 16:18:03 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: magma.c,v 1.44 2007/10/19 12:01:12 ad Exp $");
#if 0
#define MAGMA_DEBUG
@@ -63,7 +63,7 @@ __KERNEL_RCSID(0, "$NetBSD: magma.c,v 1.43 2007/10/08 16:18:03 ad Exp $");
#include <sys/kauth.h>
#include <sys/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <dev/sbus/sbusvar.h>
diff --git a/sys/dev/sbus/p9100.c b/sys/dev/sbus/p9100.c
index aeb28b98ae3..a672e541407 100644
--- a/sys/dev/sbus/p9100.c
+++ b/sys/dev/sbus/p9100.c
@@ -1,4 +1,4 @@
-/* $NetBSD: p9100.c,v 1.35 2007/03/04 06:02:41 christos Exp $ */
+/* $NetBSD: p9100.c,v 1.36 2007/10/19 12:01:12 ad Exp $ */
/*-
* Copyright (c) 1998, 2005, 2006 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: p9100.c,v 1.35 2007/03/04 06:02:41 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: p9100.c,v 1.36 2007/10/19 12:01:12 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -57,7 +57,7 @@ __KERNEL_RCSID(0, "$NetBSD: p9100.c,v 1.35 2007/03/04 06:02:41 christos Exp $");
#include <sys/tty.h>
#include <sys/conf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <dev/sun/fbio.h>
diff --git a/sys/dev/sbus/qe.c b/sys/dev/sbus/qe.c
index 8fe4fff9368..e9cdc0d0a03 100644
--- a/sys/dev/sbus/qe.c
+++ b/sys/dev/sbus/qe.c
@@ -1,4 +1,4 @@
-/* $NetBSD: qe.c,v 1.42 2007/09/01 07:32:32 dyoung Exp $ */
+/* $NetBSD: qe.c,v 1.43 2007/10/19 12:01:12 ad Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: qe.c,v 1.42 2007/09/01 07:32:32 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: qe.c,v 1.43 2007/10/19 12:01:12 ad Exp $");
#define QEDEBUG
@@ -117,8 +117,8 @@ __KERNEL_RCSID(0, "$NetBSD: qe.c,v 1.42 2007/09/01 07:32:32 dyoung Exp $");
#include <net/bpfdesc.h>
#endif
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <machine/autoconf.h>
#include <dev/sbus/sbusvar.h>
diff --git a/sys/dev/sbus/qec.c b/sys/dev/sbus/qec.c
index 357991e43c6..d83728965a4 100644
--- a/sys/dev/sbus/qec.c
+++ b/sys/dev/sbus/qec.c
@@ -1,4 +1,4 @@
-/* $NetBSD: qec.c,v 1.36 2007/03/04 07:54:11 christos Exp $ */
+/* $NetBSD: qec.c,v 1.37 2007/10/19 12:01:12 ad Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: qec.c,v 1.36 2007/03/04 07:54:11 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: qec.c,v 1.37 2007/10/19 12:01:12 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -46,8 +46,8 @@ __KERNEL_RCSID(0, "$NetBSD: qec.c,v 1.36 2007/03/04 07:54:11 christos Exp $");
#include <sys/device.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <machine/autoconf.h>
#include <dev/sbus/sbusvar.h>
diff --git a/sys/dev/sbus/spif.c b/sys/dev/sbus/spif.c
index 4c100ea7741..72bd6097c31 100644
--- a/sys/dev/sbus/spif.c
+++ b/sys/dev/sbus/spif.c
@@ -1,4 +1,4 @@
-/* $NetBSD: spif.c,v 1.11 2007/10/08 16:18:03 ad Exp $ */
+/* $NetBSD: spif.c,v 1.12 2007/10/19 12:01:12 ad Exp $ */
/* $OpenBSD: spif.c,v 1.12 2003/10/03 16:44:51 miod Exp $ */
/*
@@ -41,7 +41,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spif.c,v 1.11 2007/10/08 16:18:03 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spif.c,v 1.12 2007/10/19 12:01:12 ad Exp $");
#include "spif.h"
#if NSPIF > 0
@@ -62,7 +62,7 @@ __KERNEL_RCSID(0, "$NetBSD: spif.c,v 1.11 2007/10/08 16:18:03 ad Exp $");
#include <sys/kauth.h>
#include <sys/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/promlib.h>
diff --git a/sys/dev/sbus/stp4020.c b/sys/dev/sbus/stp4020.c
index c67553b05b7..a27864df3e7 100644
--- a/sys/dev/sbus/stp4020.c
+++ b/sys/dev/sbus/stp4020.c
@@ -1,4 +1,4 @@
-/* $NetBSD: stp4020.c,v 1.51 2007/10/08 16:18:03 ad Exp $ */
+/* $NetBSD: stp4020.c,v 1.52 2007/10/19 12:01:12 ad Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: stp4020.c,v 1.51 2007/10/08 16:18:03 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: stp4020.c,v 1.52 2007/10/19 12:01:12 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -58,7 +58,7 @@ __KERNEL_RCSID(0, "$NetBSD: stp4020.c,v 1.51 2007/10/08 16:18:03 ad Exp $");
#include <dev/pcmcia/pcmciavar.h>
#include <dev/pcmcia/pcmciachip.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/sbus/sbusvar.h>
#include <dev/sbus/stp4020reg.h>
diff --git a/sys/dev/sbus/tcx.c b/sys/dev/sbus/tcx.c
index f631708376b..cf8ff5def54 100644
--- a/sys/dev/sbus/tcx.c
+++ b/sys/dev/sbus/tcx.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tcx.c,v 1.21 2007/03/04 06:02:41 christos Exp $ */
+/* $NetBSD: tcx.c,v 1.22 2007/10/19 12:01:12 ad Exp $ */
/*
* Copyright (c) 1996,1998 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcx.c,v 1.21 2007/03/04 06:02:41 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcx.c,v 1.22 2007/10/19 12:01:12 ad Exp $");
/*
* define for cg8 emulation on S24 (24-bit version of tcx) for the SS5;
@@ -68,7 +68,7 @@ __KERNEL_RCSID(0, "$NetBSD: tcx.c,v 1.21 2007/03/04 06:02:41 christos Exp $");
#include <sys/syslog.h>
#endif
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <dev/sun/fbio.h>
diff --git a/sys/dev/sbus/xbox.c b/sys/dev/sbus/xbox.c
index ea6172c90ba..a819c50bf21 100644
--- a/sys/dev/sbus/xbox.c
+++ b/sys/dev/sbus/xbox.c
@@ -1,4 +1,4 @@
-/* $NetBSD: xbox.c,v 1.13 2005/12/11 12:23:44 christos Exp $ */
+/* $NetBSD: xbox.c,v 1.14 2007/10/19 12:01:13 ad Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -41,14 +41,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xbox.c,v 1.13 2005/12/11 12:23:44 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xbox.c,v 1.14 2007/10/19 12:01:13 ad Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/sbus/sbusvar.h>
#include <dev/sbus/xboxvar.h>
#include <machine/autoconf.h>
diff --git a/sys/dev/sbus/zx.c b/sys/dev/sbus/zx.c
index 9516b4efc70..f694fb13dde 100644
--- a/sys/dev/sbus/zx.c
+++ b/sys/dev/sbus/zx.c
@@ -1,4 +1,4 @@
-/* $NetBSD: zx.c,v 1.19 2007/03/04 06:02:41 christos Exp $ */
+/* $NetBSD: zx.c,v 1.20 2007/10/19 12:01:13 ad Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zx.c,v 1.19 2007/03/04 06:02:41 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zx.c,v 1.20 2007/10/19 12:01:13 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -65,7 +65,7 @@ __KERNEL_RCSID(0, "$NetBSD: zx.c,v 1.19 2007/03/04 06:02:41 christos Exp $");
#include <sys/syslog.h>
#include <sys/buf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <uvm/uvm_extern.h>
diff --git a/sys/dev/scsipi/atapi_wdc.c b/sys/dev/scsipi/atapi_wdc.c
index 8e4d9f1c115..a1d1e22da2d 100644
--- a/sys/dev/scsipi/atapi_wdc.c
+++ b/sys/dev/scsipi/atapi_wdc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: atapi_wdc.c,v 1.104 2007/01/23 20:10:06 reinoud Exp $ */
+/* $NetBSD: atapi_wdc.c,v 1.105 2007/10/19 12:01:18 ad Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atapi_wdc.c,v 1.104 2007/01/23 20:10:06 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atapi_wdc.c,v 1.105 2007/10/19 12:01:18 ad Exp $");
#ifndef ATADEBUG
#define ATADEBUG
@@ -48,8 +48,8 @@ __KERNEL_RCSID(0, "$NetBSD: atapi_wdc.c,v 1.104 2007/01/23 20:10:06 reinoud Exp
#include <sys/proc.h>
#include <sys/dvdio.h>
-#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/intr.h>
+#include <sys/bus.h>
#ifndef __BUS_SPACE_HAS_STREAM_METHODS
#define bus_space_write_multi_stream_2 bus_space_write_multi_2
diff --git a/sys/dev/splash/splash.c b/sys/dev/splash/splash.c
index 8fe2d31a139..fd0148e0bfb 100644
--- a/sys/dev/splash/splash.c
+++ b/sys/dev/splash/splash.c
@@ -1,4 +1,4 @@
-/* $NetBSD: splash.c,v 1.3 2006/10/29 11:29:58 freza Exp $ */
+/* $NetBSD: splash.c,v 1.4 2007/10/19 12:01:18 ad Exp $ */
/*-
* Copyright (c) 2006 Jared D. McNeill <jmcneill@invisible.ca>
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: splash.c,v 1.3 2006/10/29 11:29:58 freza Exp $");
+__KERNEL_RCSID(0, "$NetBSD: splash.c,v 1.4 2007/10/19 12:01:18 ad Exp $");
#include "opt_splash.h"
@@ -56,7 +56,7 @@ __KERNEL_RCSID(0, "$NetBSD: splash.c,v 1.3 2006/10/29 11:29:58 freza Exp $");
#endif
#ifdef __HAVE_CPU_COUNTER
-#include <machine/cpu.h>
+#include <sys/cpu.h>
#include <machine/cpu_counter.h>
#endif
diff --git a/sys/dev/sun/cgsix.c b/sys/dev/sun/cgsix.c
index 6a8a9574052..3c15a275ebe 100644
--- a/sys/dev/sun/cgsix.c
+++ b/sys/dev/sun/cgsix.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cgsix.c,v 1.34 2007/03/04 06:02:44 christos Exp $ */
+/* $NetBSD: cgsix.c,v 1.35 2007/10/19 12:01:18 ad Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -85,7 +85,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.34 2007/03/04 06:02:44 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.35 2007/10/19 12:01:18 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -104,7 +104,7 @@ __KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.34 2007/03/04 06:02:44 christos Exp $");
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/sun/fbio.h>
#include <dev/sun/fbvar.h>
diff --git a/sys/dev/sun/cgthree.c b/sys/dev/sun/cgthree.c
index b5e42350903..b72bc1321c5 100644
--- a/sys/dev/sun/cgthree.c
+++ b/sys/dev/sun/cgthree.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cgthree.c,v 1.13 2007/03/04 06:02:45 christos Exp $ */
+/* $NetBSD: cgthree.c,v 1.14 2007/10/19 12:01:19 ad Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgthree.c,v 1.13 2007/03/04 06:02:45 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgthree.c,v 1.14 2007/10/19 12:01:19 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -57,7 +57,7 @@ __KERNEL_RCSID(0, "$NetBSD: cgthree.c,v 1.13 2007/03/04 06:02:45 christos Exp $"
#include <sys/tty.h>
#include <sys/conf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <dev/sun/fbio.h>
diff --git a/sys/dev/tc/asc_tc.c b/sys/dev/tc/asc_tc.c
index fd217174844..0c7f8a9a950 100644
--- a/sys/dev/tc/asc_tc.c
+++ b/sys/dev/tc/asc_tc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: asc_tc.c,v 1.30 2007/03/04 15:17:06 yamt Exp $ */
+/* $NetBSD: asc_tc.c,v 1.31 2007/10/19 12:01:19 ad Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: asc_tc.c,v 1.30 2007/03/04 15:17:06 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: asc_tc.c,v 1.31 2007/10/19 12:01:19 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: asc_tc.c,v 1.30 2007/03/04 15:17:06 yamt Exp $");
#include <dev/scsipi/scsiconf.h>
#include <dev/scsipi/scsi_message.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/ncr53c9xreg.h>
#include <dev/ic/ncr53c9xvar.h>
diff --git a/sys/dev/tc/asc_tcds.c b/sys/dev/tc/asc_tcds.c
index 81d532855b8..74f70c7fe52 100644
--- a/sys/dev/tc/asc_tcds.c
+++ b/sys/dev/tc/asc_tcds.c
@@ -1,4 +1,4 @@
-/* $NetBSD: asc_tcds.c,v 1.19 2007/03/04 15:17:06 yamt Exp $ */
+/* $NetBSD: asc_tcds.c,v 1.20 2007/10/19 12:01:19 ad Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: asc_tcds.c,v 1.19 2007/03/04 15:17:06 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: asc_tcds.c,v 1.20 2007/10/19 12:01:19 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -83,7 +83,7 @@ __KERNEL_RCSID(0, "$NetBSD: asc_tcds.c,v 1.19 2007/03/04 15:17:06 yamt Exp $");
#include <dev/ic/ncr53c9xreg.h>
#include <dev/ic/ncr53c9xvar.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/tc/tcvar.h>
#include <dev/tc/tcdsreg.h>
diff --git a/sys/dev/tc/bba.c b/sys/dev/tc/bba.c
index 059da05fbfb..95c71edd454 100644
--- a/sys/dev/tc/bba.c
+++ b/sys/dev/tc/bba.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bba.c,v 1.31 2007/03/04 06:02:46 christos Exp $ */
+/* $NetBSD: bba.c,v 1.32 2007/10/19 12:01:19 ad Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
/* maxine/alpha baseboard audio (bba) */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bba.c,v 1.31 2007/03/04 06:02:46 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bba.c,v 1.32 2007/10/19 12:01:19 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -44,9 +44,9 @@ __KERNEL_RCSID(0, "$NetBSD: bba.c,v 1.31 2007/03/04 06:02:46 christos Exp $");
#include <sys/device.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
-#include <machine/cpu.h>
+#include <sys/cpu.h>
#include <sys/audioio.h>
#include <dev/audio_if.h>
diff --git a/sys/dev/tc/cfb.c b/sys/dev/tc/cfb.c
index 68a0224a810..b707de69d03 100644
--- a/sys/dev/tc/cfb.c
+++ b/sys/dev/tc/cfb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cfb.c,v 1.52 2007/03/04 15:17:06 yamt Exp $ */
+/* $NetBSD: cfb.c,v 1.53 2007/10/19 12:01:19 ad Exp $ */
/*
* Copyright (c) 1998, 1999 Tohru Nishimura. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cfb.c,v 1.52 2007/03/04 15:17:06 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cfb.c,v 1.53 2007/10/19 12:01:19 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -41,8 +41,8 @@ __KERNEL_RCSID(0, "$NetBSD: cfb.c,v 1.52 2007/03/04 15:17:06 yamt Exp $");
#include <sys/buf.h>
#include <sys/ioctl.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/wscons/wsconsio.h>
#include <dev/wscons/wsdisplayvar.h>
diff --git a/sys/dev/tc/mfb.c b/sys/dev/tc/mfb.c
index e3e2e58d8ab..09f69e44445 100644
--- a/sys/dev/tc/mfb.c
+++ b/sys/dev/tc/mfb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mfb.c,v 1.49 2007/03/04 15:46:18 yamt Exp $ */
+/* $NetBSD: mfb.c,v 1.50 2007/10/19 12:01:19 ad Exp $ */
/*
* Copyright (c) 1998, 1999 Tohru Nishimura. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mfb.c,v 1.49 2007/03/04 15:46:18 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfb.c,v 1.50 2007/10/19 12:01:19 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -41,8 +41,8 @@ __KERNEL_RCSID(0, "$NetBSD: mfb.c,v 1.49 2007/03/04 15:46:18 yamt Exp $");
#include <sys/buf.h>
#include <sys/ioctl.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/wscons/wsconsio.h>
#include <dev/wscons/wsdisplayvar.h>
diff --git a/sys/dev/tc/px.c b/sys/dev/tc/px.c
index ad2c13c874b..e11e4dc0d7a 100644
--- a/sys/dev/tc/px.c
+++ b/sys/dev/tc/px.c
@@ -1,4 +1,4 @@
-/* $NetBSD: px.c,v 1.30 2007/03/04 15:55:29 yamt Exp $ */
+/* $NetBSD: px.c,v 1.31 2007/10/19 12:01:19 ad Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: px.c,v 1.30 2007/03/04 15:55:29 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: px.c,v 1.31 2007/10/19 12:01:19 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -58,8 +58,8 @@ __KERNEL_RCSID(0, "$NetBSD: px.c,v 1.30 2007/03/04 15:55:29 yamt Exp $");
#endif
#include <machine/autoconf.h>
-#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/cpu.h>
+#include <sys/bus.h>
#include <dev/cons.h>
diff --git a/sys/dev/tc/pxg.c b/sys/dev/tc/pxg.c
index 6cc3d4a0799..b440ec97745 100644
--- a/sys/dev/tc/pxg.c
+++ b/sys/dev/tc/pxg.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pxg.c,v 1.27 2007/03/04 15:55:29 yamt Exp $ */
+/* $NetBSD: pxg.c,v 1.28 2007/10/19 12:01:19 ad Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pxg.c,v 1.27 2007/03/04 15:55:29 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pxg.c,v 1.28 2007/10/19 12:01:19 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -59,8 +59,8 @@ __KERNEL_RCSID(0, "$NetBSD: pxg.c,v 1.27 2007/03/04 15:55:29 yamt Exp $");
#endif
#include <machine/autoconf.h>
-#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/cpu.h>
+#include <sys/bus.h>
#include <dev/cons.h>
diff --git a/sys/dev/tc/sfb.c b/sys/dev/tc/sfb.c
index 7825889ec16..068deed7eb3 100644
--- a/sys/dev/tc/sfb.c
+++ b/sys/dev/tc/sfb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sfb.c,v 1.74 2007/03/05 21:05:02 dogcow Exp $ */
+/* $NetBSD: sfb.c,v 1.75 2007/10/19 12:01:19 ad Exp $ */
/*
* Copyright (c) 1998, 1999 Tohru Nishimura. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sfb.c,v 1.74 2007/03/05 21:05:02 dogcow Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sfb.c,v 1.75 2007/10/19 12:01:19 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -41,8 +41,8 @@ __KERNEL_RCSID(0, "$NetBSD: sfb.c,v 1.74 2007/03/05 21:05:02 dogcow Exp $");
#include <sys/buf.h>
#include <sys/ioctl.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/wscons/wsconsio.h>
#include <dev/wscons/wsdisplayvar.h>
diff --git a/sys/dev/tc/sfbplus.c b/sys/dev/tc/sfbplus.c
index 0f41e6928b3..e65bea1bd59 100644
--- a/sys/dev/tc/sfbplus.c
+++ b/sys/dev/tc/sfbplus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sfbplus.c,v 1.28 2007/03/05 21:05:02 dogcow Exp $ */
+/* $NetBSD: sfbplus.c,v 1.29 2007/10/19 12:01:20 ad Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Tohru Nishimura. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sfbplus.c,v 1.28 2007/03/05 21:05:02 dogcow Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sfbplus.c,v 1.29 2007/10/19 12:01:20 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -41,8 +41,8 @@ __KERNEL_RCSID(0, "$NetBSD: sfbplus.c,v 1.28 2007/03/05 21:05:02 dogcow Exp $");
#include <sys/buf.h>
#include <sys/ioctl.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/wscons/wsconsio.h>
#include <dev/wscons/wsdisplayvar.h>
diff --git a/sys/dev/tc/stic.c b/sys/dev/tc/stic.c
index 966534d47b5..14ceb9ce39f 100644
--- a/sys/dev/tc/stic.c
+++ b/sys/dev/tc/stic.c
@@ -1,4 +1,4 @@
-/* $NetBSD: stic.c,v 1.41 2007/07/21 19:06:21 ad Exp $ */
+/* $NetBSD: stic.c,v 1.42 2007/10/19 12:01:20 ad Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: stic.c,v 1.41 2007/07/21 19:06:21 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: stic.c,v 1.42 2007/10/19 12:01:20 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -97,8 +97,8 @@ __KERNEL_RCSID(0, "$NetBSD: stic.c,v 1.41 2007/07/21 19:06:21 ad Exp $");
#endif
#include <machine/vmparam.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/wscons/wsconsio.h>
#include <dev/wscons/wsdisplayvar.h>
diff --git a/sys/dev/tc/tcds.c b/sys/dev/tc/tcds.c
index 5afce020dd7..6907e42b155 100644
--- a/sys/dev/tc/tcds.c
+++ b/sys/dev/tc/tcds.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tcds.c,v 1.19 2006/03/31 17:39:33 thorpej Exp $ */
+/* $NetBSD: tcds.c,v 1.20 2007/10/19 12:01:20 ad Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcds.c,v 1.19 2006/03/31 17:39:33 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcds.c,v 1.20 2007/10/19 12:01:20 ad Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -83,7 +83,7 @@ __KERNEL_RCSID(0, "$NetBSD: tcds.c,v 1.19 2006/03/31 17:39:33 thorpej Exp $");
#include <dev/ic/ncr53c9xvar.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/tc/tcvar.h>
#include <dev/tc/tcdsreg.h>
diff --git a/sys/dev/tc/tcvar.h b/sys/dev/tc/tcvar.h
index 4e896db2ab2..88eb202f13c 100644
--- a/sys/dev/tc/tcvar.h
+++ b/sys/dev/tc/tcvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: tcvar.h,v 1.22 2005/12/11 12:24:00 christos Exp $ */
+/* $NetBSD: tcvar.h,v 1.23 2007/10/19 12:01:20 ad Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
@@ -34,7 +34,7 @@
* Definitions for TURBOchannel autoconfiguration.
*/
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/tc/tcreg.h>
/*
@@ -51,7 +51,7 @@
/*
* Map the new definitions to the old.
*/
-#include <machine/intr.h>
+#include <sys/intr.h>
#define tc_intrlevel_t int
diff --git a/sys/dev/tc/tfb.c b/sys/dev/tc/tfb.c
index e1e0b295437..680d932655c 100644
--- a/sys/dev/tc/tfb.c
+++ b/sys/dev/tc/tfb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tfb.c,v 1.52 2007/03/04 15:57:25 yamt Exp $ */
+/* $NetBSD: tfb.c,v 1.53 2007/10/19 12:01:20 ad Exp $ */
/*
* Copyright (c) 1998, 1999 Tohru Nishimura. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tfb.c,v 1.52 2007/03/04 15:57:25 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tfb.c,v 1.53 2007/10/19 12:01:20 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -41,8 +41,8 @@ __KERNEL_RCSID(0, "$NetBSD: tfb.c,v 1.52 2007/03/04 15:57:25 yamt Exp $");
#include <sys/buf.h>
#include <sys/ioctl.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/wscons/wsconsio.h>
#include <dev/wscons/wsdisplayvar.h>
diff --git a/sys/dev/tc/xcfb.c b/sys/dev/tc/xcfb.c
index 2945b841f0a..469dfac55ff 100644
--- a/sys/dev/tc/xcfb.c
+++ b/sys/dev/tc/xcfb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: xcfb.c,v 1.44 2007/03/06 22:29:29 simonb Exp $ */
+/* $NetBSD: xcfb.c,v 1.45 2007/10/19 12:01:20 ad Exp $ */
/*
* Copyright (c) 1998, 1999 Tohru Nishimura. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xcfb.c,v 1.44 2007/03/06 22:29:29 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xcfb.c,v 1.45 2007/10/19 12:01:20 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -41,8 +41,8 @@ __KERNEL_RCSID(0, "$NetBSD: xcfb.c,v 1.44 2007/03/06 22:29:29 simonb Exp $");
#include <sys/buf.h>
#include <sys/ioctl.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/wscons/wsconsio.h>
#include <dev/wscons/wsdisplayvar.h>
diff --git a/sys/dev/usb/ehci.c b/sys/dev/usb/ehci.c
index 949a844da95..f717a300a8f 100644
--- a/sys/dev/usb/ehci.c
+++ b/sys/dev/usb/ehci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci.c,v 1.124 2007/08/15 04:00:33 kiyohara Exp $ */
+/* $NetBSD: ehci.c,v 1.125 2007/10/19 12:01:21 ad Exp $ */
/*
* Copyright (c) 2004,2005 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.124 2007/08/15 04:00:33 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.125 2007/10/19 12:01:21 ad Exp $");
#include "ohci.h"
#include "uhci.h"
@@ -75,7 +75,7 @@ __KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.124 2007/08/15 04:00:33 kiyohara Exp $");
#include <sys/proc.h>
#include <sys/queue.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/endian.h>
#include <dev/usb/usb.h>
diff --git a/sys/dev/usb/if_atu.c b/sys/dev/usb/if_atu.c
index 3e0d5c840b8..f980b7b74ce 100644
--- a/sys/dev/usb/if_atu.c
+++ b/sys/dev/usb/if_atu.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_atu.c,v 1.27 2007/07/16 15:55:38 dyoung Exp $ */
+/* $NetBSD: if_atu.c,v 1.28 2007/10/19 12:01:21 ad Exp $ */
/* $OpenBSD: if_atu.c,v 1.48 2004/12/30 01:53:21 dlg Exp $ */
/*
* Copyright (c) 2003, 2004
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_atu.c,v 1.27 2007/07/16 15:55:38 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_atu.c,v 1.28 2007/10/19 12:01:21 ad Exp $");
#include "bpfilter.h"
@@ -63,7 +63,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_atu.c,v 1.27 2007/07/16 15:55:38 dyoung Exp $");
#include <sys/queue.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
diff --git a/sys/dev/usb/if_rum.c b/sys/dev/usb/if_rum.c
index e0f1700c5c9..77027e7bb25 100644
--- a/sys/dev/usb/if_rum.c
+++ b/sys/dev/usb/if_rum.c
@@ -1,5 +1,5 @@
/* $OpenBSD: if_rum.c,v 1.40 2006/09/18 16:20:20 damien Exp $ */
-/* $NetBSD: if_rum.c,v 1.15 2007/08/26 22:45:59 dyoung Exp $ */
+/* $NetBSD: if_rum.c,v 1.16 2007/10/19 12:01:21 ad Exp $ */
/*-
* Copyright (c) 2005, 2006 Damien Bergamini <damien.bergamini@free.fr>
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_rum.c,v 1.15 2007/08/26 22:45:59 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rum.c,v 1.16 2007/10/19 12:01:21 ad Exp $");
#include "bpfilter.h"
@@ -39,9 +39,9 @@ __KERNEL_RCSID(0, "$NetBSD: if_rum.c,v 1.15 2007/08/26 22:45:59 dyoung Exp $");
#include <sys/conf.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/endian.h>
-#include <machine/intr.h>
+#include <sys/intr.h>
#if NBPFILTER > 0
#include <net/bpf.h>
diff --git a/sys/dev/usb/if_ural.c b/sys/dev/usb/if_ural.c
index 69ced795721..b04d37d037c 100644
--- a/sys/dev/usb/if_ural.c
+++ b/sys/dev/usb/if_ural.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ural.c,v 1.24 2007/08/26 22:45:59 dyoung Exp $ */
+/* $NetBSD: if_ural.c,v 1.25 2007/10/19 12:01:21 ad Exp $ */
/* $FreeBSD: /repoman/r/ncvs/src/sys/dev/usb/if_ural.c,v 1.40 2006/06/02 23:14:40 sam Exp $ */
/*-
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ural.c,v 1.24 2007/08/26 22:45:59 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ural.c,v 1.25 2007/10/19 12:01:21 ad Exp $");
#include "bpfilter.h"
@@ -39,9 +39,9 @@ __KERNEL_RCSID(0, "$NetBSD: if_ural.c,v 1.24 2007/08/26 22:45:59 dyoung Exp $");
#include <sys/conf.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/endian.h>
-#include <machine/intr.h>
+#include <sys/intr.h>
#if NBPFILTER > 0
#include <net/bpf.h>
diff --git a/sys/dev/usb/if_zyd.c b/sys/dev/usb/if_zyd.c
index cd660db4ed1..c22c49a1170 100644
--- a/sys/dev/usb/if_zyd.c
+++ b/sys/dev/usb/if_zyd.c
@@ -1,5 +1,5 @@
/* $OpenBSD: if_zyd.c,v 1.52 2007/02/11 00:08:04 jsg Exp $ */
-/* $NetBSD: if_zyd.c,v 1.10 2007/08/26 22:45:59 dyoung Exp $ */
+/* $NetBSD: if_zyd.c,v 1.11 2007/10/19 12:01:21 ad Exp $ */
/*-
* Copyright (c) 2006 by Damien Bergamini <damien.bergamini@free.fr>
@@ -22,7 +22,7 @@
* ZyDAS ZD1211/ZD1211B USB WLAN driver.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_zyd.c,v 1.10 2007/08/26 22:45:59 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_zyd.c,v 1.11 2007/10/19 12:01:21 ad Exp $");
#include "bpfilter.h"
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_zyd.c,v 1.10 2007/08/26 22:45:59 dyoung Exp $");
#include <sys/conf.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/endian.h>
#if NBPFILTER > 0
diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c
index 574100a133c..ffed3e114a0 100644
--- a/sys/dev/usb/ohci.c
+++ b/sys/dev/usb/ohci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci.c,v 1.183 2007/08/15 04:00:33 kiyohara Exp $ */
+/* $NetBSD: ohci.c,v 1.184 2007/10/19 12:01:21 ad Exp $ */
/* $FreeBSD: src/sys/dev/usb/ohci.c,v 1.22 1999/11/17 22:33:40 n_hibma Exp $ */
/*
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.183 2007/08/15 04:00:33 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.184 2007/10/19 12:01:21 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -64,13 +64,13 @@ __KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.183 2007/08/15 04:00:33 kiyohara Exp $");
#include <machine/bus_pio.h>
#include <machine/bus_memio.h>
#if defined(DIAGNOSTIC) && defined(__i386__) && defined(__FreeBSD__)
-#include <machine/cpu.h>
+#include <sys/cpu.h>
#endif
#endif
#include <sys/proc.h>
#include <sys/queue.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/endian.h>
#include <dev/usb/usb.h>
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c
index afeaff064f1..5827659be8c 100644
--- a/sys/dev/usb/uhci.c
+++ b/sys/dev/usb/uhci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uhci.c,v 1.210 2007/08/15 04:00:33 kiyohara Exp $ */
+/* $NetBSD: uhci.c,v 1.211 2007/10/19 12:01:22 ad Exp $ */
/* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.33 1999/11/17 22:33:41 n_hibma Exp $ */
/*
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.210 2007/08/15 04:00:33 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.211 2007/10/19 12:01:22 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -65,13 +65,13 @@ __KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.210 2007/08/15 04:00:33 kiyohara Exp $");
#include <sys/bus.h>
#include <machine/bus_pio.h>
#if defined(DIAGNOSTIC) && defined(__i386__)
-#include <machine/cpu.h>
+#include <sys/cpu.h>
#endif
#endif
#include <sys/proc.h>
#include <sys/queue.h>
+#include <sys/bus.h>
-#include <machine/bus.h>
#include <machine/endian.h>
#include <dev/usb/usb.h>
diff --git a/sys/dev/usb/uhub.c b/sys/dev/usb/uhub.c
index 3d9b268017d..73659635d9b 100644
--- a/sys/dev/usb/uhub.c
+++ b/sys/dev/usb/uhub.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uhub.c,v 1.89 2007/03/23 21:51:34 drochner Exp $ */
+/* $NetBSD: uhub.c,v 1.90 2007/10/19 12:01:22 ad Exp $ */
/* $FreeBSD: src/sys/dev/usb/uhub.c,v 1.18 1999/11/17 22:33:43 n_hibma Exp $ */
/*
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhub.c,v 1.89 2007/03/23 21:51:34 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhub.c,v 1.90 2007/10/19 12:01:22 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -58,7 +58,7 @@ __KERNEL_RCSID(0, "$NetBSD: uhub.c,v 1.89 2007/03/23 21:51:34 drochner Exp $");
#include "bus_if.h"
#endif
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
diff --git a/sys/dev/usb/ukyopon.c b/sys/dev/usb/ukyopon.c
index ccbd373fd72..6ee0af5a9c2 100644
--- a/sys/dev/usb/ukyopon.c
+++ b/sys/dev/usb/ukyopon.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ukyopon.c,v 1.7 2007/03/13 13:51:55 drochner Exp $ */
+/* $NetBSD: ukyopon.c,v 1.8 2007/10/19 12:01:22 ad Exp $ */
/*
* Copyright (c) 1998, 2005 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ukyopon.c,v 1.7 2007/03/13 13:51:55 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ukyopon.c,v 1.8 2007/10/19 12:01:22 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -56,7 +56,7 @@ __KERNEL_RCSID(0, "$NetBSD: ukyopon.c,v 1.7 2007/03/13 13:51:55 drochner Exp $")
#include <sys/device.h>
#include <sys/poll.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbcdc.h>
diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c
index eacfed663c1..dc14c650eca 100644
--- a/sys/dev/usb/usb.c
+++ b/sys/dev/usb/usb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: usb.c,v 1.100 2007/10/08 16:18:04 ad Exp $ */
+/* $NetBSD: usb.c,v 1.101 2007/10/19 12:01:22 ad Exp $ */
/*
* Copyright (c) 1998, 2002 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.100 2007/10/08 16:18:04 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.101 2007/10/19 12:01:22 ad Exp $");
#include "opt_compat_netbsd.h"
@@ -72,7 +72,7 @@ __KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.100 2007/10/08 16:18:04 ad Exp $");
#define USB_DEV_MINOR 255
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/usb/usbdivar.h>
#include <dev/usb/usb_quirks.h>
diff --git a/sys/dev/usb/usb_mem.c b/sys/dev/usb/usb_mem.c
index 5ed2fb469df..e4f4371f4ca 100644
--- a/sys/dev/usb/usb_mem.c
+++ b/sys/dev/usb/usb_mem.c
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_mem.c,v 1.32 2007/03/04 06:02:50 christos Exp $ */
+/* $NetBSD: usb_mem.c,v 1.33 2007/10/19 12:01:22 ad Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb_mem.c,v 1.32 2007/03/04 06:02:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_mem.c,v 1.33 2007/10/19 12:01:22 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -53,7 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: usb_mem.c,v 1.32 2007/03/04 06:02:50 christos Exp $"
#include <sys/malloc.h>
#include <sys/queue.h>
#include <sys/device.h> /* for usbdivar.h */
-#include <machine/bus.h>
+#include <sys/bus.h>
#ifdef __NetBSD__
#include <sys/extent.h>
diff --git a/sys/dev/usb/usb_subr.c b/sys/dev/usb/usb_subr.c
index 00084e3d1f0..4610c005eea 100644
--- a/sys/dev/usb/usb_subr.c
+++ b/sys/dev/usb/usb_subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_subr.c,v 1.148 2007/06/30 09:17:45 mlelstv Exp $ */
+/* $NetBSD: usb_subr.c,v 1.149 2007/10/19 12:01:22 ad Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $ */
/*
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.148 2007/06/30 09:17:45 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.149 2007/10/19 12:01:22 ad Exp $");
#include "opt_compat_netbsd.h"
#include "opt_usbverbose.h"
@@ -57,7 +57,7 @@ __KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.148 2007/06/30 09:17:45 mlelstv Exp $
#endif
#include <sys/proc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/usb/usb.h>
diff --git a/sys/dev/usb/usbdi.c b/sys/dev/usb/usbdi.c
index 51b648d06c9..b9b3e7b708c 100644
--- a/sys/dev/usb/usbdi.c
+++ b/sys/dev/usb/usbdi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdi.c,v 1.120 2007/08/15 04:00:34 kiyohara Exp $ */
+/* $NetBSD: usbdi.c,v 1.121 2007/10/19 12:01:23 ad Exp $ */
/* $FreeBSD: src/sys/dev/usb/usbdi.c,v 1.28 1999/11/17 22:33:49 n_hibma Exp $ */
/*
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.120 2007/08/15 04:00:34 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.121 2007/10/19 12:01:23 ad Exp $");
#include "opt_compat_netbsd.h"
@@ -54,13 +54,13 @@ __KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.120 2007/08/15 04:00:34 kiyohara Exp $")
#include <sys/conf.h>
#include "usb_if.h"
#if defined(DIAGNOSTIC) && defined(__i386__)
-#include <machine/cpu.h>
+#include <sys/cpu.h>
#endif
#endif
#include <sys/malloc.h>
#include <sys/proc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
diff --git a/sys/dev/usb/xboxcontroller.c b/sys/dev/usb/xboxcontroller.c
index 8b7799a28c6..804ca13056c 100644
--- a/sys/dev/usb/xboxcontroller.c
+++ b/sys/dev/usb/xboxcontroller.c
@@ -1,4 +1,4 @@
-/* $NetBSD: xboxcontroller.c,v 1.5 2007/03/13 13:51:57 drochner Exp $ */
+/* $NetBSD: xboxcontroller.c,v 1.6 2007/10/19 12:01:23 ad Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill <jmcneill@invisible.ca>
@@ -33,14 +33,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xboxcontroller.c,v 1.5 2007/03/13 13:51:57 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xboxcontroller.c,v 1.6 2007/10/19 12:01:23 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/wscons/wsconsio.h>
#include <dev/wscons/wsmousevar.h>
diff --git a/sys/dev/vme/if_ie_vme.c b/sys/dev/vme/if_ie_vme.c
index 9d9cf8730fe..57c3cc778eb 100644
--- a/sys/dev/vme/if_ie_vme.c
+++ b/sys/dev/vme/if_ie_vme.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ie_vme.c,v 1.22 2005/12/11 12:24:07 christos Exp $ */
+/* $NetBSD: if_ie_vme.c,v 1.23 2007/10/19 12:01:23 ad Exp $ */
/*-
* Copyright (c) 1995 Charles D. Cranor
@@ -145,7 +145,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ie_vme.c,v 1.22 2005/12/11 12:24:07 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ie_vme.c,v 1.23 2007/10/19 12:01:23 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -160,8 +160,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_ie_vme.c,v 1.22 2005/12/11 12:24:07 christos Exp
#include <net/if_media.h>
#include <net/if_ether.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#ifdef __sparc__
#include <machine/autoconf.h>
#endif
diff --git a/sys/dev/vme/sc_vme.c b/sys/dev/vme/sc_vme.c
index 2cc71b30389..1e16043bcc2 100644
--- a/sys/dev/vme/sc_vme.c
+++ b/sys/dev/vme/sc_vme.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sc_vme.c,v 1.13 2006/03/29 04:16:51 thorpej Exp $ */
+/* $NetBSD: sc_vme.c,v 1.14 2007/10/19 12:01:23 ad Exp $ */
/*-
* Copyright (c) 1996,2000,2001 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sc_vme.c,v 1.13 2006/03/29 04:16:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sc_vme.c,v 1.14 2007/10/19 12:01:23 ad Exp $");
#include "opt_ddb.h"
@@ -81,8 +81,8 @@ __KERNEL_RCSID(0, "$NetBSD: sc_vme.c,v 1.13 2006/03/29 04:16:51 thorpej Exp $");
#include <sys/device.h>
#include <sys/buf.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/vme/vmereg.h>
#include <dev/vme/vmevar.h>
diff --git a/sys/dev/vme/si.c b/sys/dev/vme/si.c
index f8fcc2a1f9f..8e907cd4d3f 100644
--- a/sys/dev/vme/si.c
+++ b/sys/dev/vme/si.c
@@ -1,4 +1,4 @@
-/* $NetBSD: si.c,v 1.18 2007/03/04 06:02:50 christos Exp $ */
+/* $NetBSD: si.c,v 1.19 2007/10/19 12:01:23 ad Exp $ */
/*-
* Copyright (c) 1996,2000 The NetBSD Foundation, Inc.
@@ -80,7 +80,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: si.c,v 1.18 2007/03/04 06:02:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: si.c,v 1.19 2007/10/19 12:01:23 ad Exp $");
#include "opt_ddb.h"
@@ -92,8 +92,8 @@ __KERNEL_RCSID(0, "$NetBSD: si.c,v 1.18 2007/03/04 06:02:50 christos Exp $");
#include <sys/device.h>
#include <sys/buf.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#include <dev/vme/vmereg.h>
#include <dev/vme/vmevar.h>
diff --git a/sys/dev/vme/vme.c b/sys/dev/vme/vme.c
index d17c84cdc2c..2644af9c322 100644
--- a/sys/dev/vme/vme.c
+++ b/sys/dev/vme/vme.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vme.c,v 1.18 2006/03/25 23:26:51 thorpej Exp $ */
+/* $NetBSD: vme.c,v 1.19 2007/10/19 12:01:23 ad Exp $ */
/*
* Copyright (c) 1999
@@ -29,14 +29,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vme.c,v 1.18 2006/03/25 23:26:51 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vme.c,v 1.19 2007/10/19 12:01:23 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/malloc.h>
#include <sys/extent.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/vme/vmereg.h>
#include <dev/vme/vmevar.h>
diff --git a/sys/dev/vme/xd.c b/sys/dev/vme/xd.c
index f44f4525e76..dd5cdd962ad 100644
--- a/sys/dev/vme/xd.c
+++ b/sys/dev/vme/xd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: xd.c,v 1.70 2007/10/08 16:41:15 ad Exp $ */
+/* $NetBSD: xd.c,v 1.71 2007/10/19 12:01:23 ad Exp $ */
/*
*
@@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xd.c,v 1.70 2007/10/08 16:41:15 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xd.c,v 1.71 2007/10/19 12:01:23 ad Exp $");
#undef XDC_DEBUG /* full debug */
#define XDC_DIAG /* extra sanity checks */
@@ -78,8 +78,8 @@ __KERNEL_RCSID(0, "$NetBSD: xd.c,v 1.70 2007/10/08 16:41:15 ad Exp $");
#include <sys/conf.h>
#include <sys/kauth.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#if defined(__sparc__) || defined(sun3)
#include <dev/sun/disklabel.h>
diff --git a/sys/dev/vme/xy.c b/sys/dev/vme/xy.c
index 52fa9b4f2b0..479887202da 100644
--- a/sys/dev/vme/xy.c
+++ b/sys/dev/vme/xy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: xy.c,v 1.73 2007/10/08 16:41:15 ad Exp $ */
+/* $NetBSD: xy.c,v 1.74 2007/10/19 12:01:23 ad Exp $ */
/*
*
@@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xy.c,v 1.73 2007/10/08 16:41:15 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xy.c,v 1.74 2007/10/19 12:01:23 ad Exp $");
#undef XYC_DEBUG /* full debug */
#undef XYC_DIAG /* extra sanity checks */
@@ -78,8 +78,8 @@ __KERNEL_RCSID(0, "$NetBSD: xy.c,v 1.73 2007/10/08 16:41:15 ad Exp $");
#include <sys/conf.h>
#include <sys/kauth.h>
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
#if defined(__sparc__) || defined(sun3)
#include <dev/sun/disklabel.h>
diff --git a/sys/dev/wsfb/genfbvar.h b/sys/dev/wsfb/genfbvar.h
index a9bee798561..7b98cdf1bc2 100644
--- a/sys/dev/wsfb/genfbvar.h
+++ b/sys/dev/wsfb/genfbvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: genfbvar.h,v 1.4 2007/08/04 23:51:37 macallan Exp $ */
+/* $NetBSD: genfbvar.h,v 1.5 2007/10/19 12:01:24 ad Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfbvar.h,v 1.4 2007/08/04 23:51:37 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfbvar.h,v 1.5 2007/10/19 12:01:24 ad Exp $");
#ifndef GENFBVAR_H
#define GENFBVAR_H
@@ -40,7 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: genfbvar.h,v 1.4 2007/08/04 23:51:37 macallan Exp $"
#include <sys/conf.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/wscons/wsconsio.h>
#include <dev/wscons/wsdisplayvar.h>
diff --git a/sys/dev/xmi/bi_xmi.c b/sys/dev/xmi/bi_xmi.c
index 420e6f79c70..ec1792f9983 100644
--- a/sys/dev/xmi/bi_xmi.c
+++ b/sys/dev/xmi/bi_xmi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bi_xmi.c,v 1.5 2002/10/02 16:53:21 thorpej Exp $ */
+/* $NetBSD: bi_xmi.c,v 1.6 2007/10/19 12:01:24 ad Exp $ */
/*
* Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved.
@@ -36,12 +36,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bi_xmi.c,v 1.5 2002/10/02 16:53:21 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bi_xmi.c,v 1.6 2007/10/19 12:01:24 ad Exp $");
#include <sys/param.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/xmi/xmireg.h>
#include <dev/xmi/xmivar.h>
diff --git a/sys/dev/xmi/xmi.c b/sys/dev/xmi/xmi.c
index 520fa91a8bf..8bcecdc0b5a 100644
--- a/sys/dev/xmi/xmi.c
+++ b/sys/dev/xmi/xmi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: xmi.c,v 1.8 2007/03/04 06:02:52 christos Exp $ */
+/* $NetBSD: xmi.c,v 1.9 2007/10/19 12:01:24 ad Exp $ */
/*
* Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xmi.c,v 1.8 2007/03/04 06:02:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xmi.c,v 1.9 2007/10/19 12:01:24 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -43,8 +43,8 @@ __KERNEL_RCSID(0, "$NetBSD: xmi.c,v 1.8 2007/03/04 06:02:52 christos Exp $");
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
-#include <machine/cpu.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
#include <dev/xmi/xmireg.h>
#include <dev/xmi/xmivar.h>