summaryrefslogtreecommitdiff
path: root/drivers/mtd/at45.c
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-08-13 23:23:13 +0200
committerWolfgang Denk <wd@denx.de>2008-08-13 23:23:13 +0200
commit2fd0aad443c966ce62008225e57b18e2dcf4e330 (patch)
treea9166e535df4d867ce73eca3fd97ebc500ecf771 /drivers/mtd/at45.c
parent5a7ddf4e1fb9347f783eb1473c30187d7a22bd81 (diff)
parent9483df6408c25f16060432de3868901e352e23bc (diff)
downloadu-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 'drivers/mtd/at45.c')
-rw-r--r--drivers/mtd/at45.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/mtd/at45.c b/drivers/mtd/at45.c
index a9d13ff..d1a60aa 100644
--- a/drivers/mtd/at45.c
+++ b/drivers/mtd/at45.c
@@ -20,8 +20,6 @@
#include <config.h>
#include <common.h>
-
-#ifdef CONFIG_HAS_DATAFLASH
#include <dataflash.h>
/*
@@ -559,4 +557,3 @@ int AT91F_DataflashProbe(int cs, AT91PS_DataflashDesc pDesc)
AT91F_DataFlashGetStatus(pDesc);
return ((pDesc->command[1] == 0xFF) ? 0 : pDesc->command[1] & 0x3C);
}
-#endif