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

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

diff --git a/test/dm/sf.c b/test/dm/sf.c
index 08098a18b80980cd6e844c79e1320dddaa8bb8ce..35241b9f57443bac66fecd0c6417198123310d0e 100644 (file)
--- a/test/dm/sf.c
+++ b/test/dm/sf.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2013 Google, Inc
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -10,12 +9,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