diff options
| author | Mike Isely <isely@pobox.com> | 2006-03-25 17:08:48 -0600 |
|---|---|---|
| committer | Mike Isely <isely@pobox.com> | 2006-03-25 17:08:48 -0600 |
| commit | bdf583dd1cbec85e2760a6825d3ddf571c791870 (patch) | |
| tree | a97b66970f20ce2330816ca2a5e3d405a293c7ed /linux/drivers/media/video/vivi.c | |
| parent | 52e19741ce48048ada5cc3b87c065dec5b100b8d (diff) | |
| parent | afb2abb44347c884e3a8a2ddf7151756c1869d2f (diff) | |
| download | mediapointer-dvb-s2-bdf583dd1cbec85e2760a6825d3ddf571c791870.tar.gz mediapointer-dvb-s2-bdf583dd1cbec85e2760a6825d3ddf571c791870.tar.bz2 | |
Merge from master
From: Mike Isely <isely@pobox.com>
Signed-off-by: Mike Isely <isely@pobox.com>
Diffstat (limited to 'linux/drivers/media/video/vivi.c')
| -rw-r--r-- | linux/drivers/media/video/vivi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/vivi.c b/linux/drivers/media/video/vivi.c index 2dfbf65f2..70721671c 100644 --- a/linux/drivers/media/video/vivi.c +++ b/linux/drivers/media/video/vivi.c @@ -28,8 +28,8 @@ #include <linux/videodev2.h> #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15) #include <linux/videodev.h> -#include <linux/interrupt.h> #endif +#include <linux/interrupt.h> #include <media/video-buf.h> #include <media/v4l2-common.h> #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) |