diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2012-10-09 10:03:21 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2012-10-09 10:04:25 -0400 |
| commit | ffe315012510165ce82e4dd4767f0a5dba9edbf7 (patch) | |
| tree | f601cd980af9d0ced5ca9aedecef4fa0d2ca0e15 /include/media/mt9v032.h | |
| parent | e2d3a35ee427aaba99b6c68a56609ce276c51270 (diff) | |
| parent | 4a8e43feeac7996b8de2d5b2823e316917493df4 (diff) | |
Merge tag 'disintegrate-mtd-20121009' of git://git.infradead.org/users/dhowells/linux-headers
UAPI Disintegration 2012-10-09
Conflicts:
MAINTAINERS
arch/arm/configs/bcmring_defconfig
arch/arm/mach-imx/clk-imx51-imx53.c
drivers/mtd/nand/Kconfig
drivers/mtd/nand/bcm_umi_nand.c
drivers/mtd/nand/nand_bcm_umi.h
drivers/mtd/nand/orion_nand.c
Diffstat (limited to 'include/media/mt9v032.h')
| -rw-r--r-- | include/media/mt9v032.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/media/mt9v032.h b/include/media/mt9v032.h index 5e27f9be6b95..78fd39eac219 100644 --- a/include/media/mt9v032.h +++ b/include/media/mt9v032.h | |||
| @@ -7,6 +7,9 @@ struct mt9v032_platform_data { | |||
| 7 | unsigned int clk_pol:1; | 7 | unsigned int clk_pol:1; |
| 8 | 8 | ||
| 9 | void (*set_clock)(struct v4l2_subdev *subdev, unsigned int rate); | 9 | void (*set_clock)(struct v4l2_subdev *subdev, unsigned int rate); |
| 10 | |||
| 11 | const s64 *link_freqs; | ||
| 12 | s64 link_def_freq; | ||
| 10 | }; | 13 | }; |
| 11 | 14 | ||
| 12 | #endif | 15 | #endif |