diff options
author | Wolfgang Denk <wd@denx.de> | 2009-11-15 23:13:40 +0100 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2009-11-15 23:13:40 +0100 |
commit | 06f43286c6354aaab0103615e83893512f86eee7 (patch) | |
tree | c0c6bc4819fa381a9e1a2a051492eb4813bd410b /nand_spl/nand_boot_fsl_elbc.c | |
parent | c758e947aa7d39a2be607ecdedd818ad300807b2 (diff) | |
parent | 3c014f1586d5bfe30dca7549396915c83f31cd30 (diff) |
Merge branch 'master' into next
Diffstat (limited to 'nand_spl/nand_boot_fsl_elbc.c')
-rw-r--r-- | nand_spl/nand_boot_fsl_elbc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/nand_spl/nand_boot_fsl_elbc.c b/nand_spl/nand_boot_fsl_elbc.c index 7f14a6fe45..ff47d55311 100644 --- a/nand_spl/nand_boot_fsl_elbc.c +++ b/nand_spl/nand_boot_fsl_elbc.c @@ -25,7 +25,6 @@ #include <common.h> #include <asm/io.h> -#include <asm/immap_83xx.h> #include <asm/fsl_lbc.h> #include <linux/mtd/nand.h> |