Merge branch 'cgminer' into bfgminer

miner.c

@@ -1231,6 +1231,9 @@ static char *opt_verusage_and_exit(const char *extra)
 #endif
 #ifdef USE_ZTEX
 		"ztex "
+#endif
+#ifdef USE_SCRYPT
+		"scrypt "
 #endif
 		"mining support.\n"
 		, packagename);
@@ -3171,11 +3174,9 @@ void write_config(FILE *fcfg)
 				case KL_DIABLO:
 					fprintf(fcfg, "diablo");
 					break;
-#ifdef USE_SCRYPT
 				case KL_SCRYPT:
 					fprintf(fcfg, "scrypt");
 					break;
-#endif
 			}
 		}
 #ifdef HAVE_ADL