diff options
| author | Dave Jones <davej@redhat.com> | 2006-06-30 00:01:54 +0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-06-30 00:01:54 +0400 |
| commit | 55b4d6a52195a8f277ffddf755ddaff359878f41 (patch) | |
| tree | 06a3183a562f8da4688f65023f7a18dcad702956 /drivers/media/video/cpia2/cpia2.h | |
| parent | adf8a287150667feb5747f8beade62acacc17d4e (diff) | |
| parent | 1f1332f727c3229eb2166a83fec5d3de6a73dce2 (diff) | |
| download | linux-55b4d6a52195a8f277ffddf755ddaff359878f41.tar.xz | |
Merge ../linus
Conflicts:
drivers/char/agp/Kconfig
Diffstat (limited to 'drivers/media/video/cpia2/cpia2.h')
| -rw-r--r-- | drivers/media/video/cpia2/cpia2.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/video/cpia2/cpia2.h b/drivers/media/video/cpia2/cpia2.h index 1764991b0ac9..c5ecb2be5f93 100644 --- a/drivers/media/video/cpia2/cpia2.h +++ b/drivers/media/video/cpia2/cpia2.h @@ -33,6 +33,7 @@ #include <linux/version.h> #include <linux/videodev.h> +#include <media/v4l2-common.h> #include <linux/usb.h> #include <linux/poll.h> |