From: Johnathan Corgan <jcorgan@corganenterprises.com>
Date: Fri, 14 May 2010 17:31:19 +0000 (-0700)
Subject: Merge remote branch 'bitshark/burx_support' into wip/burx_support
X-Git-Url: https://git.gag.com/?p=debian%2Fgnuradio;a=commitdiff_plain;h=7dba4b4a3cf9b2f0fab397494d84c948a3bf85d1

Merge remote branch 'bitshark/burx_support' into wip/burx_support

* bitshark/burx_support:
  Once and for all, here is the properly updated Makefile.am for the apps
  Updated db_bitshark_rx.c to the proper version that includes the

Conflicts:
	usrp2/firmware/lib/db_bitshark_rx.c
---

7dba4b4a3cf9b2f0fab397494d84c948a3bf85d1
diff --cc usrp2/firmware/lib/db_bitshark_rx.c
index 30d457f0,669bb7c4..72cafa2e
--- a/usrp2/firmware/lib/db_bitshark_rx.c
+++ b/usrp2/firmware/lib/db_bitshark_rx.c
@@@ -171,7 -185,7 +185,8 @@@ bitshark_rx_init(struct db_base *dbb
         for now, simply set the bandwidth once for the intended
         application. */
      db->extra.set_bw(dbb, 25000);  /* 25 MHz channel bw */
-     
+     mdelay(5);
++
      return true;
  }