29 files changed, 29 insertions, 53 deletions

diff --git a/sys/modules/ata/atacard/Makefile b/sys/modules/ata/atacard/Makefile
index 1bb8b5bcddb2a..412a16499d6e4 100644
--- a/sys/modules/ata/atacard/Makefile
+++ b/sys/modules/ata/atacard/Makefile
@@ -4,6 +4,6 @@
 
 KMOD=	atacard
 SRCS=	ata-card.c
-SRCS+=  opt_ata.h pccarddevs.h ata_if.h device_if.h bus_if.h isa_if.h card_if.h
+SRCS+=	ata_if.h bus_if.h card_if.h device_if.h pccarddevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/ata/atacbus/Makefile b/sys/modules/ata/atacbus/Makefile
index 2b11a89137eee..2b3c1341c1049 100644
--- a/sys/modules/ata/atacbus/Makefile
+++ b/sys/modules/ata/atacbus/Makefile
@@ -4,6 +4,6 @@
 
 KMOD=	atacbus
 SRCS=	ata-cbus.c
-SRCS+=	opt_ata.h ata_if.h device_if.h bus_if.h isa_if.h
+SRCS+=	ata_if.h bus_if.h device_if.h bus_if.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/ata/atacore/Makefile b/sys/modules/ata/atacore/Makefile
index cba897fd83ed7..4ee16cfb3cc64 100644
--- a/sys/modules/ata/atacore/Makefile
+++ b/sys/modules/ata/atacore/Makefile
@@ -4,6 +4,6 @@
 
 KMOD=	ata
 SRCS=	ata-all.c ata_if.c ata-lowlevel.c
-SRCS+=	opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h
+SRCS+=	ata_if.h bus_if.h device_if.h opt_cam.h pci_if.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/ata/atadevel/Makefile b/sys/modules/ata/atadevel/Makefile
index d87c84fab39f3..03111d4e348b4 100644
--- a/sys/modules/ata/atadevel/Makefile
+++ b/sys/modules/ata/atadevel/Makefile
@@ -4,7 +4,7 @@
 
 KMOD=	atadevel
 SRCS=	ata-devel.c
-SRCS+=  opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h
+SRCS+=	ata_if.h device_if.h bus_if.h pci_if.h
 CFLAGS+=-g
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/ata/ataisa/Makefile b/sys/modules/ata/ataisa/Makefile
index b43fd2e348882..5c951c0fe5c57 100644
--- a/sys/modules/ata/ataisa/Makefile
+++ b/sys/modules/ata/ataisa/Makefile
@@ -4,6 +4,6 @@
 
 KMOD=	ataisa
 SRCS=	ata-isa.c
-SRCS+=	opt_ata.h ata_if.h device_if.h bus_if.h isa_if.h
+SRCS+=	ata_if.h bus_if.h device_if.h isa_if.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/ata/atapci/Makefile b/sys/modules/ata/atapci/Makefile
index 6ce854e7b309c..0addeb3a6b012 100644
--- a/sys/modules/ata/atapci/Makefile
+++ b/sys/modules/ata/atapci/Makefile
@@ -6,7 +6,6 @@ SUBDIR += chipsets
 
 KMOD=	atapci
 SRCS=	ata-pci.c ata-dma.c ata-sata.c
-SRCS+=  opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h
+SRCS+=	ata_if.h bus_if.h device_if.h pci_if.h
 
 .include <bsd.kmod.mk>
-
diff --git a/sys/modules/ata/atapci/chipsets/ataacard/Makefile b/sys/modules/ata/atapci/chipsets/ataacard/Makefile
index 28da0f26b5fd2..a0e0389ed9606 100644
--- a/sys/modules/ata/atapci/chipsets/ataacard/Makefile
+++ b/sys/modules/ata/atapci/chipsets/ataacard/Makefile
@@ -4,7 +4,6 @@
 
 KMOD=	ataacard
 SRCS=	ata-acard.c
-SRCS+=  opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h
+SRCS+=	ata_if.h bus_if.h device_if.h pci_if.h
 
 .include <bsd.kmod.mk>
-
diff --git a/sys/modules/ata/atapci/chipsets/ataacerlabs/Makefile b/sys/modules/ata/atapci/chipsets/ataacerlabs/Makefile
index 8c36db1cfed48..6712f53cb8ae9 100644
--- a/sys/modules/ata/atapci/chipsets/ataacerlabs/Makefile
+++ b/sys/modules/ata/atapci/chipsets/ataacerlabs/Makefile
@@ -4,7 +4,6 @@
 
 KMOD=	ataacerlabs
 SRCS=	ata-acerlabs.c
