Browse Source

Merge commit '431684e' into bfgminer

Luke Dashjr 12 years ago
parent
commit
4e8b729959
1 changed files with 0 additions and 5 deletions
  1. 0 5
      miner.c

+ 0 - 5
miner.c

@@ -88,7 +88,6 @@
 
 #if defined(USE_AVALON) || defined(USE_BITFORCE) || defined(USE_ICARUS) || defined(USE_MODMINER) || defined(USE_X6500) || defined(USE_ZTEX)
 #	define USE_FPGA
-#	define USE_FPGA_SERIAL
 #endif
 
 struct strategies strategies[] = {
@@ -691,7 +690,6 @@ char *set_request_diff(const char *arg, float *p)
 	return NULL;
 }
 
-#ifdef USE_FPGA_SERIAL
 #ifdef HAVE_LIBUDEV
 #include <libudev.h>
 #endif
@@ -807,7 +805,6 @@ static char *add_serial(const char *arg)
 	string_elist_add(arg, &scan_devices);
 	return NULL;
 }
-#endif
 
 bool get_intrange(const char *arg, int *val1, int *val2)
 {
@@ -1683,11 +1680,9 @@ static struct opt_table opt_config_table[] = {
 	OPT_WITHOUT_ARG("--round-robin",
 		     set_rr, &pool_strategy,
 		     "Change multipool strategy from failover to round robin on failure"),
-#ifdef USE_FPGA_SERIAL
 	OPT_WITH_ARG("--scan-serial|-S",
 		     add_serial, NULL, NULL,
 		     "Serial port to probe for mining devices"),
-#endif
 	OPT_WITH_ARG("--scan-time|-s",
 		     set_int_0_to_9999, opt_show_intval, &opt_scantime,
 		     "Upper bound on time spent scanning current work, in seconds"),