diff options
| author |   Wolfram Sang <wsa@the-dreams.de> | 2016-07-19 05:54:56 +0200 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2016-07-19 05:57:23 +0200 |
| commit | 38d0fc4662474c6219166505d0a68b45a583fcfb (patch) | |
| tree | fb014e8392c9b575e4bd656c36e603dd144d0ab1 /include/linux/i2c.h | |
| parent | i2c: Update the description of I2C_SMBUS (diff) | |
| download | linux-dev-38d0fc4662474c6219166505d0a68b45a583fcfb.tar.xz linux-dev-38d0fc4662474c6219166505d0a68b45a583fcfb.zip | |
Revert "i2c: core: Add function for finding the bus speed from ACPI"
This reverts commit 55d38d060e999ca1a3ea6eb132105a0301e4cd04. There were
too heavy merge conflicts and the driver code making use of this was not
ready yet anyhow. So, we wait one cycle.
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'include/linux/i2c.h')
| -rw-r--r-- | include/linux/i2c.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/include/linux/i2c.h b/include/linux/i2c.h index 5cde08719fb6..fffdc270ca18 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h @@ -766,13 +766,4 @@ static inline struct i2c_adapter *of_get_i2c_adapter_by_node(struct device_node } #endif /* CONFIG_OF */ -#if IS_ENABLED(CONFIG_ACPI) -u32 i2c_acpi_find_bus_speed(struct device *dev); -#else -static inline u32 i2c_acpi_find_bus_speed(struct device *dev) -{ - return 0; -} -#endif /* CONFIG_ACPI */ - #endif /* _LINUX_I2C_H */ |