Merge branch 'monarch' into bfgminer

configure.ac

@@ -403,7 +403,7 @@ AC_ARG_ENABLE([bitforce],
 	)
 if test "x$bitforce" = xyes; then
 	AC_DEFINE([USE_BITFORCE], [1], [Defined to 1 if BitForce support is wanted])
-	driverlist="$driverlist bitforce:uio/ac_cv_header_sys_mman_h"
+	driverlist="$driverlist bitforce:pci/need_lowl_pci"
 	if test "x$lowl_pci" = "xyes"; then
 		need_lowl_pci=yes
 	fi

driver-bitforce.c

@@ -428,9 +428,9 @@ bool bitforce_detect_oneof(const char * const devpath, struct bitforce_lowl_inte
 		.dev_repr = "BFL",
 		.proc_repr = "BFL",
 		.device_path = devpath,
-		.device_fd = -1,
 		.device_data = &dummy_bfdata,
 	};
+	dummy_cgpu.device_fd = -1;
 
 	applog(LOG_DEBUG, "BFL: Attempting to open %s", devpath);
 	bitforce_open(&dummy_cgpu);