evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[ARM] 4052/1: S3C24XX: Fix PM in arch/arm/mach-s3c2410/Kconfig

Browse source 
Fix up the CONFIG_PM mixups in arch/arm/mach-s3c2410/Kconfig
causing CONFIG_S3C2410_PM and CONFIG_PM_H1940 to get enabled
permanently.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Ben Dooks 2006-12-18 00:39:47 +01:00 • committed by Russell King
parent 255d1f8639
commit 9bcb533c13
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
arch/arm/mach-s3c2410/Kconfig
View file

@ -43,14 +43,13 @@ config BAST_PC104_IRQ
config PM_H1940 config PM_H1940
bool bool
depends on PM
help help
Internal node for H1940 and related PM Internal node for H1940 and related PM
config ARCH_H1940 config ARCH_H1940
bool "IPAQ H1940" bool "IPAQ H1940"
select CPU_S3C2410 select CPU_S3C2410
select PM_H1940 select PM_H1940 if PM
help help
Say Y here if you are using the HP IPAQ H1940 Say Y here if you are using the HP IPAQ H1940
@ -122,7 +121,7 @@ config MACH_VR1000
config MACH_RX3715 config MACH_RX3715
bool "HP iPAQ rx3715" bool "HP iPAQ rx3715"
select CPU_S3C2440 select CPU_S3C2440
select PM_H1940 select PM_H1940 if PM
help help
Say Y here if you are using the HP iPAQ rx3715. Say Y here if you are using the HP iPAQ rx3715.
@ -156,7 +155,6 @@ config S3C2410_CLOCK
config S3C2410_PM config S3C2410_PM
bool bool
depends on CONFIG_PM
help help
Power Management code common to S3C2410 and better Power Management code common to S3C2410 and better
@ -171,7 +169,7 @@ config CPU_S3C2410
bool bool
depends on ARCH_S3C2410 depends on ARCH_S3C2410
select S3C2410_CLOCK select S3C2410_CLOCK
select S3C2410_PM select S3C2410_PM if PM
help help
Support for S3C2410 and S3C2410A family from the S3C24XX line Support for S3C2410 and S3C2410A family from the S3C24XX line
of Samsung Mobile CPUs. of Samsung Mobile CPUs.
@ -186,14 +184,13 @@ config CPU_S3C2412_ONLY
config S3C2412_PM config S3C2412_PM
bool bool
default y if PM
depends on CPU_S3C2412
help help
Internal config node to apply S3C2412 power management Internal config node to apply S3C2412 power management
config CPU_S3C2412 config CPU_S3C2412
bool bool
depends on ARCH_S3C2410 depends on ARCH_S3C2410
select S3C2412_PM if PM
help help
Support for the S3C2412 and S3C2413 SoCs from the S3C24XX line Support for the S3C2412 and S3C2413 SoCs from the S3C24XX line
@ -207,7 +204,7 @@ config CPU_S3C2440
bool bool
depends on ARCH_S3C2410 depends on ARCH_S3C2410
select S3C2410_CLOCK select S3C2410_CLOCK
select S3C2410_PM select S3C2410_PM if PM
select CPU_S3C244X select CPU_S3C244X
help help
Support for S3C2440 Samsung Mobile CPU based systems. Support for S3C2440 Samsung Mobile CPU based systems.
@ -216,7 +213,7 @@ config CPU_S3C2442
bool bool
depends on ARCH_S3C2420 depends on ARCH_S3C2420
select S3C2410_CLOCK select S3C2410_CLOCK
select S3C2410_PM select S3C2410_PM if PM
select CPU_S3C244X select CPU_S3C244X
help help
Support for S3C2442 Samsung Mobile CPU based systems. Support for S3C2442 Samsung Mobile CPU based systems.