diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-02-02 21:57:19 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-02-02 21:57:19 +0100 |
| commit | be9db564de898240034151c48cf9e0d03ece3f35 (patch) | |
| tree | f87b02a573c61fdab3f190de09e6b0c8061f446b /drivers/mtd/nand | |
| parent | 89ffa8dbb5bd0552f5f3399f4430a4c97f4d50d4 (diff) | |
| parent | 9e40808c3fe0237a8d49f10394d3a8e4e29540a6 (diff) | |
| download | u-boot-imx-be9db564de898240034151c48cf9e0d03ece3f35.zip u-boot-imx-be9db564de898240034151c48cf9e0d03ece3f35.tar.gz u-boot-imx-be9db564de898240034151c48cf9e0d03ece3f35.tar.bz2 | |
Merge branch 'master' of /home/wd/git/u-boot/custodians
Diffstat (limited to 'drivers/mtd/nand')
| -rw-r--r-- | drivers/mtd/nand/mxc_nand.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c index ec71cfc..2a8dd7e 100644 --- a/drivers/mtd/nand/mxc_nand.c +++ b/drivers/mtd/nand/mxc_nand.c @@ -22,7 +22,7 @@ #include <nand.h> #include <linux/err.h> #include <asm/io.h> -#if defined(CONFIG_MX25) || defined(CONFIG_MX27) +#if defined(CONFIG_MX25) || defined(CONFIG_MX27) || defined(CONFIG_MX35) #include <asm/arch/imx-regs.h> #endif @@ -50,7 +50,7 @@ */ #if defined(CONFIG_MX31) || defined(CONFIG_MX27) #define MXC_NFC_V1 -#elif defined(CONFIG_MX25) +#elif defined(CONFIG_MX25) || defined(CONFIG_MX35) #define MXC_NFC_V1_1 #else #warning "MXC NFC version not defined" @@ -265,7 +265,7 @@ static int is_16bit_nand(void) else return 0; } -#elif defined(CONFIG_MX25) +#elif defined(CONFIG_MX25) || defined(CONFIG_MX35) static int is_16bit_nand(void) { struct ccm_regs *ccm = |