From 5138d47d74fff7974a105d6bb330c2da494facd3 Mon Sep 17 00:00:00 2001 From: Tomas Winkler Date: Thu, 3 Feb 2011 13:42:49 +0200 Subject: [PATCH] --- yaml --- r: 235814 b: refs/heads/master c: 7863ff276d2a151aaf1b4ad7798ff2610e7b2996 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/easycap/easycap.h | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index ceef8564b0be..9b4022e484e1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f8cc1e9373c253902a219ec805977d3b4f16a86c +refs/heads/master: 7863ff276d2a151aaf1b4ad7798ff2610e7b2996 diff --git a/trunk/drivers/staging/easycap/easycap.h b/trunk/drivers/staging/easycap/easycap.h index df0440d5d48f..dfda1008532f 100644 --- a/trunk/drivers/staging/easycap/easycap.h +++ b/trunk/drivers/staging/easycap/easycap.h @@ -690,11 +690,7 @@ extern struct easycap_format easycap_format[]; extern struct v4l2_queryctrl easycap_control[]; extern struct usb_driver easycap_usb_driver; extern struct easycap_dongle easycapdc60_dongle[]; -#ifndef CONFIG_EASYCAP_OSS -extern struct snd_pcm_ops easycap_alsa_ops; -extern struct snd_pcm_hardware easycap_pcm_hardware; -extern struct snd_card *psnd_card; -#else /* CONFIG_EASYCAP_OSS */ +#ifdef CONFIG_EASYCAP_OSS extern struct usb_class_driver easyoss_class; extern const struct file_operations easyoss_fops; #endif /* !CONFIG_EASYCAP_OSS */