]> git.karo-electronics.de Git - mv-sheeva.git/blobdiff - arch/arm/mach-pxa/cm-x270.c
Merge branch 'master' into tk71
[mv-sheeva.git] / arch / arm / mach-pxa / cm-x270.c
index a9926bb75922318a9f193752637d6505bc9429a5..b88d601a80904baddb4c787dcee19194dab4bdf0 100644 (file)
 #include <video/mbxfb.h>
 
 #include <linux/spi/spi.h>
+#include <linux/spi/pxa2xx_spi.h>
 #include <linux/spi/libertas_spi.h>
 
 #include <mach/pxa27x.h>
 #include <mach/ohci.h>
 #include <mach/mmc.h>
-#include <mach/pxa2xx_spi.h>
 
 #include "generic.h"