diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-07-19 00:38:23 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-07-19 00:38:23 +0200 |
| commit | a694610d3361465d4c8d27dde72ab8b63d31115e (patch) | |
| tree | 063d03bcf75538fe45f940eda5b1e6f1859a96fb /include/nand.h | |
| parent | 5669ed4557edf2714203aa8625c9fcd5a753b338 (diff) | |
| parent | 2419169f5749d7af501b3b77a5336d1d535320de (diff) | |
| download | blackbird-obmc-uboot-a694610d3361465d4c8d27dde72ab8b63d31115e.tar.gz blackbird-obmc-uboot-a694610d3361465d4c8d27dde72ab8b63d31115e.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
Diffstat (limited to 'include/nand.h')
| -rw-r--r-- | include/nand.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/nand.h b/include/nand.h index 23f3ca1db8..2a81597a65 100644 --- a/include/nand.h +++ b/include/nand.h @@ -26,7 +26,6 @@ extern void nand_init(void); -#ifndef CONFIG_NAND_LEGACY #include <linux/mtd/compat.h> #include <linux/mtd/mtd.h> #include <linux/mtd/nand.h> @@ -130,5 +129,4 @@ void board_nand_select_device(struct nand_chip *nand, int chip); __attribute__((noreturn)) void nand_boot(void); -#endif /* !CONFIG_NAND_LEGACY */ #endif |
