diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-04-22 20:08:44 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-04-22 20:08:44 -0400 |
| commit | 6c9468e9eb1252eaefd94ce7f06e1be9b0b641b1 (patch) | |
| tree | 797676a336b050bfa1ef879377c07e541b9075d6 /arch/arm/configs/n770_defconfig | |
| parent | 4cb3ca7cd7e2cae8d1daf5345ec99a1e8502cf3f (diff) | |
| parent | c81eddb0e3728661d1585fbc564449c94165cc36 (diff) | |
Merge branch 'master' into for-next
Diffstat (limited to 'arch/arm/configs/n770_defconfig')
| -rw-r--r-- | arch/arm/configs/n770_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/n770_defconfig b/arch/arm/configs/n770_defconfig index 75cae18fbcb6..de0c28aa43e7 100644 --- a/arch/arm/configs/n770_defconfig +++ b/arch/arm/configs/n770_defconfig | |||
| @@ -308,6 +308,7 @@ CONFIG_PM_SLEEP=y | |||
| 308 | CONFIG_SUSPEND_UP_POSSIBLE=y | 308 | CONFIG_SUSPEND_UP_POSSIBLE=y |
| 309 | CONFIG_SUSPEND=y | 309 | CONFIG_SUSPEND=y |
| 310 | # CONFIG_APM_EMULATION is not set | 310 | # CONFIG_APM_EMULATION is not set |
| 311 | CONFIG_PM_RUNTIME=y | ||
| 311 | 312 | ||
| 312 | # | 313 | # |
| 313 | # Networking | 314 | # Networking |