[PATCH] x86, olpc: Fix dependency on POWER_SUPPLY

[PATCH] x86, olpc: Fix dependency on POWER_SUPPLY

[Daniel Drake]

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.

Signed-off-by: Daniel Drake <dsd@laptop.org>
---
 arch/x86/Kconfig |    6 ++++--
 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
-- 
1.7.6

Re: [PATCH] x86, olpc: Fix dependency on POWER_SUPPLY

[Randy Dunlap]

On Sun, 24 Jul 2011 18:33:21 +0100 (BST) Daniel Drake wrote:

> 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.
> 
> Signed-off-by: Daniel Drake <dsd@laptop.org>

Acked-by: Randy Dunlap <rdunlap@xenotime.net>

Thanks.

> ---
>  arch/x86/Kconfig |    6 ++++--
>  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
> -- 
> 1.7.6
> 


---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

Re: [PATCH] x86, olpc: Fix dependency on POWER_SUPPLY

[Ingo Molnar]

* Daniel Drake <dsd@laptop.org> wrote:

> 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.
> 
> Signed-off-by: Daniel Drake <dsd@laptop.org>

Note that we generally try to add a Reported-by tag in such cases. 

(i've added that, no need to resend.)

Thanks,

	Ingo

Re: [PATCH] x86, olpc: Fix dependency on POWER_SUPPLY

[Daniel Drake]

On 24 July 2011 19:15, Ingo Molnar <mingo@elte.hu> wrote:
> Note that we generally try to add a Reported-by tag in such cases.
>
> (i've added that, no need to resend.)

I'll remember that for next time.

Please let me know if theres anything else I can do to help the
process of getting these patches into mainline.

Thanks!
Daniel

Re: [PATCH] x86, olpc: Fix dependency on POWER_SUPPLY

[Ingo Molnar]

* Daniel Drake <dsd@laptop.org> wrote:

> On 24 July 2011 19:15, Ingo Molnar <mingo@elte.hu> wrote:
> > Note that we generally try to add a Reported-by tag in such cases.
> >
> > (i've added that, no need to resend.)
> 
> I'll remember that for next time.
> 
> Please let me know if theres anything else I can do to help the 
> process of getting these patches into mainline.

Not at the moment - i've merged them and testing them now to see 
whether the boot crash is gone. Will let you know if there's any
test failure.

Thanks,

	Ingo