at_wini: rename 'ata_instance' to 'instance'

diff --git a/drivers/at_wini/at_wini.c b/drivers/at_wini/at_wini.c
index c73183be75b227811dcbbfe5935e77109b9cd166..4cbd3f22b3ca530489bc78d4fb5333502f33c700 100644 (file)
--- 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 c4b37cf7112d1f8b115cc186f7f8d9f3f6cf95c9..294bdc3c262fcde89de9870ba324798af91cbd9b 100644 (file)
--- 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?'