From 7e8dafbfbda4f970439169361d7f6b4a6e652fde Mon Sep 17 00:00:00 2001 From: Anton Vorontsov Date: Fri, 4 May 2012 21:06:19 -0700 Subject: [PATCH] --- yaml --- r: 309674 b: refs/heads/master c: 0d4ed4e27a4cb180af395fa3d7aa98d79f3d3015 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/power/Kconfig | 2 +- trunk/include/linux/power_supply.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a360a1174e76..5390266cacbb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a2ebfe2fc6e088a70d06cd15a5bc9bcb621cc195 +refs/heads/master: 0d4ed4e27a4cb180af395fa3d7aa98d79f3d3015 diff --git a/trunk/drivers/power/Kconfig b/trunk/drivers/power/Kconfig index 99dc29f2f2f2..0c52a4079124 100644 --- a/trunk/drivers/power/Kconfig +++ b/trunk/drivers/power/Kconfig @@ -1,5 +1,5 @@ menuconfig POWER_SUPPLY - tristate "Power supply class support" + bool "Power supply class support" help Say Y here to enable power supply class support. This allows power supply (batteries, AC, USB) monitoring by userspace diff --git a/trunk/include/linux/power_supply.h b/trunk/include/linux/power_supply.h index fd17ae0f9c20..3b912bee28d1 100644 --- a/trunk/include/linux/power_supply.h +++ b/trunk/include/linux/power_supply.h @@ -212,7 +212,7 @@ extern void power_supply_changed(struct power_supply *psy); extern int power_supply_am_i_supplied(struct power_supply *psy); extern int power_supply_set_battery_charged(struct power_supply *psy); -#if defined(CONFIG_POWER_SUPPLY) || defined(CONFIG_POWER_SUPPLY_MODULE) +#ifdef CONFIG_POWER_SUPPLY extern int power_supply_is_system_supplied(void); #else static inline int power_supply_is_system_supplied(void) { return -ENOSYS; }