diff options
| author | Tomas Winkler <tomas.winkler@intel.com> | 2011-07-07 21:45:46 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-07-09 01:02:26 +0400 |
| commit | 73019286cddc8bba1773944a7b6b603137fd66ff (patch) | |
| tree | 5bc96dbc2c4ffb78daa7e1e05d362a998795ee55 /drivers/staging/easycap/easycap_ioctl.c | |
| parent | 808a3b5f9b1deb7e449765192a0315e2da904553 (diff) | |
| download | linux-73019286cddc8bba1773944a7b6b603137fd66ff.tar.xz | |
staging/easycap: remove oss support
remove support for OSS. OSS is being deprecated
and it is just plain headache to support both alsa and oss.
Last I broke the compilation when OSS is enabled with the patch
cdaa898b5efcc598ab1004e8f913061dc7005091
staging/easycap: kill telltale logic
so this fixes also that issue.
Cc: Mike Thomas <rmthomas@sciolus.org>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/easycap/easycap_ioctl.c')
| -rw-r--r-- | drivers/staging/easycap/easycap_ioctl.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/staging/easycap/easycap_ioctl.c b/drivers/staging/easycap/easycap_ioctl.c index 80aa5d8ed5d0..0accab97a7f6 100644 --- a/drivers/staging/easycap/easycap_ioctl.c +++ b/drivers/staging/easycap/easycap_ioctl.c @@ -2347,14 +2347,8 @@ long easycap_unlocked_ioctl(struct file *file, /*---------------------------------------------------------------------------*/ JOM(8, "calling wake_up on wq_video and wq_audio\n"); wake_up_interruptible(&(peasycap->wq_video)); -#ifdef CONFIG_EASYCAP_OSS - wake_up_interruptible(&(peasycap->wq_audio)); - -#else if (peasycap->psubstream) snd_pcm_period_elapsed(peasycap->psubstream); -#endif /* CONFIG_EASYCAP_OSS */ -/*---------------------------------------------------------------------------*/ break; } /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ |