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.h | |
parent | d9e2d5962b083646cc9c218bfd358d07ae3b5925 (diff) | |
download | linux-stable-b4f63e9a0f1ca7c6df1f77fdabd4905f4639e8c6.tar.gz linux-stable-b4f63e9a0f1ca7c6df1f77fdabd4905f4639e8c6.tar.bz2 linux-stable-b4f63e9a0f1ca7c6df1f77fdabd4905f4639e8c6.zip |
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.h')
-rw-r--r-- | drivers/staging/easycap/easycap.h | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/drivers/staging/easycap/easycap.h b/drivers/staging/easycap/easycap.h index 337c9bdcfe4d..26bb25f7fe7c 100644 --- a/drivers/staging/easycap/easycap.h +++ b/drivers/staging/easycap/easycap.h @@ -727,4 +727,23 @@ extern int easycap_debug; } while (0) /*---------------------------------------------------------------------------*/ +/*---------------------------------------------------------------------------*/ +/* globals + */ +/*---------------------------------------------------------------------------*/ + +extern const struct easycap_standard easycap_standard[]; +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[]; +#if defined(EASYCAP_NEEDS_ALSA) +extern struct snd_pcm_ops easycap_alsa_ops; +extern struct snd_pcm_hardware easycap_pcm_hardware; +extern struct snd_card *psnd_card; +#else +extern struct usb_class_driver easyoss_class; +extern const struct file_operations easyoss_fops; +#endif /*EASYCAP_NEEDS_ALSA*/ + #endif /*EASYCAP_H*/ |