diff --git a/[refs] b/[refs] index 266ffa643b20..82fcd2cad658 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 204e418bd2826423f7bacc6d4e15af8b0649e149 +refs/heads/master: 354a21423d09c2a6afe0fcea9dbbda9cdada6e45 diff --git a/trunk/include/sound/soc.h b/trunk/include/sound/soc.h index 8391b0ec217e..f75d1ccc5c58 100644 --- a/trunk/include/sound/soc.h +++ b/trunk/include/sound/soc.h @@ -317,6 +317,7 @@ int snd_soc_platform_read(struct snd_soc_platform *platform, unsigned int reg); int snd_soc_platform_write(struct snd_soc_platform *platform, unsigned int reg, unsigned int val); +int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num); /* Utility functions to get clock rates from various things */ int snd_soc_calc_frame_size(int sample_size, int channels, int tdm_slots); diff --git a/trunk/sound/soc/soc-core.c b/trunk/sound/soc/soc-core.c index a4592cbee49b..acbb96005a69 100644 --- a/trunk/sound/soc/soc-core.c +++ b/trunk/sound/soc/soc-core.c @@ -59,8 +59,6 @@ static LIST_HEAD(dai_list); static LIST_HEAD(platform_list); static LIST_HEAD(codec_list); -int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num); - /* * This is a timeout to do a DAPM powerdown after a stream is closed(). * It can be used to eliminate pops between different playback streams, e.g.