From cb9ed803c16d0a6ddb75227a9761713107019fc8 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Wed, 18 Jan 2006 11:50:40 +0100 Subject: [PATCH] --- yaml --- r: 22710 b: refs/heads/master c: 3f72a30ccfd5054c01fc3bb0d37241df5380a54c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/core/pcm.c | 1 - trunk/sound/usb/usbaudio.c | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d3a9ede7bcb1..e2a67e57cb9c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cdca881d79dc4133b35db5c855b688ee9cba12a9 +refs/heads/master: 3f72a30ccfd5054c01fc3bb0d37241df5380a54c diff --git a/trunk/sound/core/pcm.c b/trunk/sound/core/pcm.c index f903d1bd74d5..3da6a38c2d0f 100644 --- a/trunk/sound/core/pcm.c +++ b/trunk/sound/core/pcm.c @@ -1105,7 +1105,6 @@ EXPORT_SYMBOL(snd_pcm_new_stream); EXPORT_SYMBOL(snd_pcm_notify); EXPORT_SYMBOL(snd_pcm_open_substream); EXPORT_SYMBOL(snd_pcm_release_substream); -EXPORT_SYMBOL(snd_pcm_format_name); /* pcm_native.c */ EXPORT_SYMBOL(snd_pcm_link_rwlock); #ifdef CONFIG_PM diff --git a/trunk/sound/usb/usbaudio.c b/trunk/sound/usb/usbaudio.c index 53009bb642f6..51a862637f20 100644 --- a/trunk/sound/usb/usbaudio.c +++ b/trunk/sound/usb/usbaudio.c @@ -2029,7 +2029,7 @@ static void proc_dump_substream_formats(struct snd_usb_substream *subs, struct s fp = list_entry(p, struct audioformat, list); snd_iprintf(buffer, " Interface %d\n", fp->iface); snd_iprintf(buffer, " Altset %d\n", fp->altsetting); - snd_iprintf(buffer, " Format: %s\n", snd_pcm_format_name(fp->format)); + snd_iprintf(buffer, " Format: 0x%x\n", fp->format); snd_iprintf(buffer, " Channels: %d\n", fp->channels); snd_iprintf(buffer, " Endpoint: %d %s (%s)\n", fp->endpoint & USB_ENDPOINT_NUMBER_MASK,