diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-08-31 11:47:02 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-08-31 11:47:02 +1000 |
| commit | 8f162482fdcbfca3ec0df6b6f5281cc1430e2dbd (patch) | |
| tree | 3291a86e859f69e7a588b2d4fedc5543d75e37ca /sound/soc/omap/omap-pcm.h | |
| parent | bca64da46b12f7e8b0b67561e4f101742264a507 (diff) | |
| parent | 0bb5f267af41c39af895faee3abe2d9ab8c562e0 (diff) | |
Merge remote branch 'sound-asoc/for-next'
Conflicts:
arch/arm/mach-s3c64xx/mach-smdk6410.c
Diffstat (limited to 'sound/soc/omap/omap-pcm.h')
| -rw-r--r-- | sound/soc/omap/omap-pcm.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/soc/omap/omap-pcm.h b/sound/soc/omap/omap-pcm.h index b19975d26907..fea0515331fb 100644 --- a/sound/soc/omap/omap-pcm.h +++ b/sound/soc/omap/omap-pcm.h @@ -35,6 +35,4 @@ struct omap_pcm_dma_data { int packet_size; /* packet size only in PACKET mode */ }; -extern struct snd_soc_platform omap_soc_platform; - #endif |