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

[u-boot] / drivers / mtd / spi / atmel.c

diff --git a/drivers/mtd/spi/atmel.c b/drivers/mtd/spi/atmel.c
index 10fcf0cdde88d7d8b6d80c58d9bb0845258d1601..a5f51caf460b1a3cedf374307f56c7d741150921 100644 (file)
--- a/drivers/mtd/spi/atmel.c
+++ b/drivers/mtd/spi/atmel.c
@@ -39,9 +39,10 @@ struct atmel_spi_flash_params {
        const char      *name;
 };
 
+/* spi_flash needs to be first so upper layers can free() it */
 struct atmel_spi_flash {
-       const struct atmel_spi_flash_params *params;
        struct spi_flash flash;
+       const struct atmel_spi_flash_params *params;
 };
 
 static inline struct atmel_spi_flash *