Merge branch 'monarch' into bfgminer

Conflicts:
	miner.c

lowl-pci.c

@@ -490,4 +490,5 @@ void lowl_pci_close(struct lowl_pci_handle * const lph)
 struct lowlevel_driver lowl_pci = {
 	.dname = "pci",
 	.devinfo_scan = pci_devinfo_scan,
+	.exclude_from_all = true,
 };

lowlevel.h

@@ -15,6 +15,8 @@ typedef bool (*lowl_found_devinfo_func_t)(struct lowlevel_device_info *, void *)
 
 struct lowlevel_driver {
 	const char *dname;
+	bool exclude_from_all;
+	
 	struct lowlevel_device_info *(*devinfo_scan)();
 	void (*devinfo_free)(struct lowlevel_device_info *);
 };

miner.c

@@ -11432,6 +11432,8 @@ void *probe_device_thread(void *p)
 			const struct device_drv * const drv = _probe_device_find_drv(dname, dnamelen);
 			if (!(drv && drv->lowl_probe && drv_algo_check(drv)))
 				continue;
+			if (info->lowl->exclude_from_all)
+				continue;
 			if (_probe_device_do_probe(drv, info, NULL))
 				return NULL;
 		}