diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-08-13 21:23:13 (GMT) |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-08-13 21:23:13 (GMT) |
| commit | 2fd0aad443c966ce62008225e57b18e2dcf4e330 (patch) | |
| tree | a9166e535df4d867ce73eca3fd97ebc500ecf771 /include/linux/mtd | |
| parent | 5a7ddf4e1fb9347f783eb1473c30187d7a22bd81 (diff) | |
| parent | 9483df6408c25f16060432de3868901e352e23bc (diff) | |
| download | u-boot-2fd0aad443c966ce62008225e57b18e2dcf4e330.tar.xz | |
Merge branch 'Makefile' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'include/linux/mtd')
| -rw-r--r-- | include/linux/mtd/nand_ids.h | 2 | ||||
| -rw-r--r-- | include/linux/mtd/nand_legacy.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/mtd/nand_ids.h b/include/linux/mtd/nand_ids.h index d9eb911..e7aa26d 100644 --- a/include/linux/mtd/nand_ids.h +++ b/include/linux/mtd/nand_ids.h @@ -28,7 +28,7 @@ #ifndef __LINUX_MTD_NAND_IDS_H #define __LINUX_MTD_NAND_IDS_H -#ifndef CFG_NAND_LEGACY +#ifndef CONFIG_NAND_LEGACY #error This module is for the legacy NAND support #endif diff --git a/include/linux/mtd/nand_legacy.h b/include/linux/mtd/nand_legacy.h index b05e726..4494bc5 100644 --- a/include/linux/mtd/nand_legacy.h +++ b/include/linux/mtd/nand_legacy.h @@ -36,7 +36,7 @@ #ifndef __LINUX_MTD_NAND_LEGACY_H #define __LINUX_MTD_NAND_LEGACY_H -#ifndef CFG_NAND_LEGACY +#ifndef CONFIG_NAND_LEGACY #error This module is for the legacy NAND support #endif |