Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'

[oweals/u-boot.git] / include / at45.h

diff --git a/include/at45.h b/include/at45.h
index 1f71a3b4e986f30ab006618b79128d758dfb2a07..df649ba971b3415842d116a2084bc13af2f21ecc 100644 (file)
--- a/include/at45.h
+++ b/include/at45.h
@@ -1,7 +1,6 @@
-
 #ifndef        _AT45_H_
 #define        _AT45_H_
-#ifdef DATAFLASH_MMC_SELECT
+#ifdef CONFIG_DATAFLASH_MMC_SELECT
 extern void AT91F_SelectMMC(void);
 extern void AT91F_SelectSPI(void);
 extern int AT91F_GetMuxStatus(void);
@@ -17,7 +16,7 @@ extern        AT91S_DataFlashStatus AT91F_DataFlashSendCommand(
 extern AT91S_DataFlashStatus AT91F_DataFlashGetStatus (
        AT91PS_DataflashDesc pDesc);
 extern AT91S_DataFlashStatus AT91F_DataFlashWaitReady (
-       AT91PS_DataflashDesc pDataFlashDesc, 
+       AT91PS_DataflashDesc pDataFlashDesc,
        unsigned int timeout);
 extern AT91S_DataFlashStatus AT91F_DataFlashContinuousRead (
        AT91PS_DataFlash pDataFlash,