diff options
| author | Stefan Roese <sr@denx.de> | 2007-01-30 12:46:55 +0100 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-01-30 12:46:55 +0100 |
| commit | 73e815b7fc11478aee180909e990009ebdb26725 (patch) | |
| tree | 0b50c86350509dc5be1d7cfef108d97eb3dc69fe /board/prodrive/pdnb3 | |
| parent | aa962c15bfc5dc4b8875abed818a43989f063641 (diff) | |
| parent | b78bb469f536b357ee21c54f40201dbe4b201ac3 (diff) | |
| download | u-boot-imx-73e815b7fc11478aee180909e990009ebdb26725.zip u-boot-imx-73e815b7fc11478aee180909e990009ebdb26725.tar.gz u-boot-imx-73e815b7fc11478aee180909e990009ebdb26725.tar.bz2 | |
Merge with git+ssh://sr@pollux.denx.org/home/sr/git/u-boot/denx/.git
Diffstat (limited to 'board/prodrive/pdnb3')
| -rw-r--r-- | board/prodrive/pdnb3/flash.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/board/prodrive/pdnb3/flash.c b/board/prodrive/pdnb3/flash.c index d0e5fe7..518ea9c 100644 --- 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(CFG_FLASH_CFI_DRIVER) + /* * include common flash code (for esd boards) */ @@ -83,3 +85,5 @@ unsigned long flash_init(void) return size; } + +#endif /* CFG_FLASH_CFI_DRIVER */ |