diff options
author | James Morris <jmorris@namei.org> | 2010-01-18 09:56:22 +1100 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2010-01-18 09:56:22 +1100 |
commit | 2457552d1e6f3183cd93f81c49a8da5fe8bb0e42 (patch) | |
tree | 7ca46caa910012d75617700e4083b3657053cb31 /include/media/ov772x.h | |
parent | 19439d05b88dafc4e55d9ffce84ccc27cf8b2bcc (diff) | |
parent | 6ccf80eb15ccaca4d3f1ab5162b9ded5eecd9971 (diff) |
Merge branch 'master' into next
Diffstat (limited to 'include/media/ov772x.h')
-rw-r--r-- | include/media/ov772x.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/media/ov772x.h b/include/media/ov772x.h index 30d9629198e..14c77efd6a8 100644 --- a/include/media/ov772x.h +++ b/include/media/ov772x.h @@ -1,4 +1,5 @@ -/* ov772x Camera +/* + * ov772x Camera * * Copyright (C) 2008 Renesas Solutions Corp. * Kuninori Morimoto <morimoto.kuninori@renesas.com> @@ -54,7 +55,6 @@ struct ov772x_edge_ctrl { struct ov772x_camera_info { unsigned long buswidth; unsigned long flags; - struct soc_camera_link link; struct ov772x_edge_ctrl edgectrl; }; |