-SRCS+=  opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h
+SRCS+=	ata_if.h bus_if.h device_if.h pci_if.h
 
 .include <bsd.kmod.mk>
-
diff --git a/sys/modules/ata/atapci/chipsets/ataadaptec/Makefile b/sys/modules/ata/atapci/chipsets/ataadaptec/Makefile
index a6e22b906cfd5..c0664a938ac0b 100644
--- a/sys/modules/ata/atapci/chipsets/ataadaptec/Makefile
+++ b/sys/modules/ata/atapci/chipsets/ataadaptec/Makefile
@@ -4,7 +4,6 @@
 
 KMOD=	ataadaptec
 SRCS=	ata-adaptec.c
-SRCS+=  opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h
+SRCS+=	ata_if.h bus_if.h device_if.h pci_if.h
 
 .include <bsd.kmod.mk>
-
diff --git a/sys/modules/ata/atapci/chipsets/ataahci/Makefile b/sys/modules/ata/atapci/chipsets/ataahci/Makefile
index c21bf19790117..e8a5d32d3a589 100644
--- a/sys/modules/ata/atapci/chipsets/ataahci/Makefile
+++ b/sys/modules/ata/atapci/chipsets/ataahci/Makefile
@@ -4,7 +4,6 @@
 
 KMOD=	ataahci
 SRCS=	ata-ahci.c
-SRCS+=  opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h
+SRCS+=	ata_if.h bus_if.h device_if.h pci_if.h
 
 .include <bsd.kmod.mk>
-
diff --git a/sys/modules/ata/atapci/chipsets/ataamd/Makefile b/sys/modules/ata/atapci/chipsets/ataamd/Makefile
index f1c6c029dd494..d6dedd5edfd52 100644
--- a/sys/modules/ata/atapci/chipsets/ataamd/Makefile
+++ b/sys/modules/ata/atapci/chipsets/ataamd/Makefile
@@ -4,7 +4,6 @@
 
 KMOD=	ataamd
 SRCS=	ata-amd.c
-SRCS+=  opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h
+SRCS+=	ata_if.h bus_if.h device_if.h pci_if.h
 
 .include <bsd.kmod.mk>
-
diff --git a/sys/modules/ata/atapci/chipsets/ataati/Makefile b/sys/modules/ata/atapci/chipsets/ataati/Makefile
index 5c96e5cde27a3..2f59398f1d720 100644
--- a/sys/modules/ata/atapci/chipsets/ataati/Makefile
+++ b/sys/modules/ata/atapci/chipsets/ataati/Makefile
@@ -4,7 +4,6 @@
 
 KMOD=	ataati
 SRCS=	ata-ati.c
-SRCS+=  opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h
+SRCS+=	ata_if.h bus_if.h device_if.h pci_if.h
 
 .include <bsd.kmod.mk>
-
diff --git a/sys/modules/ata/atapci/chipsets/atacenatek/Makefile b/sys/modules/ata/atapci/chipsets/atacenatek/Makefile
index 90eae7a1910d3..5986465f97fce 100644
--- a/sys/modules/ata/atapci/chipsets/atacenatek/Makefile
+++ b/sys/modules/ata/atapci/chipsets/atacenatek/Makefile
@@ -4,7 +4,6 @@
 
 KMOD=	atacenatek
 SRCS=	ata-cenatek.c
-SRCS+=  opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h
+SRCS+=	ata_if.h bus_if.h device_if.h pci_if.h
 
 .include <bsd.kmod.mk>
-
diff --git a/sys/modules/ata/atapci/chipsets/atacypress/Makefile b/sys/modules/ata/atapci/chipsets/atacypress/Makefile
index e356ea07dc043..c3fe346a430d6 100644
--- a/sys/modules/ata/atapci/chipsets/atacypress/Makefile
+++ b/sys/modules/ata/atapci/chipsets/atacypress/Makefile
@@ -4,7 +4,6 @@
 
 KMOD=	atacypress
 SRCS=	ata-cypress.c
-SRCS+=  opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h
+SRCS+=	ata_if.h bus_if.h device_if.h pci_if.h
 
 .include <bsd.kmod.mk>
-
diff --git a/sys/modules/ata/atapci/chipsets/atacyrix/Makefile b/sys/modules/ata/atapci/chipsets/atacyrix/Makefile
index 405e8cf0f28ab..92df121edff30 100644
--- a/sys/modules/ata/atapci/chipsets/atacyrix/Makefile
+++ b/sys/modules/ata/atapci/chipsets/atacyrix/Makefile
@@ -4,7 +4,6 @@
 
 KMOD=	atacyrix
 SRCS=	ata-cyrix.c
-SRCS+=  opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h
+SRCS+=	ata_if.h bus_if.h device_if.h pci_if.h
 
 .include <bsd.kmod.mk>
