diff options
| author | Tom Rini <trini@konsulko.com> | 2021-07-28 18:51:16 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-07-28 18:51:16 -0400 |
| commit | bbcacdf4cd23f2e5deb9ef916096c956c955243d (patch) | |
| tree | 3065b9346139a0f30bc3f9e77f1ee27e8fba3fdd /include/i2c.h | |
| parent | 22ecb12132a2de80a08654f139ff978176034c38 (diff) | |
| parent | 537892065ac1428a48193d4b0fa7bf827e8d0d44 (diff) | |
Merge branch '2021-07-28-build-improvements'
- Assorted Makefile cleanups
- A few code / build cleanups
Diffstat (limited to 'include/i2c.h')
| -rw-r--r-- | include/i2c.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/i2c.h b/include/i2c.h index c0fe94c1f3..8db34a67fe 100644 --- a/include/i2c.h +++ b/include/i2c.h @@ -20,7 +20,7 @@ /* * For now there are essentially two parts to this file - driver model - * here at the top, and the older code below (with CONFIG_SYS_I2C being + * here at the top, and the older code below (with CONFIG_SYS_I2C_LEGACY being * most recent). The plan is to migrate everything to driver model. * The driver model structures and API are separate as they are different * enough as to be incompatible for compilation purposes. @@ -748,7 +748,7 @@ void i2c_early_init_f(void); void i2c_init(int speed, int slaveaddr); void i2c_init_board(void); -#ifdef CONFIG_SYS_I2C +#ifdef CONFIG_SYS_I2C_LEGACY /* * i2c_get_bus_num: * @@ -922,13 +922,13 @@ int i2c_set_bus_speed(unsigned int); */ unsigned int i2c_get_bus_speed(void); -#endif /* CONFIG_SYS_I2C */ +#endif /* CONFIG_SYS_I2C_LEGACY */ /* * only for backwardcompatibility, should go away if we switched * completely to new multibus support. */ -#if defined(CONFIG_SYS_I2C) || defined(CONFIG_I2C_MULTI_BUS) +#if defined(CONFIG_SYS_I2C_LEGACY) || defined(CONFIG_I2C_MULTI_BUS) # if !defined(CONFIG_SYS_MAX_I2C_BUS) # define CONFIG_SYS_MAX_I2C_BUS 2 # endif |