summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Drake <dsd@laptop.org>2011-07-24 18:33:21 +0100
committerIngo Molnar <mingo@elte.hu>2011-07-24 20:14:44 +0200
commitd8d01a6378db6e3eeb8777a8769c69e455635dc3 (patch)
tree0c707e12831c773dfc85b715ef02844ae9497dec
parenta0f30f592d2d81e28f3ed7fea7f03246b0d55b75 (diff)
downloadop-kernel-dev-d8d01a6378db6e3eeb8777a8769c69e455635dc3.zip
op-kernel-dev-d8d01a6378db6e3eeb8777a8769c69e455635dc3.tar.gz
x86, olpc: Fix dependency on POWER_SUPPLY
As reported by Randy Dunlap, CONFIG_POWER_SUPPLY=m caused a compile error: arch/x86/built-in.o: In function `battery_status_changed': olpc-xo15-sci.c:(.text+0x3acdd): undefined reference to `power_supply_get_by_name' olpc-xo15-sci.c:(.text+0x3ad04): undefined reference to `power_supply_changed' The SCI drivers, as bool, require POWER_SUPPLY to be builtin. Use select to make that a hard requirement and avoid this build failure. Reported-by: Randy Dunlap <rdunlap@xenotime.net> Acked-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Daniel Drake <dsd@laptop.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/Kconfig6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 8af5ba8..b198c01 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -2089,7 +2089,8 @@ config OLPC_XO1_RTC
config OLPC_XO1_SCI
bool "OLPC XO-1 SCI extras"
- depends on OLPC && OLPC_XO1_PM && POWER_SUPPLY
+ depends on OLPC && OLPC_XO1_PM
+ select POWER_SUPPLY
select GPIO_CS5535
select MFD_CORE
---help---
@@ -2103,7 +2104,8 @@ config OLPC_XO1_SCI
config OLPC_XO15_SCI
bool "OLPC XO-1.5 SCI extras"
- depends on OLPC && ACPI && POWER_SUPPLY
+ depends on OLPC && ACPI
+ select POWER_SUPPLY
---help---
Add support for SCI-based features of the OLPC XO-1.5 laptop:
- EC-driven system wakeups
OpenPOWER on IntegriCloud