Semi-Merge commit 'f4a9a8e' into cg_merges_20130606a

Conflicts:
	miner.c

miner.c

@@ -8705,11 +8705,6 @@ int main(int argc, char *argv[])
 	}
 #endif
 
-#ifdef USE_AVALON
-	if (!opt_scrypt)
-		avalon_drv.drv_detect();
-#endif
-
 #ifdef USE_BITFORCE
 	if (!opt_scrypt)
 		bitforce_drv.drv_detect();
@@ -8730,6 +8725,13 @@ int main(int argc, char *argv[])
 		ztex_drv.drv_detect();
 #endif
 
+	/* Detect avalon last since it will try to claim the device regardless
+	 * as detection is unreliable. */
+#ifdef USE_AVALON
+	if (!opt_scrypt)
+		avalon_drv.drv_detect();
+#endif
+
 #ifdef WANT_CPUMINE
 	cpu_drv.drv_detect();
 #endif