diff --git a/[refs] b/[refs] index ecb0d0b5cb0b..a634cf3d4605 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 58818a77cd415e2f76607749de5a1ff24e58cefe +refs/heads/master: 0b9a214a606f8c7c7af3e66e7fe0caf3233cfe16 diff --git a/trunk/sound/soc/soc-core.c b/trunk/sound/soc/soc-core.c index b2c327b14b00..392d33625327 100644 --- a/trunk/sound/soc/soc-core.c +++ b/trunk/sound/soc/soc-core.c @@ -3175,7 +3175,7 @@ static int snd_soc_unregister_card(struct snd_soc_card *card) * Simplify DAI link configuration by removing ".-1" from device names * and sanitizing names. */ -static inline char *fmt_single_name(struct device *dev, int *id) +static char *fmt_single_name(struct device *dev, int *id) { char *found, name[NAME_SIZE]; int id1, id2;