diff options
| -rw-r--r-- | linux/drivers/media/video/em28xx/em28xx-audio.c | 1 | ||||
| -rw-r--r-- | v4l/compat.h | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/linux/drivers/media/video/em28xx/em28xx-audio.c b/linux/drivers/media/video/em28xx/em28xx-audio.c index 901eeeb5c..be48bcdb6 100644 --- a/linux/drivers/media/video/em28xx/em28xx-audio.c +++ b/linux/drivers/media/video/em28xx/em28xx-audio.c @@ -35,7 +35,6 @@ #include <linux/vmalloc.h> #include <linux/proc_fs.h> #include <linux/module.h> -#include <sound/driver.h> #include <sound/core.h> #include <sound/pcm.h> #include <sound/pcm_params.h> diff --git a/v4l/compat.h b/v4l/compat.h index cd3a7ac86..1d3400b88 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -14,6 +14,11 @@ #include <linux/i2c-dev.h> #endif +/* To allow alsa code to work */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24) +#include <sound/driver.h> +#endif + #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23) # define set_freezable() #endif |