Merge commit 'v2.6.36-rc1' into HEAD

[~andy/linux] / sound / usb / pcm.h

diff --git a/sound/usb/pcm.h b/sound/usb/pcm.h
index 1c931b68f3b588d836682a817b6d5690477c025d..ed3e283f618d11998af50f5f217f39f9397c8c97 100644 (file)
--- a/sound/usb/pcm.h
+++ b/sound/usb/pcm.h
@@ -7,8 +7,5 @@ int snd_usb_init_pitch(struct snd_usb_audio *chip, int iface,
                       struct usb_host_interface *alts,
                       struct audioformat *fmt);
 
-int snd_usb_init_sample_rate(struct snd_usb_audio *chip, int iface,
-                            struct usb_host_interface *alts,
-                            struct audioformat *fmt, int rate);
 
 #endif /* __USBAUDIO_PCM_H */