diff options
| author | Tomas Winkler <tomas.winkler@intel.com> | 2011-01-23 01:13:54 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-01-25 06:43:04 +0800 |
| commit | b4f63e9a0f1ca7c6df1f77fdabd4905f4639e8c6 (patch) | |
| tree | c5158fa48e52fbbf87b1fc31bed189d0afbc60f4 /drivers/staging/easycap/easycap_sound.h | |
| parent | d9e2d5962b083646cc9c218bfd358d07ae3b5925 (diff) | |
staging: easycap: remove redunant headers
place all globals to easycap.h, which is included
by all c-files
easycap_standard: fix declaration vs. definiton conflict
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_sound.h')
| -rw-r--r-- | drivers/staging/easycap/easycap_sound.h | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/drivers/staging/easycap/easycap_sound.h b/drivers/staging/easycap/easycap_sound.h deleted file mode 100644 index ffcd6f203cca..000000000000 --- a/drivers/staging/easycap/easycap_sound.h +++ /dev/null @@ -1,40 +0,0 @@ -/***************************************************************************** -* * -* easycap_sound.h * -* * -*****************************************************************************/ -/* - * - * Copyright (C) 2010 R.M. Thomas <rmthomas@sciolus.org> - * - * - * This is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * The software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * -*/ -/*****************************************************************************/ -#if !defined(EASYCAP_SOUND_H) -#define EASYCAP_SOUND_H - -extern struct easycap_dongle easycapdc60_dongle[]; -extern struct easycap *peasycap; -extern struct usb_driver easycap_usb_driver; -#if defined(EASYCAP_NEEDS_ALSA) -extern struct snd_pcm_hardware easycap_pcm_hardware; -#else -extern struct usb_class_driver easyoss_class; -extern const struct file_operations easyoss_fops; -#endif /*EASYCAP_NEEDS_ALSA*/ - -#endif /*EASYCAP_SOUND_H*/ |