Merge remote-tracking branches 'spi/topic/orion', 'spi/topic/pxa2xx', 'spi/topic/qup', 'spi/topic/rockchip' and 'spi/topic/samsung' into spi-next

2015-02-08 11:16:55 +08:00
parent 8328509c4b 23244404e2 9064bf3c3c 0667dd5f6c 97cf56697a 75d30c51f8
commit 4f9f4548a5
10 changed files with 179 additions and 211 deletions
--- a/include/linux/spi/pxa2xx_spi.h
+++ b/include/linux/spi/pxa2xx_spi.h
@@ -53,7 +53,6 @@ struct pxa2xx_spi_chip {
 #if defined(CONFIG_ARCH_PXA) || defined(CONFIG_ARCH_MMP)

 #include <linux/clk.h>
-#include <mach/dma.h>

 extern void pxa2xx_set_spi_info(unsigned id, struct pxa2xx_spi_master *info);