diff options
author | Axel Lin <axel.lin@ingics.com> | 2014-08-09 02:20:01 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-08-21 16:25:37 -0400 |
commit | c0d04f4026c305eadeac6cfdffdbac5fcdf9bc60 (patch) | |
tree | 319ebdb1375b0eba32d350b4caed40ee145b8c19 | |
parent | 7c5a62e1eee1f59a5d2c25bbd28f0929811ffefa (diff) |
[media] via-camera: Include media/v4l2-image-sizes.h
So we can remove the same defines in the driver code.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
-rw-r--r-- | drivers/media/platform/via-camera.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/media/platform/via-camera.c b/drivers/media/platform/via-camera.c index b4f9d03636e3..2ac870438493 100644 --- a/drivers/media/platform/via-camera.c +++ b/drivers/media/platform/via-camera.c | |||
@@ -18,6 +18,7 @@ | |||
18 | #include <media/v4l2-device.h> | 18 | #include <media/v4l2-device.h> |
19 | #include <media/v4l2-ioctl.h> | 19 | #include <media/v4l2-ioctl.h> |
20 | #include <media/v4l2-ctrls.h> | 20 | #include <media/v4l2-ctrls.h> |
21 | #include <media/v4l2-image-sizes.h> | ||
21 | #include <media/ov7670.h> | 22 | #include <media/ov7670.h> |
22 | #include <media/videobuf-dma-sg.h> | 23 | #include <media/videobuf-dma-sg.h> |
23 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
@@ -49,14 +50,6 @@ MODULE_PARM_DESC(override_serial, | |||
49 | "to force-enable the camera."); | 50 | "to force-enable the camera."); |
50 | 51 | ||
51 | /* | 52 | /* |
52 | * Basic window sizes. | ||
53 | */ | ||
54 | #define VGA_WIDTH 640 | ||
55 | #define VGA_HEIGHT 480 | ||
56 | #define QCIF_WIDTH 176 | ||
57 | #define QCIF_HEIGHT 144 | ||
58 | |||
59 | /* | ||
60 | * The structure describing our camera. | 53 | * The structure describing our camera. |
61 | */ | 54 | */ |
62 | enum viacam_opstate { S_IDLE = 0, S_RUNNING = 1 }; | 55 | enum viacam_opstate { S_IDLE = 0, S_RUNNING = 1 }; |