Merge commit '3d835fc' into cg_merges_20130524b

Conflicts:
	Makefile.am
	configure.ac

Makefile.am

@@ -118,7 +118,7 @@ bfgminer_SOURCES += driver-cairnsmore.c
 endif
 
 if HAS_AVALON
-bfgminer_SOURCES += driver-avalon.c
+bfgminer_SOURCES += driver-avalon.c driver-avalon.h
 endif
 
 if HAS_MODMINER

miner.c

@@ -59,7 +59,10 @@
 #include "driver-opencl.h"
 #include "bench_block.h"
 #include "scrypt.h"
+
+#ifdef USE_AVALON
 #include "driver-avalon.h"
+#endif
 
 #ifdef USE_X6500
 #include "ft232r.h"