diff --git a/[refs] b/[refs] index 308aeae582ee..cd4e1d887eff 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3c1fb66ede917d54079a959a95f79777e95920bd +refs/heads/master: 9306b1bb8b6de05786c8aa79a19988aa15453968 diff --git a/trunk/drivers/staging/easycap/easycap.h b/trunk/drivers/staging/easycap/easycap.h index 2479fc21e838..589f0387e75f 100644 --- a/trunk/drivers/staging/easycap/easycap.h +++ b/trunk/drivers/staging/easycap/easycap.h @@ -34,7 +34,6 @@ * EASYCAP_NEEDS_V4L2_DEVICE_H * EASYCAP_NEEDS_V4L2_FOPS * EASYCAP_NEEDS_UNLOCKED_IOCTL - * EASYCAP_NEEDS_ALSA * EASYCAP_SILENT * * IF REQUIRED THEY MUST BE EXTERNALLY DEFINED, FOR EXAMPLE AS COMPILER