diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-05-24 02:08:41 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-05-24 02:08:41 +0400 |
| commit | c9409952b24e5aa14377fc252f308e580f4a77fa (patch) | |
| tree | b626093fc924c4deb593b6b2fe842937d131326e /include | |
| parent | cc6310cf5fa70526c9e7bc5a74b7dacae9fa3134 (diff) | |
| parent | 27f1bb9d78581068a5b2acbd934fccee885fef4b (diff) | |
Merge branch 'tracking-samslt-all' into merge-linux-linaro
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/printk.h | 1 | ||||
| -rw-r--r-- | include/linux/scatterlist.h | 2 | ||||
| -rw-r--r-- | include/uapi/linux/v4l2-controls.h | 4 |
3 files changed, 5 insertions, 2 deletions
diff --git a/include/linux/printk.h b/include/linux/printk.h index 6af944ab38f..78a68f1d78f 100644 --- a/include/linux/printk.h +++ b/include/linux/printk.h @@ -7,6 +7,7 @@ extern const char linux_banner[]; extern const char linux_proc_banner[]; +extern const char linux_scm_version_banner[]; static inline int printk_get_level(const char *buffer) { diff --git a/include/linux/scatterlist.h b/include/linux/scatterlist.h index 5951e3f3887..22e0ea6f712 100644 --- a/include/linux/scatterlist.h +++ b/include/linux/scatterlist.h @@ -245,7 +245,7 @@ size_t sg_copy_to_buffer(struct scatterlist *sgl, unsigned int nents, * Maximum number of entries that will be allocated in one piece, if * a list larger than this is required then chaining will be utilized. */ -#define SG_MAX_SINGLE_ALLOC (PAGE_SIZE / sizeof(struct scatterlist)) +#define SG_MAX_SINGLE_ALLOC ((PAGE_SIZE<<4) / sizeof(struct scatterlist)) /* * sg page iterator diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h index 69bd5bb0d5a..07941719006 100644 --- a/include/uapi/linux/v4l2-controls.h +++ b/include/uapi/linux/v4l2-controls.h @@ -138,8 +138,10 @@ enum v4l2_colorfx { #define V4L2_CID_ALPHA_COMPONENT (V4L2_CID_BASE+41) #define V4L2_CID_COLORFX_CBCR (V4L2_CID_BASE+42) +#define V4L2_CID_CODEC_FRAME_TAG (V4L2_CID_BASE+43) + /* last CID + 1 */ -#define V4L2_CID_LASTP1 (V4L2_CID_BASE+43) +#define V4L2_CID_LASTP1 (V4L2_CID_BASE+44) /* USER-class private control IDs */ |