diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-06-18 06:36:00 (GMT) |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-06-18 06:36:00 (GMT) |
| commit | ef890ae9b34cd99411bc72829944c74d2223ef70 (patch) | |
| tree | 414850284836df5a7180b43618df279653f9c294 /include/linux/pxa2xx_ssp.h | |
| parent | 2e8b2b29d1f904353c3e54b342ccb8c66390dab8 (diff) | |
| parent | 3419ae781f1592b3d367107db6500090495490cd (diff) | |
| download | linux-fsl-qoriq-ef890ae9b34cd99411bc72829944c74d2223ef70.tar.xz | |
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/linux/pxa2xx_ssp.h')
| -rw-r--r-- | include/linux/pxa2xx_ssp.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/pxa2xx_ssp.h b/include/linux/pxa2xx_ssp.h index 44835fb..f366320 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, }; |