diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-11-29 13:44:00 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-11-29 13:44:00 -0800 |
| commit | af768c6711de615abf9c679732a2f8245a4c286c (patch) | |
| tree | 326f064955adb4a40045fa2a23ca6b358cd26bcb /arch/arm/configs/integrator_defconfig | |
| parent | f5d6c63a67a8f124ddae88511427249d1dd87880 (diff) | |
| parent | aed6fad8beca30a71a6950b6f650822254efa8c6 (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] 3943/1: share declaration of struct pxa2xx_udc_mach_info between multiple platforms
[ARM] Export smp_call_function()
[ARM] Add PM_LEGACY defaults
Diffstat (limited to 'arch/arm/configs/integrator_defconfig')
| -rw-r--r-- | arch/arm/configs/integrator_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/integrator_defconfig b/arch/arm/configs/integrator_defconfig index d1ba7fdde81..692ab57ba1c 100644 --- a/arch/arm/configs/integrator_defconfig +++ b/arch/arm/configs/integrator_defconfig @@ -190,6 +190,7 @@ CONFIG_BINFMT_ELF=y # Power management options # CONFIG_PM=y +# CONFIG_PM_LEGACY is not set # CONFIG_APM is not set # |