Merge branch 'master' of git://git.denx.de/u-boot-x86

[u-boot] / arch / x86 / include / asm / cache.h

diff --git a/arch/x86/include/asm/cache.h b/arch/x86/include/asm/cache.h
index 508b63f5ab3894956c97723a5872054ae99cc417..4ff63c33317f8bfbd75a8d3729ddb9ef7158c434 100644 (file)
--- a/arch/x86/include/asm/cache.h
+++ b/arch/x86/include/asm/cache.h
@@ -11,12 +11,12 @@
  * If CONFIG_SYS_CACHELINE_SIZE is defined use it for DMA alignment.  Otherwise
  * use 64-bytes, a safe default for x86.
  */
-#ifdef CONFIG_SYS_CACHELINE_SIZE
-#define ARCH_DMA_MINALIGN      CONFIG_SYS_CACHELINE_SIZE
-#else
-#define ARCH_DMA_MINALIGN      64
+#ifndef CONFIG_SYS_CACHELINE_SIZE
+#define CONFIG_SYS_CACHELINE_SIZE      64
 #endif
 
+#define ARCH_DMA_MINALIGN              CONFIG_SYS_CACHELINE_SIZE
+
 static inline void wbinvd(void)
 {
        asm volatile ("wbinvd" : : : "memory");