diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-11-11 17:54:07 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-11-11 17:54:07 -0500 |
commit | 6751718932be7325c898e5908daec2ee917afd09 (patch) | |
tree | d5d8b06faec5d8698a8f739b481627aea8f227b6 /arch | |
parent | 8cc05f79d2a4e33d5cb621f36a448d5157f46893 (diff) |
[ARM] Remove PM_LEGACY=y from selected ARM defconfigs
Most ARM defconfigs don't actually need to have PM_LEGACY enabled.
Disable it for ATEB9200, Collie, IXP4xx, OMAP H2, S3C2410 and
Versatile.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/configs/ateb9200_defconfig | 2 | ||||
-rw-r--r-- | arch/arm/configs/collie_defconfig | 2 | ||||
-rw-r--r-- | arch/arm/configs/ixp4xx_defconfig | 6 | ||||
-rw-r--r-- | arch/arm/configs/omap_h2_1610_defconfig | 2 | ||||
-rw-r--r-- | arch/arm/configs/s3c2410_defconfig | 2 | ||||
-rw-r--r-- | arch/arm/configs/versatile_defconfig | 2 |
6 files changed, 7 insertions, 9 deletions
diff --git a/arch/arm/configs/ateb9200_defconfig b/arch/arm/configs/ateb9200_defconfig index 15e6b0bbbde8..3de5c643848c 100644 --- a/arch/arm/configs/ateb9200_defconfig +++ b/arch/arm/configs/ateb9200_defconfig | |||
@@ -217,7 +217,7 @@ CONFIG_BINFMT_ELF=y | |||
217 | # Power management options | 217 | # Power management options |
218 | # | 218 | # |
219 | CONFIG_PM=y | 219 | CONFIG_PM=y |
220 | CONFIG_PM_LEGACY=y | 220 | # CONFIG_PM_LEGACY is not set |
221 | # CONFIG_PM_DEBUG is not set | 221 | # CONFIG_PM_DEBUG is not set |
222 | # CONFIG_APM is not set | 222 | # CONFIG_APM is not set |
223 | 223 | ||
diff --git a/arch/arm/configs/collie_defconfig b/arch/arm/configs/collie_defconfig index 074c47a4fb2e..a3758913c0bb 100644 --- a/arch/arm/configs/collie_defconfig +++ b/arch/arm/configs/collie_defconfig | |||
@@ -219,7 +219,7 @@ CONFIG_BINFMT_ELF=y | |||
219 | # Power management options | 219 | # Power management options |
220 | # | 220 | # |
221 | CONFIG_PM=y | 221 | CONFIG_PM=y |
222 | CONFIG_PM_LEGACY=y | 222 | # CONFIG_PM_LEGACY is not set |
223 | # CONFIG_PM_DEBUG is not set | 223 | # CONFIG_PM_DEBUG is not set |
224 | CONFIG_APM=y | 224 | CONFIG_APM=y |
225 | 225 | ||
diff --git a/arch/arm/configs/ixp4xx_defconfig b/arch/arm/configs/ixp4xx_defconfig index 4975b914f923..fac7c3b240c0 100644 --- a/arch/arm/configs/ixp4xx_defconfig +++ b/arch/arm/configs/ixp4xx_defconfig | |||
@@ -206,10 +206,8 @@ CONFIG_BINFMT_ELF=y | |||
206 | # | 206 | # |
207 | # Power management options | 207 | # Power management options |
208 | # | 208 | # |
209 | CONFIG_PM=y | 209 | # CONFIG_PM is not set |
210 | CONFIG_PM_LEGACY=y | 210 | # CONFIG_APM is not set |
211 | # CONFIG_PM_DEBUG is not set | ||
212 | CONFIG_APM=y | ||
213 | 211 | ||
214 | # | 212 | # |
215 | # Networking | 213 | # Networking |
diff --git a/arch/arm/configs/omap_h2_1610_defconfig b/arch/arm/configs/omap_h2_1610_defconfig index 05adb0b34e72..b0efd4ca9935 100644 --- a/arch/arm/configs/omap_h2_1610_defconfig +++ b/arch/arm/configs/omap_h2_1610_defconfig | |||
@@ -257,7 +257,7 @@ CONFIG_BINFMT_AOUT=y | |||
257 | # Power management options | 257 | # Power management options |
258 | # | 258 | # |
259 | CONFIG_PM=y | 259 | CONFIG_PM=y |
260 | CONFIG_PM_LEGACY=y | 260 | # CONFIG_PM_LEGACY is not set |
261 | # CONFIG_PM_DEBUG is not set | 261 | # CONFIG_PM_DEBUG is not set |
262 | # CONFIG_APM is not set | 262 | # CONFIG_APM is not set |
263 | 263 | ||
diff --git a/arch/arm/configs/s3c2410_defconfig b/arch/arm/configs/s3c2410_defconfig index 0563c14395e1..c0152393e494 100644 --- a/arch/arm/configs/s3c2410_defconfig +++ b/arch/arm/configs/s3c2410_defconfig | |||
@@ -258,7 +258,7 @@ CONFIG_BINFMT_AOUT=y | |||
258 | # Power management options | 258 | # Power management options |
259 | # | 259 | # |
260 | CONFIG_PM=y | 260 | CONFIG_PM=y |
261 | CONFIG_PM_LEGACY=y | 261 | # CONFIG_PM_LEGACY is not set |
262 | # CONFIG_PM_DEBUG is not set | 262 | # CONFIG_PM_DEBUG is not set |
263 | # CONFIG_PM_SYSFS_DEPRECATED is not set | 263 | # CONFIG_PM_SYSFS_DEPRECATED is not set |
264 | CONFIG_APM=y | 264 | CONFIG_APM=y |
diff --git a/arch/arm/configs/versatile_defconfig b/arch/arm/configs/versatile_defconfig index 96b7a7762426..f7bf6ef27d19 100644 --- a/arch/arm/configs/versatile_defconfig +++ b/arch/arm/configs/versatile_defconfig | |||
@@ -200,7 +200,7 @@ CONFIG_BINFMT_ELF=y | |||
200 | # Power management options | 200 | # Power management options |
201 | # | 201 | # |
202 | CONFIG_PM=y | 202 | CONFIG_PM=y |
203 | CONFIG_PM_LEGACY=y | 203 | # CONFIG_PM_LEGACY is not set |
204 | # CONFIG_PM_DEBUG is not set | 204 | # CONFIG_PM_DEBUG is not set |
205 | # CONFIG_APM is not set | 205 | # CONFIG_APM is not set |
206 | 206 | ||