diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-11-25 11:19:23 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-11-26 11:39:00 -0500 |
commit | d00ec458cb9235025d20cf2783d3ddcd879a6c48 (patch) | |
tree | 503bc7ab685272437dc264515eaa0d9ca3586fac | |
parent | 5d48545e5e88ab7a27ba6a5cb1e8fff617754b61 (diff) |
[ARM] Add PM_LEGACY defaults
Eliminate two warnings:
kernel/power/pm.c:205: warning: 'pm_register' is deprecated (declared at kernel/power/pm.c:64)
kernel/power/pm.c:206: warning: 'pm_send_all' is deprecated (declared at kernel/power/pm.c:180)
by updating defconfig files to contain a sensible PM_LEGACY default.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r-- | arch/arm/configs/assabet_defconfig | 1 | ||||
-rw-r--r-- | arch/arm/configs/cerfcube_defconfig | 1 | ||||
-rw-r--r-- | arch/arm/configs/corgi_defconfig | 1 | ||||
-rw-r--r-- | arch/arm/configs/h3600_defconfig | 1 | ||||
-rw-r--r-- | arch/arm/configs/integrator_defconfig | 1 | ||||
-rw-r--r-- | arch/arm/configs/jornada720_defconfig | 1 | ||||
-rw-r--r-- | arch/arm/configs/lart_defconfig | 1 | ||||
-rw-r--r-- | arch/arm/configs/neponset_defconfig | 1 | ||||
-rw-r--r-- | arch/arm/configs/simpad_defconfig | 1 | ||||
-rw-r--r-- | arch/arm/configs/spitz_defconfig | 1 |
10 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/configs/assabet_defconfig b/arch/arm/configs/assabet_defconfig index 089c9d598409..b1cd331aaecf 100644 --- a/arch/arm/configs/assabet_defconfig +++ b/arch/arm/configs/assabet_defconfig | |||
@@ -184,6 +184,7 @@ CONFIG_BINFMT_ELF=y | |||
184 | # Power management options | 184 | # Power management options |
185 | # | 185 | # |
186 | CONFIG_PM=y | 186 | CONFIG_PM=y |
187 | # CONFIG_PM_LEGACY is not set | ||
187 | # CONFIG_APM is not set | 188 | # CONFIG_APM is not set |
188 | 189 | ||
189 | # | 190 | # |
diff --git a/arch/arm/configs/cerfcube_defconfig b/arch/arm/configs/cerfcube_defconfig index f81a60005cd3..09b7acd7f647 100644 --- a/arch/arm/configs/cerfcube_defconfig +++ b/arch/arm/configs/cerfcube_defconfig | |||
@@ -194,6 +194,7 @@ CONFIG_BINFMT_ELF=y | |||
194 | # Power management options | 194 | # Power management options |
195 | # | 195 | # |
196 | CONFIG_PM=y | 196 | CONFIG_PM=y |
197 | # CONFIG_PM_LEGACY is not set | ||
197 | # CONFIG_APM is not set | 198 | # CONFIG_APM is not set |
198 | 199 | ||
199 | # | 200 | # |
diff --git a/arch/arm/configs/corgi_defconfig b/arch/arm/configs/corgi_defconfig index 3c3461e83398..c41c04fa5020 100644 --- a/arch/arm/configs/corgi_defconfig +++ b/arch/arm/configs/corgi_defconfig | |||
@@ -208,6 +208,7 @@ CONFIG_BINFMT_MISC=m | |||
208 | # Power management options | 208 | # Power management options |
209 | # | 209 | # |
210 | CONFIG_PM=y | 210 | CONFIG_PM=y |
211 | # CONFIG_PM_LEGACY is not set | ||
211 | CONFIG_APM=y | 212 | CONFIG_APM=y |
212 | 213 | ||
213 | # | 214 | # |
diff --git a/arch/arm/configs/h3600_defconfig b/arch/arm/configs/h3600_defconfig index 7a0da0b7facb..8f986e9f1c62 100644 --- a/arch/arm/configs/h3600_defconfig +++ b/arch/arm/configs/h3600_defconfig | |||
@@ -194,6 +194,7 @@ CONFIG_BINFMT_ELF=y | |||
194 | # Power management options | 194 | # Power management options |
195 | # | 195 | # |
196 | CONFIG_PM=y | 196 | CONFIG_PM=y |
197 | # CONFIG_PM_LEGACY is not set | ||
197 | # CONFIG_APM is not set | 198 | # CONFIG_APM is not set |
198 | 199 | ||
199 | # | 200 | # |
diff --git a/arch/arm/configs/integrator_defconfig b/arch/arm/configs/integrator_defconfig index d1ba7fdde818..692ab57ba1ca 100644 --- a/arch/arm/configs/integrator_defconfig +++ b/arch/arm/configs/integrator_defconfig | |||
@@ -190,6 +190,7 @@ CONFIG_BINFMT_ELF=y | |||
190 | # Power management options | 190 | # Power management options |
191 | # | 191 | # |
192 | CONFIG_PM=y | 192 | CONFIG_PM=y |
193 | # CONFIG_PM_LEGACY is not set | ||
193 | # CONFIG_APM is not set | 194 | # CONFIG_APM is not set |
194 | 195 | ||
195 | # | 196 | # |
diff --git a/arch/arm/configs/jornada720_defconfig b/arch/arm/configs/jornada720_defconfig index ad1048db96fb..80a6fd97eb32 100644 --- a/arch/arm/configs/jornada720_defconfig +++ b/arch/arm/configs/jornada720_defconfig | |||
@@ -182,6 +182,7 @@ CONFIG_BINFMT_AOUT=m | |||
182 | # Power management options | 182 | # Power management options |
183 | # | 183 | # |
184 | CONFIG_PM=y | 184 | CONFIG_PM=y |
185 | # CONFIG_PM_LEGACY is not set | ||
185 | # CONFIG_APM is not set | 186 | # CONFIG_APM is not set |
186 | 187 | ||
187 | # | 188 | # |
diff --git a/arch/arm/configs/lart_defconfig b/arch/arm/configs/lart_defconfig index c3a932844160..a1cc34f25602 100644 --- a/arch/arm/configs/lart_defconfig +++ b/arch/arm/configs/lart_defconfig | |||
@@ -180,6 +180,7 @@ CONFIG_BINFMT_AOUT=y | |||
180 | # Power management options | 180 | # Power management options |
181 | # | 181 | # |
182 | CONFIG_PM=y | 182 | CONFIG_PM=y |
183 | # CONFIG_PM_LEGACY is not set | ||
183 | CONFIG_APM=m | 184 | CONFIG_APM=m |
184 | 185 | ||
185 | # | 186 | # |
diff --git a/arch/arm/configs/neponset_defconfig b/arch/arm/configs/neponset_defconfig index 3d35255c64ed..df8168e57b7c 100644 --- a/arch/arm/configs/neponset_defconfig +++ b/arch/arm/configs/neponset_defconfig | |||
@@ -190,6 +190,7 @@ CONFIG_BINFMT_AOUT=y | |||
190 | # Power management options | 190 | # Power management options |
191 | # | 191 | # |
192 | CONFIG_PM=y | 192 | CONFIG_PM=y |
193 | # CONFIG_PM_LEGACY is not set | ||
193 | CONFIG_APM=y | 194 | CONFIG_APM=y |
194 | 195 | ||
195 | # | 196 | # |
diff --git a/arch/arm/configs/simpad_defconfig b/arch/arm/configs/simpad_defconfig index 2e5a616cc98d..140056a3507f 100644 --- a/arch/arm/configs/simpad_defconfig +++ b/arch/arm/configs/simpad_defconfig | |||
@@ -180,6 +180,7 @@ CONFIG_BINFMT_MISC=m | |||
180 | # Power management options | 180 | # Power management options |
181 | # | 181 | # |
182 | CONFIG_PM=y | 182 | CONFIG_PM=y |
183 | # CONFIG_PM_LEGACY is not set | ||
183 | CONFIG_APM=y | 184 | CONFIG_APM=y |
184 | 185 | ||
185 | # | 186 | # |
diff --git a/arch/arm/configs/spitz_defconfig b/arch/arm/configs/spitz_defconfig index d1ace3abfd8a..bd03238968c1 100644 --- a/arch/arm/configs/spitz_defconfig +++ b/arch/arm/configs/spitz_defconfig | |||
@@ -207,6 +207,7 @@ CONFIG_BINFMT_MISC=m | |||
207 | # Power management options | 207 | # Power management options |
208 | # | 208 | # |
209 | CONFIG_PM=y | 209 | CONFIG_PM=y |
210 | # CONFIG_PM_LEGACY is not set | ||
210 | CONFIG_APM=y | 211 | CONFIG_APM=y |
211 | 212 | ||
212 | # | 213 | # |