mirror of https://github.com/m-labs/artiq.git
firmware: fix merge screwup.
This commit is contained in:
parent
58a95c1f40
commit
74f46cb965
|
@ -1,5 +1,4 @@
|
|||
use std::result;
|
||||
use bsp::board::csr;
|
||||
use csr;
|
||||
use ad9154_reg::reg;
|
||||
|
||||
fn spi_setup() {
|
|
@ -1,5 +1,4 @@
|
|||
use std::result;
|
||||
use bsp::board::csr;
|
||||
use csr;
|
||||
use ad9516_reg::reg;
|
||||
|
||||
fn spi_setup() {
|
Loading…
Reference in New Issue