summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorQiao Zhou <zhouqiao@marvell.com>2012-06-04 10:41:03 +0800
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-06-11 12:25:50 +0800
commit601722157b3f6be73623644eeae6f14940f0bd8f (patch)
treee927c9e5571795a8f99abf623c4c84805f39b892 /include/linux
parent69c5b7530651c8e375d2fbecd157a9a9a20c4cc9 (diff)
downloadlinux-stable-601722157b3f6be73623644eeae6f14940f0bd8f.tar.gz
linux-stable-601722157b3f6be73623644eeae6f14940f0bd8f.tar.bz2
linux-stable-601722157b3f6be73623644eeae6f14940f0bd8f.zip
ARM: MMP: add pxa910-ssp into ssp_id_table
add pxa910-ssp into ssp_id_table, and fix pxa-ssp compiling issue under mach-mmp architect. Signed-off-by: Qiao Zhou <zhouqiao@marvell.com> Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/pxa2xx_ssp.h1
-rw-r--r--include/linux/spi/pxa2xx_spi.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/pxa2xx_ssp.h b/include/linux/pxa2xx_ssp.h
index 44835fb39793..f9fe15ec2b51 100644
--- a/include/linux/pxa2xx_ssp.h
+++ b/include/linux/pxa2xx_ssp.h
@@ -161,6 +161,7 @@ enum pxa_ssp_type {
PXA25x_NSSP, /* pxa 255, 26x (including ASSP) */
PXA27x_SSP,
PXA168_SSP,
+ PXA910_SSP,
CE4100_SSP,
};
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>