diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-06-18 08:36:00 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-06-18 08:36:00 +0200 |
| commit | ef890ae9b34cd99411bc72829944c74d2223ef70 (patch) | |
| tree | 414850284836df5a7180b43618df279653f9c294 /include | |
| parent | 2e8b2b29d1f904353c3e54b342ccb8c66390dab8 (diff) | |
| parent | 3419ae781f1592b3d367107db6500090495490cd (diff) | |
Merge tag 'asoc-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for 3.5
All driver specific and fairly small. The pxa-ssp changes are larger
than I'd like but they're build failures and are pretty clear to
inspection.
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/pxa2xx_ssp.h | 2 | ||||
| -rw-r--r-- | include/linux/spi/pxa2xx_spi.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/pxa2xx_ssp.h b/include/linux/pxa2xx_ssp.h index 44835fb39793..f36632061c66 100644 --- a/include/linux/pxa2xx_ssp.h +++ b/include/linux/pxa2xx_ssp.h @@ -160,7 +160,9 @@ enum pxa_ssp_type { PXA25x_SSP, /* pxa 210, 250, 255, 26x */ PXA25x_NSSP, /* pxa 255, 26x (including ASSP) */ PXA27x_SSP, + PXA3xx_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> |