Index: ata-all.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/ata/ata-all.c,v
retrieving revision 1.195
diff -u -r1.195 ata-all.c
--- ata-all.c	12 Oct 2003 12:37:11 -0000	1.195
+++ ata-all.c	3 Nov 2003 09:01:30 -0000
@@ -76,8 +76,14 @@
 /* sysctl vars */
 SYSCTL_NODE(_hw, OID_AUTO, ata, CTLFLAG_RD, 0, "ATA driver parameters");
 TUNABLE_INT("hw.ata.ata_dma", &ata_dma);
+SYSCTL_INT(_hw_ata, OID_AUTO, ata_dma, CTLFLAG_RDTUN, &ata_dma, 0,
+	   "ATA disk DMA mode control");
 TUNABLE_INT("hw.ata.wc", &ata_wc);
+SYSCTL_INT(_hw_ata, OID_AUTO, wc, CTLFLAG_RDTUN, &ata_wc, 0,
+	   "ATA disk write caching");
 TUNABLE_INT("hw.ata.atapi_dma", &atapi_dma);
+SYSCTL_INT(_hw_ata, OID_AUTO, atapi_dma, CTLFLAG_RDTUN, &atapi_dma, 0,
+	   "ATAPI device DMA mode control");
 int ata_dma = 1;
 int ata_wc = 1;	 
 int atapi_dma = 0;
Index: ata-disk.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/ata/ata-disk.c,v
retrieving revision 1.161
diff -u -r1.161 ata-disk.c
--- ata-disk.c	21 Oct 2003 18:28:34 -0000	1.161
+++ ata-disk.c	3 Nov 2003 09:01:09 -0000
@@ -67,13 +67,6 @@
 static MALLOC_DEFINE(M_AD, "AD driver", "ATA disk driver");
 static u_int32_t adp_lun_map = 0;
 
-/* sysctl vars */
-SYSCTL_DECL(_hw_ata);
-SYSCTL_INT(_hw_ata, OID_AUTO, ata_dma, CTLFLAG_RDTUN, &ata_dma, 0,
-	   "ATA disk DMA mode control");
-SYSCTL_INT(_hw_ata, OID_AUTO, wc, CTLFLAG_RDTUN, &ata_wc, 0,
-	   "ATA disk write caching");
-
 void
 ad_attach(struct ata_device *atadev)
 {