-
diff --git a/sys/modules/ata/atapci/chipsets/atahighpoint/Makefile b/sys/modules/ata/atapci/chipsets/atahighpoint/Makefile
index 728829c6a3dbe..89a7d052615ba 100644
--- a/sys/modules/ata/atapci/chipsets/atahighpoint/Makefile
+++ b/sys/modules/ata/atapci/chipsets/atahighpoint/Makefile
@@ -4,7 +4,6 @@
 
 KMOD=	atahighpoint
 SRCS=	ata-highpoint.c
-SRCS+=  opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h
+SRCS+=	ata_if.h bus_if.h device_if.h pci_if.h
 
 .include <bsd.kmod.mk>
-
diff --git a/sys/modules/ata/atapci/chipsets/ataintel/Makefile b/sys/modules/ata/atapci/chipsets/ataintel/Makefile
index 676ad74fc40c0..93845d17d5d88 100644
--- a/sys/modules/ata/atapci/chipsets/ataintel/Makefile
+++ b/sys/modules/ata/atapci/chipsets/ataintel/Makefile
@@ -4,7 +4,6 @@
 
 KMOD=	ataintel
 SRCS=	ata-intel.c
-SRCS+=  opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h
+SRCS+=	ata_if.h bus_if.h device_if.h pci_if.h
 
 .include <bsd.kmod.mk>
-
diff --git a/sys/modules/ata/atapci/chipsets/ataite/Makefile b/sys/modules/ata/atapci/chipsets/ataite/Makefile
index f93eea4c134e9..f8e596b7ce67f 100644
--- a/sys/modules/ata/atapci/chipsets/ataite/Makefile
+++ b/sys/modules/ata/atapci/chipsets/ataite/Makefile
@@ -4,7 +4,6 @@
 
 KMOD=	ataite
 SRCS=	ata-ite.c
-SRCS+=  opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h
+SRCS+=	ata_if.h bus_if.h device_if.h pci_if.h
 
 .include <bsd.kmod.mk>
-
diff --git a/sys/modules/ata/atapci/chipsets/atajmicron/Makefile b/sys/modules/ata/atapci/chipsets/atajmicron/Makefile
index 94b61780258d7..2f74305cdf126 100644
--- a/sys/modules/ata/atapci/chipsets/atajmicron/Makefile
+++ b/sys/modules/ata/atapci/chipsets/atajmicron/Makefile
@@ -4,7 +4,6 @@
 
 KMOD=	atajmicron
 SRCS=	ata-jmicron.c
-SRCS+=  opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h
+SRCS+=	ata_if.h bus_if.h device_if.h pci_if.h
 
 .include <bsd.kmod.mk>
-
diff --git a/sys/modules/ata/atapci/chipsets/atamarvell/Makefile b/sys/modules/ata/atapci/chipsets/atamarvell/Makefile
index c8283130a1023..6d644493886d7 100644
--- a/sys/modules/ata/atapci/chipsets/atamarvell/Makefile
+++ b/sys/modules/ata/atapci/chipsets/atamarvell/Makefile
@@ -4,7 +4,6 @@
 
 KMOD=	atamarvell
 SRCS=	ata-marvell.c
-SRCS+=  opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h
+SRCS+=	ata_if.h bus_if.h device_if.h pci_if.h
 
 .include <bsd.kmod.mk>
-
diff --git a/sys/modules/ata/atapci/chipsets/atamicron/Makefile b/sys/modules/ata/atapci/chipsets/atamicron/Makefile
index b002a0b94b914..820cf912c63d0 100644
--- a/sys/modules/ata/atapci/chipsets/atamicron/Makefile
+++ b/sys/modules/ata/atapci/chipsets/atamicron/Makefile
@@ -4,7 +4,6 @@
 
 KMOD=	atamicron
 SRCS=	ata-micron.c
-SRCS+=  opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h
+SRCS+=	ata_if.h bus_if.h device_if.h pci_if.h
 
 .include <bsd.kmod.mk>
-
diff --git a/sys/modules/ata/atapci/chipsets/atanational/Makefile b/sys/modules/ata/atapci/chipsets/atanational/Makefile
index 52cae4cebda8c..62a2dd61613b8 100644
--- a/sys/modules/ata/atapci/chipsets/atanational/Makefile
+++ b/sys/modules/ata/atapci/chipsets/atanational/Makefile
@@ -4,7 +4,6 @@
 
 KMOD=	atanational
 SRCS=	ata-national.c
-SRCS+=  opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h
+SRCS+=	ata_if.h bus_if.h device_if.h pci_if.h
 
 .include <bsd.kmod.mk>
