diff options
| author | Wolfram Sang <wsa@the-dreams.de> | 2017-11-01 23:49:36 +0100 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2017-11-01 23:49:36 +0100 |
| commit | f6d2953643164525b22edcc09720c2cbf2e52d21 (patch) | |
| tree | d4bd80a15eab6c4017215096e19bce6fb163e94f /include | |
| parent | 4ee045f4e9b73c4635ceedbb1ee40e0b3ecbdbcc (diff) | |
| parent | 4cf419a2b4c2e5bb0583e32e5fe079995c987c0f (diff) | |
Merge branch 'i2c/sbs-manager' into i2c/for-4.15
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/i2c-smbus.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/include/linux/i2c-smbus.h b/include/linux/i2c-smbus.h index a1385023a29b..fb0e040b1abb 100644 --- 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 */ |