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

[u-boot] / include / spi_flash.h

diff --git a/include/spi_flash.h b/include/spi_flash.h
index f3c4e834247a0de3e1ca791643f3e38a16b35d00..0ec98fb55df5b63300f5941ad831840400211a7c 100644 (file)
--- a/include/spi_flash.h
+++ b/include/spi_flash.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Common SPI flash Interface
  *
  * Copyright (C) 2008 Atmel Corporation
  * Copyright (C) 2013 Jagannadha Sutradharudu Teki, Xilinx Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0
  */
 
 #ifndef _SPI_FLASH_H_
@@ -186,7 +185,7 @@ static inline int spi_flash_erase(struct spi_flash *flash, u32 offset,
 struct sandbox_state;
 
 int sandbox_sf_bind_emul(struct sandbox_state *state, int busnum, int cs,
-                        struct udevice *bus, int of_offset, const char *spec);
+                        struct udevice *bus, ofnode node, const char *spec);
 
 void sandbox_sf_unbind_emul(struct sandbox_state *state, int busnum, int cs);