summaryrefslogtreecommitdiffstats
path: root/include/linux/spi/pxa2xx_spi.h
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2012-07-11 16:08:35 +0100
committerGrant Likely <grant.likely@secretlab.ca>2012-07-11 16:08:35 +0100
commit80c1834fc86c2bbacb54a8fc3c04a8b0066b0996 (patch)
tree8200248706960af8b779e9144f5b51c670602228 /include/linux/spi/pxa2xx_spi.h
parent22076c7712be29a602de45b1c573f31adbd428a9 (diff)
parentbd0a521e88aa7a06ae7aabaed7ae196ed4ad867a (diff)
downloadlinux-80c1834fc86c2bbacb54a8fc3c04a8b0066b0996.tar.gz
linux-80c1834fc86c2bbacb54a8fc3c04a8b0066b0996.tar.bz2
linux-80c1834fc86c2bbacb54a8fc3c04a8b0066b0996.zip
Merge tag 'v3.5-rc6' into irqdomain/next
Linux 3.5-rc6
Diffstat (limited to 'include/linux/spi/pxa2xx_spi.h')
-rw-r--r--include/linux/spi/pxa2xx_spi.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/spi/pxa2xx_spi.h b/include/linux/spi/pxa2xx_spi.h
index d3e1075f7b60..c73d1445c77e 100644
--- a/include/linux/spi/pxa2xx_spi.h
+++ b/include/linux/spi/pxa2xx_spi.h
@@ -43,7 +43,7 @@ struct pxa2xx_spi_chip {
void (*cs_control)(u32 command);
};
-#ifdef CONFIG_ARCH_PXA
+#if defined(CONFIG_ARCH_PXA) || defined(CONFIG_ARCH_MMP)
#include <linux/clk.h>
#include <mach/dma.h>