diff options
| author | eb <eb@221aa14e-8319-0410-a670-987f0aec2ac5> | 2007-03-07 01:43:43 +0000 |
|---|---|---|
| committer | eb <eb@221aa14e-8319-0410-a670-987f0aec2ac5> | 2007-03-07 01:43:43 +0000 |
| commit | 224434889bf564a4456011180c62a58e0ca55c8f (patch) | |
| tree | fbbbff591fa6a7a9987a6b0b4022ea5f88ab4a3b /gr-usrp/src/usrp.py | |
| parent | 511ddd6cbfd7788f8a2cb3634d898d7c5fdd29fb (diff) | |
Merged eb/usrp-install r4723:4727 into trunk.
This moves usrp related .py files from the top-level of site-packages
into site-packages/usrpm.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@4728 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gr-usrp/src/usrp.py')
| -rw-r--r-- | gr-usrp/src/usrp.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gr-usrp/src/usrp.py b/gr-usrp/src/usrp.py index 90fb9695dd..78e6c10182 100644 --- a/gr-usrp/src/usrp.py +++ b/gr-usrp/src/usrp.py @@ -21,11 +21,11 @@ -import usrp_prims -import usrp_dbid +from usrpm import usrp_prims +from usrpm import usrp_dbid from gnuradio import usrp1 # usrp Rev 1 and later from gnuradio import gru -from usrp_fpga_regs import * +from usrpm.usrp_fpga_regs import * FPGA_MODE_NORMAL = usrp1.FPGA_MODE_NORMAL FPGA_MODE_LOOPBACK = usrp1.FPGA_MODE_LOOPBACK |