Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

[oweals/u-boot.git] / test / dm / sf.c

diff --git a/test/dm/sf.c b/test/dm/sf.c
index 57dd1345c437b96bd4f9e469f8cd7f17c04638ff..b0844629f9ecd0cef0e0540ea4319bc91af75fba 100644 (file)
--- a/test/dm/sf.c
+++ b/test/dm/sf.c
@@ -10,12 +10,12 @@
 #include <spi.h>
 #include <spi_flash.h>
 #include <asm/state.h>
-#include <dm/ut.h>
 #include <dm/test.h>
 #include <dm/util.h>
+#include <test/ut.h>
 
 /* Test that sandbox SPI flash works correctly */
-static int dm_test_spi_flash(struct dm_test_state *dms)
+static int dm_test_spi_flash(struct unit_test_state *uts)
 {
        /*
         * Create an empty test file and run the SPI flash tests. This is a
@@ -29,7 +29,7 @@ static int dm_test_spi_flash(struct dm_test_state *dms)
         * benefit is worth the extra complexity.
         */
        ut_asserteq(0, run_command_list(
-               "sb save hostfs - spi.bin 0 200000;"
+               "sb save hostfs - 0 spi.bin 200000;"
                "sf probe;"
                "sf test 0 10000", -1,  0));
        /*