Commit d8d01a63 authored by Daniel Drake's avatar Daniel Drake Committed by Ingo Molnar

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: default avatarRandy Dunlap <rdunlap@xenotime.net>
Acked-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
Signed-off-by: default avatarDaniel Drake <dsd@laptop.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent a0f30f59
...@@ -2089,7 +2089,8 @@ config OLPC_XO1_RTC ...@@ -2089,7 +2089,8 @@ config OLPC_XO1_RTC
config OLPC_XO1_SCI config OLPC_XO1_SCI
bool "OLPC XO-1 SCI extras" 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 GPIO_CS5535
select MFD_CORE select MFD_CORE
---help--- ---help---
...@@ -2103,7 +2104,8 @@ config OLPC_XO1_SCI ...@@ -2103,7 +2104,8 @@ config OLPC_XO1_SCI
config OLPC_XO15_SCI config OLPC_XO15_SCI
bool "OLPC XO-1.5 SCI extras" bool "OLPC XO-1.5 SCI extras"
depends on OLPC && ACPI && POWER_SUPPLY depends on OLPC && ACPI
select POWER_SUPPLY
---help--- ---help---
Add support for SCI-based features of the OLPC XO-1.5 laptop: Add support for SCI-based features of the OLPC XO-1.5 laptop:
- EC-driven system wakeups - EC-driven system wakeups
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment