merge by hand (fix up qla_os.c merge error)

[linux-beck.git] / drivers / scsi / aic7xxx / aic79xx_osm.c

diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c
index 53b7b2c15f86b344456132b3e2c64a0705bc3ade..c4eaaad2c69bedd3f67004aae7960802709739f6 100644 (file)
--- a/drivers/scsi/aic7xxx/aic79xx_osm.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.c
@@ -2488,7 +2488,7 @@ ahd_linux_dv_thread(void *data)
        sprintf(current->comm, "ahd_dv_%d", ahd->unit);
 #else
        daemonize("ahd_dv_%d", ahd->unit);
-       current->flags |= PF_FREEZE;
+       current->flags |= PF_NOFREEZE;
 #endif
        unlock_kernel();