diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-11-16 12:22:52 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-11-16 12:22:52 -0800 |
| commit | 237ee312e10a86e69e01fc02e0daeb0fa3e7a6e8 (patch) | |
| tree | 8bc42df168da6bd8545e90487f1f7c324aba486c /arch/arm/configs/s3c2410_defconfig | |
| parent | d0cac32fa551b0e7dc1f014607eabb93b0ebbbe8 (diff) | |
| parent | aa8d18731508bb0a16f69b77e5f4541f0d6fb553 (diff) | |
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] Remove OP_MAX_COUNTER
[ARM] Remove PM_LEGACY=y from selected ARM defconfigs
[ARM] 3857/2: pnx4008: add devices' registration
Diffstat (limited to 'arch/arm/configs/s3c2410_defconfig')
| -rw-r--r-- | arch/arm/configs/s3c2410_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
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 # Power management options # CONFIG_PM=y -CONFIG_PM_LEGACY=y +# CONFIG_PM_LEGACY is not set # CONFIG_PM_DEBUG is not set # CONFIG_PM_SYSFS_DEPRECATED is not set CONFIG_APM=y |