summaryrefslogtreecommitdiff
path: root/sound/usb
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@kernel.org>2008-06-05 21:24:10 +0300
committerTakashi Iwai <tiwai@suse.de>2008-06-06 11:54:59 +0200
commit33b9cd8214d6e385fcd63c321252a359ee96d568 (patch)
treee8cedd59d3aa6fc351dc71d5ffdec042af619dea /sound/usb
parent40445ac5e93f1b97e1d7a8c5bed9d34bd89b7550 (diff)
downloadlinux-3.10-33b9cd8214d6e385fcd63c321252a359ee96d568.tar.gz
linux-3.10-33b9cd8214d6e385fcd63c321252a359ee96d568.tar.bz2
linux-3.10-33b9cd8214d6e385fcd63c321252a359ee96d568.zip
[ALSA] usbaudio.c: remove #ifndef CONFIG_USB_EHCI_SPLIT_ISO code
Since USB_EHCI_SPLIT_ISO is now unconditionally enabled the #ifndef CONFIG_USB_EHCI_SPLIT_ISO became wrong. Reported-by: Robert P. J. Day <rpjday@crashcourse.ca> Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb')
-rw-r--r--sound/usb/usbaudio.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c
index 410be4aff1b..b8cfb7c2276 100644
--- a/sound/usb/usbaudio.c
+++ b/sound/usb/usbaudio.c
@@ -819,10 +819,6 @@ static const char *usb_error_string(int err)
return "device disabled";
case -EHOSTUNREACH:
return "device suspended";
-#ifndef CONFIG_USB_EHCI_SPLIT_ISO
- case -ENOSYS:
- return "enable CONFIG_USB_EHCI_SPLIT_ISO to play through a hub";
-#endif
case -EINVAL:
case -EAGAIN:
case -EFBIG: