Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / sdram-qimonda-hyb18m512160af-6.h

diff --git a/arch/arm/mach-omap2/sdram-qimonda-hyb18m512160af-6.h b/arch/arm/mach-omap2/sdram-qimonda-hyb18m512160af-6.h
index c932a6d2eb9def16a655a1d52d96cb6115608b78..74a92c862e63f35148d4e8a5e0494b32fb242565 100644 (file)
--- a/arch/arm/mach-omap2/sdram-qimonda-hyb18m512160af-6.h
+++ b/arch/arm/mach-omap2/sdram-qimonda-hyb18m512160af-6.h
@@ -14,7 +14,7 @@
 #ifndef ARCH_ARM_MACH_OMAP2_SDRAM_QIMONDA_HYB18M512160AF6
 #define ARCH_ARM_MACH_OMAP2_SDRAM_QIMONDA_HYB18M512160AF6
 
-#include <asm/arch/sdrc.h>
+#include <mach/sdrc.h>
 
 /* Qimonda HYB18M512160AF-6 */
 /* XXX Using ARE = 0x1 (no autorefresh burst) -- can this be changed? */