diff options
author | Axel Lin <axel.lin@ingics.com> | 2014-08-09 01:58:40 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-08-21 16:25:35 -0400 |
commit | 4721b3eb662ca5ea60a636f0f190f2fd2ac5df14 (patch) | |
tree | 75f770432cf6e7f3508af28e1469a40f29d88da8 | |
parent | 6e533c01a89fbb8b1a5c58808540e798e2dad645 (diff) |
[media] ov7670: 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>
Acked-by: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
-rw-r--r-- | drivers/media/i2c/ov7670.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/media/i2c/ov7670.c b/drivers/media/i2c/ov7670.c index cdd7c1b7259b..dd3db2458a4f 100644 --- a/drivers/media/i2c/ov7670.c +++ b/drivers/media/i2c/ov7670.c | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <media/v4l2-device.h> | 19 | #include <media/v4l2-device.h> |
20 | #include <media/v4l2-ctrls.h> | 20 | #include <media/v4l2-ctrls.h> |
21 | #include <media/v4l2-mediabus.h> | 21 | #include <media/v4l2-mediabus.h> |
22 | #include <media/v4l2-image-sizes.h> | ||
22 | #include <media/ov7670.h> | 23 | #include <media/ov7670.h> |
23 | 24 | ||
24 | MODULE_AUTHOR("Jonathan Corbet <corbet@lwn.net>"); | 25 | MODULE_AUTHOR("Jonathan Corbet <corbet@lwn.net>"); |
@@ -30,19 +31,6 @@ module_param(debug, bool, 0644); | |||
30 | MODULE_PARM_DESC(debug, "Debug level (0-1)"); | 31 | MODULE_PARM_DESC(debug, "Debug level (0-1)"); |
31 | 32 | ||
32 | /* | 33 | /* |
33 | * Basic window sizes. These probably belong somewhere more globally | ||
34 | * useful. | ||
35 | */ | ||
36 | #define VGA_WIDTH 640 | ||
37 | #define VGA_HEIGHT 480 | ||
38 | #define QVGA_WIDTH 320 | ||
39 | #define QVGA_HEIGHT 240 | ||
40 | #define CIF_WIDTH 352 | ||
41 | #define CIF_HEIGHT 288 | ||
42 | #define QCIF_WIDTH 176 | ||
43 | #define QCIF_HEIGHT 144 | ||
44 | |||
45 | /* | ||
46 | * The 7670 sits on i2c with ID 0x42 | 34 | * The 7670 sits on i2c with ID 0x42 |
47 | */ | 35 | */ |
48 | #define OV7670_I2C_ADDR 0x42 | 36 | #define OV7670_I2C_ADDR 0x42 |