-
diff --git a/sys/modules/ata/atapci/chipsets/atanetcell/Makefile b/sys/modules/ata/atapci/chipsets/atanetcell/Makefile
index dae87a0be475f..357e4d52671b2 100644
--- a/sys/modules/ata/atapci/chipsets/atanetcell/Makefile
+++ b/sys/modules/ata/atapci/chipsets/atanetcell/Makefile
@@ -4,7 +4,6 @@
 
 KMOD=	atanetcell
 SRCS=	ata-netcell.c
-SRCS+=  opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h
+SRCS+=	ata_if.h bus_if.h device_if.h pci_if.h
 
 .include <bsd.kmod.mk>
-
diff --git a/sys/modules/ata/atapci/chipsets/atanvidia/Makefile b/sys/modules/ata/atapci/chipsets/atanvidia/Makefile
index 452bf22d03d7f..f4b7b6f6cb3b1 100644
--- a/sys/modules/ata/atapci/chipsets/atanvidia/Makefile
+++ b/sys/modules/ata/atapci/chipsets/atanvidia/Makefile
@@ -4,7 +4,6 @@
 
 KMOD=	atanvidia
 SRCS=	ata-nvidia.c
-SRCS+=  opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h
+SRCS+=	ata_if.h bus_if.h device_if.h pci_if.h
 
 .include <bsd.kmod.mk>
-
diff --git a/sys/modules/ata/atapci/chipsets/atapromise/Makefile b/sys/modules/ata/atapci/chipsets/atapromise/Makefile
index 70d46e1315fba..d232725580c3a 100644
--- a/sys/modules/ata/atapci/chipsets/atapromise/Makefile
+++ b/sys/modules/ata/atapci/chipsets/atapromise/Makefile
@@ -4,7 +4,6 @@
 
 KMOD=	atapromise
 SRCS=	ata-promise.c
-SRCS+=  opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h
+SRCS+=	ata_if.h bus_if.h device_if.h pci_if.h
 
 .include <bsd.kmod.mk>
-
diff --git a/sys/modules/ata/atapci/chipsets/ataserverworks/Makefile b/sys/modules/ata/atapci/chipsets/ataserverworks/Makefile
index 2b789a5988d63..19d7557a865bc 100644
--- a/sys/modules/ata/atapci/chipsets/ataserverworks/Makefile
+++ b/sys/modules/ata/atapci/chipsets/ataserverworks/Makefile
@@ -4,7 +4,6 @@
 
 KMOD=	ataserverworks
 SRCS=	ata-serverworks.c
-SRCS+=  opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h
+SRCS+=	ata_if.h bus_if.h device_if.h pci_if.h
 
 .include <bsd.kmod.mk>
-
diff --git a/sys/modules/ata/atapci/chipsets/atasiliconimage/Makefile b/sys/modules/ata/atapci/chipsets/atasiliconimage/Makefile
index ea7aca32c9c2a..04c44cf12fcc4 100644
--- a/sys/modules/ata/atapci/chipsets/atasiliconimage/Makefile
+++ b/sys/modules/ata/atapci/chipsets/atasiliconimage/Makefile
@@ -4,7 +4,6 @@
 
 KMOD=	atasiliconimage
 SRCS=	ata-siliconimage.c
-SRCS+=  opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h
+SRCS+=	ata_if.h bus_if.h device_if.h pci_if.h
 
 .include <bsd.kmod.mk>
-
diff --git a/sys/modules/ata/atapci/chipsets/atasis/Makefile b/sys/modules/ata/atapci/chipsets/atasis/Makefile
index b6014525d5cd3..65d7fa44ce105 100644
--- a/sys/modules/ata/atapci/chipsets/atasis/Makefile
+++ b/sys/modules/ata/atapci/chipsets/atasis/Makefile
@@ -4,7 +4,6 @@
 
 KMOD=	atasis
 SRCS=	ata-sis.c
-SRCS+=  opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h
+SRCS+=	ata_if.h bus_if.h device_if.h pci_if.h
 
 .include <bsd.kmod.mk>
-
diff --git a/sys/modules/ata/atapci/chipsets/atavia/Makefile b/sys/modules/ata/atapci/chipsets/atavia/Makefile
index 75e66b0e1b734..271f2fb65722b 100644
--- a/sys/modules/ata/atapci/chipsets/atavia/Makefile
+++ b/sys/modules/ata/atapci/chipsets/atavia/Makefile
@@ -4,7 +4,6 @@
 
 KMOD=	atavia
 SRCS=	ata-via.c
-SRCS+=  opt_ata.h ata_if.h device_if.h bus_if.h pci_if.h
+SRCS+=	ata_if.h bus_if.h device_if.h pci_if.h
 
 .include <bsd.kmod.mk>
-