From: David van Moolenbroek <david@minix3.org>
Date: Sat, 3 Jul 2010 17:51:12 +0000 (+0000)
Subject: at_wini: rename 'ata_instance' to 'instance'
X-Git-Tag: v3.1.8~291
X-Git-Url: http://zhaoyanbai.com/repos/dnssec-signzone.html?a=commitdiff_plain;h=4d3c887d6b153d53c016dba044c759926eb4a5bb;p=minix.git

at_wini: rename 'ata_instance' to 'instance'
---

diff --git a/drivers/at_wini/at_wini.c b/drivers/at_wini/at_wini.c
index c73183be7..4cbd3f22b 100644
--- a/drivers/at_wini/at_wini.c
+++ b/drivers/at_wini/at_wini.c
@@ -291,9 +291,9 @@ PRIVATE void init_params()
   long wakeup_secs = WAKEUP_SECS;
 
   /* Boot variables. */
+  env_parse("instance", "d", 0, &w_instance, 0, 8);
   env_parse("ata_std_timeout", "d", 0, &w_standard_timeouts, 0, 1);
   env_parse("ata_pci_debug", "d", 0, &w_pci_debug, 0, 1);
-  env_parse("ata_instance", "d", 0, &w_instance, 0, 8);
   env_parse(NO_DMA_VAR, "d", 0, &disable_dma, 0, 1);
   env_parse("ata_id_timeout", "d", 0, &wakeup_secs, 1, 60);
   env_parse("atapi_debug", "d", 0, &atapi_debug, 0, 1);
diff --git a/drivers/ramdisk/rc b/drivers/ramdisk/rc
index c4b37cf71..294bdc3c2 100644
--- a/drivers/ramdisk/rc
+++ b/drivers/ramdisk/rc
@@ -13,7 +13,7 @@ then
 	/bin/service -c up /bin/bios_wini -dev /dev/c0d0
 else
 	/bin/service -c up /bin/at_wini -dev /dev/c0d0 -config /etc/system.conf -label at_wini_0
-	/bin/service -cr up /bin/at_wini -dev /dev/c1d0 -config /etc/system.conf -label at_wini_1 -args ata_instance=1
+	/bin/service -cr up /bin/at_wini -dev /dev/c1d0 -config /etc/system.conf -label at_wini_1 -args instance=1
 fi
 
 rootdev=`sysenv rootdev` || echo 'No rootdev?'