This reverts commit 6fe12cdbcfe35ad4726a619a9546822d34fc934c. Testing in linux-next showed it needs some more time.
Showing the changes to include/linux (1 of 2 files). Show all
Unified · Split
| @@ -15,7 +15,6 @@ · 14 unmodified lines | |||
| 15 | #include <linux/device.h> /* for struct device */ | 15 | #include <linux/device.h> /* for struct device */ |
| 16 | #include <linux/sched.h> /* for completion */ | 16 | #include <linux/sched.h> /* for completion */ |
| 17 | #include <linux/mutex.h> | 17 | #include <linux/mutex.h> |
| 18 | #include <linux/regulator/consumer.h> | ||
| 19 | #include <linux/rtmutex.h> | 18 | #include <linux/rtmutex.h> |
| 20 | #include <linux/irqdomain.h> /* for Host Notify IRQ */ | 19 | #include <linux/irqdomain.h> /* for Host Notify IRQ */ |
| 21 | #include <linux/of.h> /* for struct device_node */ | 20 | #include <linux/of.h> /* for struct device_node */ |
| @@ -716,7 +715,6 @@ struct i2c_adapter { · 694 unmodified lines | |||
| 716 | const struct i2c_adapter_quirks *quirks; | 715 | const struct i2c_adapter_quirks *quirks; |
| 717 | 716 | ||
| 718 | struct irq_domain *host_notify_domain; | 717 | struct irq_domain *host_notify_domain; |
| 719 | struct regulator *bus_regulator; | ||
| 720 | }; | 718 | }; |
| 721 | #define to_i2c_adapter(d) container_of(d, struct i2c_adapter, dev) | 719 | #define to_i2c_adapter(d) container_of(d, struct i2c_adapter, dev) |
| 722 | 720 | ||