Merge tag 'for-3.7-rc1' of git://gitorious.org/linux-pwm/linux-pwm

[~andy/linux] / include / media / s5p_hdmi.h

diff --git a/include/media/s5p_hdmi.h b/include/media/s5p_hdmi.h
index 361a751f73afac404f2f1b72904ee4bd901a7477..181642b8d0a5bfbd9ed5dada6d7977b24753eaf0 100644 (file)
--- a/include/media/s5p_hdmi.h
+++ b/include/media/s5p_hdmi.h
@@ -20,6 +20,7 @@ struct i2c_board_info;
  * @hdmiphy_info: template for HDMIPHY I2C device
  * @mhl_bus: controller id for MHL control bus
  * @mhl_info: template for MHL I2C device
+ * @hpd_gpio: GPIO for Hot-Plug-Detect pin
  *
  * NULL pointer for *_info fields indicates that
  * the corresponding chip is not present
@@ -29,6 +30,7 @@ struct s5p_hdmi_platform_data {
        struct i2c_board_info *hdmiphy_info;
        int mhl_bus;
        struct i2c_board_info *mhl_info;
+       int hpd_gpio;
 };
 
 #endif /* S5P_HDMI_H */