On Mon, Jan 10, 2011 at 06:41:11PM +0000, Mike Thomas wrote: > This is necessary because some distributions are disabling OSS entirely. > > Signed-off-by: Mike Thomas <rmthomas@xxxxxxxxxxx> > --- > drivers/staging/easycap/Kconfig | 2 +- > drivers/staging/easycap/Makefile | 11 +- > drivers/staging/easycap/easycap.h | 84 ++- > drivers/staging/easycap/easycap_debug.h | 29 - > drivers/staging/easycap/easycap_ioctl.c | 272 ++++--- > drivers/staging/easycap/easycap_ioctl.h | 9 + > drivers/staging/easycap/easycap_low.c | 17 +- > drivers/staging/easycap/easycap_low.h | 34 + > drivers/staging/easycap/easycap_main.c | 394 ++++++---- > drivers/staging/easycap/easycap_main.h | 43 + > drivers/staging/easycap/easycap_settings.c | 2 +- > drivers/staging/easycap/easycap_settings.h | 34 + > drivers/staging/easycap/easycap_sound.c | 1214 ++++++++++++++++++++++++---- > drivers/staging/easycap/easycap_sound.h | 14 + > drivers/staging/easycap/easycap_standard.h | 27 - > drivers/staging/easycap/easycap_testcard.c | 4 +- > drivers/staging/easycap/easycap_testcard.h | 34 + > 17 files changed, 1673 insertions(+), 551 deletions(-) > delete mode 100644 drivers/staging/easycap/easycap_debug.h > create mode 100644 drivers/staging/easycap/easycap_low.h > create mode 100644 drivers/staging/easycap/easycap_main.h > create mode 100644 drivers/staging/easycap/easycap_settings.h > delete mode 100644 drivers/staging/easycap/easycap_standard.h > create mode 100644 drivers/staging/easycap/easycap_testcard.h > > diff --git a/drivers/staging/easycap/Kconfig b/drivers/staging/easycap/Kconfig > index bd96f39..eaa8a86 100644 > --- a/drivers/staging/easycap/Kconfig > +++ b/drivers/staging/easycap/Kconfig > @@ -1,6 +1,6 @@ > config EASYCAP > tristate "EasyCAP USB ID 05e1:0408 support" > - depends on USB && VIDEO_DEV > + depends on USB && VIDEO_DEV && SND > > ---help--- > This is an integrated audio/video driver for EasyCAP cards with > diff --git a/drivers/staging/easycap/Makefile b/drivers/staging/easycap/Makefile > index f1f2fbe..977e153 100644 > --- a/drivers/staging/easycap/Makefile > +++ b/drivers/staging/easycap/Makefile > @@ -1,14 +1,13 @@ > +easycap-objs := easycap_main.o easycap_low.o easycap_sound.o \ > + easycap_ioctl.o easycap_settings.o easycap_testcard.o > > -obj-$(CONFIG_EASYCAP) += easycap.o > - > -easycap-y := easycap_main.o easycap_low.o easycap_sound.o > -easycap-y += easycap_ioctl.o easycap_settings.o > -easycap-y += easycap_testcard.o > +obj-$(CONFIG_EASYCAP) += easycap.o > > ccflags-y := -Wall > -# Impose all or none of the following: > ccflags-y += -DEASYCAP_IS_VIDEODEV_CLIENT > ccflags-y += -DEASYCAP_NEEDS_V4L2_DEVICE_H > ccflags-y += -DEASYCAP_NEEDS_V4L2_FOPS > ccflags-y += -DEASYCAP_NEEDS_UNLOCKED_IOCTL > +ccflags-y += -DEASYCAP_NEEDS_ALSA > +ccflags-y += -DEASYCAP_NEEDS_CARD_CREATE Don't add new flags that are always set. That just causes #ifdefs in the other files that also never get unused, so just remove them. In the end, all of these need to be removed anyway, right? thanks, greg k-h _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
