aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2006-12-17 18:39:47 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-12-17 19:14:53 -0500
commit9bcb533c1338813085b0a35a6dd0887eb5a5af67 (patch)
treeb298413ed4dd8f65083e303dbc426e8a013eabff /arch/arm
parent255d1f8639f5877381545d0da6821079ebad1c21 (diff)
[ARM] 4052/1: S3C24XX: Fix PM in arch/arm/mach-s3c2410/Kconfig
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>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-s3c2410/Kconfig15
1 files changed, 6 insertions, 9 deletions
diff --git a/arch/arm/mach-s3c2410/Kconfig b/arch/arm/mach-s3c2410/Kconfig
index 9f46bf330bc8..9ac6b5d1fa9b 100644
--- a/arch/arm/mach-s3c2410/Kconfig
+++ b/arch/arm/mach-s3c2410/Kconfig
@@ -43,14 +43,13 @@ config BAST_PC104_IRQ
43 43
44config PM_H1940 44config PM_H1940
45 bool 45 bool
46 depends on PM
47 help 46 help
48 Internal node for H1940 and related PM 47 Internal node for H1940 and related PM
49 48
50config ARCH_H1940 49config ARCH_H1940
51 bool "IPAQ H1940" 50 bool "IPAQ H1940"
52 select CPU_S3C2410 51 select CPU_S3C2410
53 select PM_H1940 52 select PM_H1940 if PM
54 help 53 help
55 Say Y here if you are using the HP IPAQ H1940 54 Say Y here if you are using the HP IPAQ H1940
56 55
@@ -122,7 +121,7 @@ config MACH_VR1000
122config MACH_RX3715 121config MACH_RX3715
123 bool "HP iPAQ rx3715" 122 bool "HP iPAQ rx3715"
124 select CPU_S3C2440 123 select CPU_S3C2440
125 select PM_H1940 124 select PM_H1940 if PM
126 help 125 help
127 Say Y here if you are using the HP iPAQ rx3715. 126 Say Y here if you are using the HP iPAQ rx3715.
128 127
@@ -156,7 +155,6 @@ config S3C2410_CLOCK
156 155
157config S3C2410_PM 156config S3C2410_PM
158 bool 157 bool
159 depends on CONFIG_PM
160 help 158 help
161 Power Management code common to S3C2410 and better 159 Power Management code common to S3C2410 and better
162 160
@@ -171,7 +169,7 @@ config CPU_S3C2410
171 bool 169 bool
172 depends on ARCH_S3C2410 170 depends on ARCH_S3C2410
173 select S3C2410_CLOCK 171 select S3C2410_CLOCK
174 select S3C2410_PM 172 select S3C2410_PM if PM
175 help 173 help
176 Support for S3C2410 and S3C2410A family from the S3C24XX line 174 Support for S3C2410 and S3C2410A family from the S3C24XX line
177 of Samsung Mobile CPUs. 175 of Samsung Mobile CPUs.
@@ -186,14 +184,13 @@ config CPU_S3C2412_ONLY
186 184
187config S3C2412_PM 185config S3C2412_PM
188 bool 186 bool
189 default y if PM
190 depends on CPU_S3C2412
191 help 187 help
192 Internal config node to apply S3C2412 power management 188 Internal config node to apply S3C2412 power management
193 189
194config CPU_S3C2412 190config CPU_S3C2412
195 bool 191 bool
196 depends on ARCH_S3C2410 192 depends on ARCH_S3C2410
193 select S3C2412_PM if PM
197 help 194 help
198 Support for the S3C2412 and S3C2413 SoCs from the S3C24XX line 195 Support for the S3C2412 and S3C2413 SoCs from the S3C24XX line
199 196
@@ -207,7 +204,7 @@ config CPU_S3C2440
207 bool 204 bool
208 depends on ARCH_S3C2410 205 depends on ARCH_S3C2410
209 select S3C2410_CLOCK 206 select S3C2410_CLOCK
210 select S3C2410_PM 207 select S3C2410_PM if PM
211 select CPU_S3C244X 208 select CPU_S3C244X
212 help 209 help
213 Support for S3C2440 Samsung Mobile CPU based systems. 210 Support for S3C2440 Samsung Mobile CPU based systems.
@@ -216,7 +213,7 @@ config CPU_S3C2442
216 bool 213 bool
217 depends on ARCH_S3C2420 214 depends on ARCH_S3C2420
218 select S3C2410_CLOCK 215 select S3C2410_CLOCK
219 select S3C2410_PM 216 select S3C2410_PM if PM
220 select CPU_S3C244X 217 select CPU_S3C244X
221 help 218 help
222 Support for S3C2442 Samsung Mobile CPU based systems. 219 Support for S3C2442 Samsung Mobile CPU based systems.