diff options
-rw-r--r-- | drivers/power/Kconfig | 2 | ||||
-rw-r--r-- | include/linux/power_supply.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig index 99dc29f2f2f2..0c52a4079124 100644 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig | |||
@@ -1,5 +1,5 @@ | |||
1 | menuconfig POWER_SUPPLY | 1 | menuconfig POWER_SUPPLY |
2 | tristate "Power supply class support" | 2 | bool "Power supply class support" |
3 | help | 3 | help |
4 | Say Y here to enable power supply class support. This allows | 4 | Say Y here to enable power supply class support. This allows |
5 | power supply (batteries, AC, USB) monitoring by userspace | 5 | power supply (batteries, AC, USB) monitoring by userspace |
diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h index fd17ae0f9c20..3b912bee28d1 100644 --- a/include/linux/power_supply.h +++ b/include/linux/power_supply.h | |||
@@ -212,7 +212,7 @@ extern void power_supply_changed(struct power_supply *psy); | |||
212 | extern int power_supply_am_i_supplied(struct power_supply *psy); | 212 | extern int power_supply_am_i_supplied(struct power_supply *psy); |
213 | extern int power_supply_set_battery_charged(struct power_supply *psy); | 213 | extern int power_supply_set_battery_charged(struct power_supply *psy); |
214 | 214 | ||
215 | #if defined(CONFIG_POWER_SUPPLY) || defined(CONFIG_POWER_SUPPLY_MODULE) | 215 | #ifdef CONFIG_POWER_SUPPLY |
216 | extern int power_supply_is_system_supplied(void); | 216 | extern int power_supply_is_system_supplied(void); |
217 | #else | 217 | #else |
218 | static inline int power_supply_is_system_supplied(void) { return -ENOSYS; } | 218 | static inline int power_supply_is_system_supplied(void) { return -ENOSYS; } |