Patchwork [U-Boot] ATMEL spi_dataflash driver - fix to build again

login
register
mail settings
Submitter Reinhard Meyer
Date June 6, 2011, 10:05 a.m.
Message ID <1307354756-14107-1-git-send-email-u-boot@emk-elektronik.de>
Download mbox | patch
Permalink /patch/98860/
State Accepted
Commit 576e7a10c4efce5f0167626ea427609994c74fdc
Delegated to: Reinhard Meyer
Headers show

Comments

Reinhard Meyer - June 6, 2011, 10:05 a.m.
The rework effort for ATMEL (AT91/AVR32) accidentially broke build of
this driver. Fix this to make it build again. However this driver should
be reworked as soon as possible!

Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
---
 drivers/spi/atmel_dataflash_spi.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 drivers/spi/atmel_dataflash_spi.c
Reinhard Meyer - June 7, 2011, 10:54 a.m.
Dear Reinhard Meyer,
> The rework effort for ATMEL (AT91/AVR32) accidentially broke build of
> this driver. Fix this to make it build again. However this driver should
> be reworked as soon as possible!
> 
> Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
> ---
>  drivers/spi/atmel_dataflash_spi.c |    3 +--
>  1 files changed, 1 insertions(+), 2 deletions(-)
Applied to u-boot-atmel/master, thanks.

Patch

diff --git a/drivers/spi/atmel_dataflash_spi.c b/drivers/spi/atmel_dataflash_spi.c
index 9c991e8..e7d3ff0
--- a/drivers/spi/atmel_dataflash_spi.c
+++ b/drivers/spi/atmel_dataflash_spi.c
@@ -21,10 +21,9 @@ 
 
 #include <common.h>
 #ifndef CONFIG_AT91_LEGACY
-# define CONFIG_ATMEL_LEGACY
+# define CONFIG_AT91_LEGACY
 # warning Please update to use C structure SoC access !
 #endif
-#include <common.h>
 #include <spi.h>
 #include <malloc.h>