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
/
prodrive
/
pdnb3
/
flash.c
diff --git
a/board/prodrive/pdnb3/flash.c
b/board/prodrive/pdnb3/flash.c
index
d0e5fe7
..
0786324
100644
(file)
--- a/
board/prodrive/pdnb3/flash.c
+++ b/
board/prodrive/pdnb3/flash.c
@@
-24,6
+24,8
@@
#include <common.h>
#include <asm/arch/ixp425.h>
+#if !defined(CONFIG_FLASH_CFI_DRIVER)
+
/*
* include common flash code (for esd boards)
*/
@@
-83,3
+85,5
@@
unsigned long flash_init(void)
return size;
}
+
+#endif /* CONFIG_FLASH_CFI_DRIVER */