Merge tag 'fbdev-v4.15' of git://github.com/bzolnier/linux

[linux-2.6-microblaze.git] / include / linux / i2c-smbus.h

diff --git a/include/linux/i2c-smbus.h b/include/linux/i2c-smbus.h
index a138502..fb0e040 100644 (file)
--- a/include/linux/i2c-smbus.h
+++ b/include/linux/i2c-smbus.h
@@ -42,7 +42,6 @@
  * properly set.
  */
 struct i2c_smbus_alert_setup {
-       unsigned int            alert_edge_triggered:1;
        int                     irq;
 };
 
@@ -50,4 +49,13 @@ struct i2c_client *i2c_setup_smbus_alert(struct i2c_adapter *adapter,
                                         struct i2c_smbus_alert_setup *setup);
 int i2c_handle_smbus_alert(struct i2c_client *ara);
 
+#if IS_ENABLED(CONFIG_I2C_SMBUS) && IS_ENABLED(CONFIG_OF)
+int of_i2c_setup_smbus_alert(struct i2c_adapter *adap);
+#else
+static inline int of_i2c_setup_smbus_alert(struct i2c_adapter *adap)
+{
+       return 0;
+}
+#endif
+
 #endif /* _LINUX_I2C_SMBUS_H */