Merge with /home/shaggy/git/linus-clean/

Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>

1 files changed, 1 insertions, 8 deletions

diff --git a/drivers/scsi/aic7xxx/aic7770.c b/drivers/scsi/aic7xxx/aic7770.c
index 92703bb35982..00f3bd1e181e 100644
--- a/drivers/scsi/aic7xxx/aic7770.c
+++ b/drivers/scsi/aic7xxx/aic7770.c
@@ -254,19 +254,12 @@ aic7770_config(struct ahc_softc *ahc, struct aic7770_identity *entry, u_int io)
         if (error != 0)
                 return (error);
 
-        ahc_list_lock(&l);
-        /*
-         * Link this softc in with all other ahc instances.
-         */
-        ahc_softc_insert(ahc);
+        ahc->init_level++;
 
         /*
          * Enable the board's BUS drivers
          */
         ahc_outb(ahc, BCTL, ENABLE);
-
-        ahc_list_unlock(&l);
-
         return (0);
 }