diff options
author | Olof Johansson <olof@lixom.net> | 2014-01-02 14:45:27 -0500 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2014-01-02 14:45:27 -0500 |
commit | a7dedb4fead89f88255862a9bc46f4c7ec094c2e (patch) | |
tree | d07b09522364b895dc91ccd2d057668d2fa692c5 /drivers/media/i2c/s5c73m3/s5c73m3.h | |
parent | 9dc9b8e51f95fce0cc3d50ef80402203d2dcd68a (diff) | |
parent | 6075a8b2b6c32ddcb99b85189ae41ab2903e560f (diff) |
Merge tag 'davinci-for-v3.14/gpio' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/drivers
From Sekhar Nori:
DaVinci GPIO driver updates
---------------------------
This pull request contains updates to DaVinci GPIO driver and the
resultant platform code changes. The updates include DT-conversion and
changes to make the driver cross-platform ready.
* tag 'davinci-for-v3.14/gpio' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
gpio: davinci: don't create irq_domain in case of unbanked irqs
gpio: davinci: use chained_irq_enter/chained_irq_exit API
gpio: davinci: add OF support
gpio: davinci: remove unused variable intc_irq_num
gpio: davinci: convert to use irqdomain support.
gpio: introduce GPIO_DAVINCI kconfig option
gpio: davinci: get rid of DAVINCI_N_GPIO
gpio: davinci: use {readl|writel}_relaxed() instead of __raw_*
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/media/i2c/s5c73m3/s5c73m3.h')
-rw-r--r-- | drivers/media/i2c/s5c73m3/s5c73m3.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/i2c/s5c73m3/s5c73m3.h b/drivers/media/i2c/s5c73m3/s5c73m3.h index 9d2c08652246..9dfa516f6944 100644 --- a/drivers/media/i2c/s5c73m3/s5c73m3.h +++ b/drivers/media/i2c/s5c73m3/s5c73m3.h | |||
@@ -393,7 +393,7 @@ struct s5c73m3 { | |||
393 | 393 | ||
394 | /* External master clock frequency */ | 394 | /* External master clock frequency */ |
395 | u32 mclk_frequency; | 395 | u32 mclk_frequency; |
396 | /* Video bus type - MIPI-CSI2/paralell */ | 396 | /* Video bus type - MIPI-CSI2/parallel */ |
397 | enum v4l2_mbus_type bus_type; | 397 | enum v4l2_mbus_type bus_type; |
398 | 398 | ||
399 | const struct s5c73m3_frame_size *sensor_pix_size[2]; | 399 | const struct s5c73m3_frame_size *sensor_pix_size[2]; |