projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next' of git://git.denx.de/u-boot-avr32
[platform/kernel/u-boot.git]
/
board
/
icecube
/
flash.c
diff --git
a/board/icecube/flash.c
b/board/icecube/flash.c
index
713011c
..
2d4026a
100644
(file)
--- a/
board/icecube/flash.c
+++ b/
board/icecube/flash.c
@@
-23,6
+23,7
@@
#include <common.h>
+#ifndef CONFIG_FLASH_CFI_DRIVER
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
/* NOTE - CONFIG_FLASH_16BIT means the CPU interface is 16-bit, it
@@
-489,3
+490,4
@@
static int write_word_amd (flash_info_t *info, FPWV *dest, FPW data)
return (res);
}
+#endif /*CONFIG_FLASH_CFI_DRIVER*/