diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-08-13 23:23:13 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-08-13 23:23:13 +0200 |
| commit | 2fd0aad443c966ce62008225e57b18e2dcf4e330 (patch) | |
| tree | a9166e535df4d867ce73eca3fd97ebc500ecf771 /include/nand.h | |
| parent | 5a7ddf4e1fb9347f783eb1473c30187d7a22bd81 (diff) | |
| parent | 9483df6408c25f16060432de3868901e352e23bc (diff) | |
| download | u-boot-imx-2fd0aad443c966ce62008225e57b18e2dcf4e330.zip u-boot-imx-2fd0aad443c966ce62008225e57b18e2dcf4e330.tar.gz u-boot-imx-2fd0aad443c966ce62008225e57b18e2dcf4e330.tar.bz2 | |
Merge branch 'Makefile' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'include/nand.h')
| -rw-r--r-- | include/nand.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/nand.h b/include/nand.h index 764e9f9..4c2b76d 100644 --- a/include/nand.h +++ b/include/nand.h @@ -26,7 +26,7 @@ extern void nand_init(void); -#ifndef CFG_NAND_LEGACY +#ifndef CONFIG_NAND_LEGACY #include <linux/mtd/compat.h> #include <linux/mtd/mtd.h> #include <linux/mtd/nand.h> @@ -128,5 +128,5 @@ void board_nand_select_device(struct nand_chip *nand, int chip); __attribute__((noreturn)) void nand_boot(void); -#endif /* !CFG_NAND_LEGACY */ +#endif /* !CONFIG_NAND_LEGACY */ #endif |