diff options
| -rw-r--r-- | arch/arm/configs/cm_t35_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/n770_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/omap3_beagle_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/omap3_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/omap3_evm_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/omap3_touchbook_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/omap_3430sdp_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/omap_3630sdp_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/omap_h2_1610_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/omap_zoom2_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/omap_zoom3_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/rx51_defconfig | 1 |
12 files changed, 12 insertions, 5 deletions
diff --git a/arch/arm/configs/cm_t35_defconfig b/arch/arm/configs/cm_t35_defconfig index 893cd267e075..032b49bad91f 100644 --- a/arch/arm/configs/cm_t35_defconfig +++ b/arch/arm/configs/cm_t35_defconfig | |||
| @@ -358,7 +358,7 @@ CONFIG_PM_SLEEP=y | |||
| 358 | CONFIG_SUSPEND=y | 358 | CONFIG_SUSPEND=y |
| 359 | CONFIG_SUSPEND_FREEZER=y | 359 | CONFIG_SUSPEND_FREEZER=y |
| 360 | # CONFIG_APM_EMULATION is not set | 360 | # CONFIG_APM_EMULATION is not set |
| 361 | # CONFIG_PM_RUNTIME is not set | 361 | CONFIG_PM_RUNTIME=y |
| 362 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | 362 | CONFIG_ARCH_SUSPEND_POSSIBLE=y |
| 363 | CONFIG_NET=y | 363 | CONFIG_NET=y |
| 364 | 364 | ||
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 |
diff --git a/arch/arm/configs/omap3_beagle_defconfig b/arch/arm/configs/omap3_beagle_defconfig index c7999f5b1c9a..5a9e95fa728b 100644 --- a/arch/arm/configs/omap3_beagle_defconfig +++ b/arch/arm/configs/omap3_beagle_defconfig | |||
| @@ -324,6 +324,7 @@ CONFIG_PM_SLEEP=y | |||
| 324 | CONFIG_SUSPEND=y | 324 | CONFIG_SUSPEND=y |
| 325 | CONFIG_SUSPEND_FREEZER=y | 325 | CONFIG_SUSPEND_FREEZER=y |
| 326 | # CONFIG_APM_EMULATION is not set | 326 | # CONFIG_APM_EMULATION is not set |
| 327 | CONFIG_PM_RUNTIME=y | ||
| 327 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | 328 | CONFIG_ARCH_SUSPEND_POSSIBLE=y |
| 328 | CONFIG_NET=y | 329 | CONFIG_NET=y |
| 329 | 330 | ||
diff --git a/arch/arm/configs/omap3_defconfig b/arch/arm/configs/omap3_defconfig index 714835e5ebec..d6ad92177324 100644 --- a/arch/arm/configs/omap3_defconfig +++ b/arch/arm/configs/omap3_defconfig | |||
| @@ -450,7 +450,7 @@ CONFIG_SUSPEND=y | |||
| 450 | # CONFIG_PM_TEST_SUSPEND is not set | 450 | # CONFIG_PM_TEST_SUSPEND is not set |
| 451 | CONFIG_SUSPEND_FREEZER=y | 451 | CONFIG_SUSPEND_FREEZER=y |
| 452 | # CONFIG_APM_EMULATION is not set | 452 | # CONFIG_APM_EMULATION is not set |
| 453 | # CONFIG_PM_RUNTIME is not set | 453 | CONFIG_PM_RUNTIME=y |
| 454 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | 454 | CONFIG_ARCH_SUSPEND_POSSIBLE=y |
| 455 | CONFIG_NET=y | 455 | CONFIG_NET=y |
| 456 | 456 | ||
diff --git a/arch/arm/configs/omap3_evm_defconfig b/arch/arm/configs/omap3_evm_defconfig index e2ad859fbec6..a6dd6d1af806 100644 --- a/arch/arm/configs/omap3_evm_defconfig +++ b/arch/arm/configs/omap3_evm_defconfig | |||
| @@ -340,6 +340,7 @@ CONFIG_PM_SLEEP=y | |||
| 340 | CONFIG_SUSPEND=y | 340 | CONFIG_SUSPEND=y |
| 341 | CONFIG_SUSPEND_FREEZER=y | 341 | CONFIG_SUSPEND_FREEZER=y |
| 342 | # CONFIG_APM_EMULATION is not set | 342 | # CONFIG_APM_EMULATION is not set |
| 343 | CONFIG_PM_RUNTIME=y | ||
| 343 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | 344 | CONFIG_ARCH_SUSPEND_POSSIBLE=y |
| 344 | CONFIG_NET=y | 345 | CONFIG_NET=y |
| 345 | 346 | ||
diff --git a/arch/arm/configs/omap3_touchbook_defconfig b/arch/arm/configs/omap3_touchbook_defconfig index 74fe6be9c5ec..968fbaa8f04d 100644 --- a/arch/arm/configs/omap3_touchbook_defconfig +++ b/arch/arm/configs/omap3_touchbook_defconfig | |||
| @@ -368,7 +368,7 @@ CONFIG_SUSPEND=y | |||
| 368 | # CONFIG_PM_TEST_SUSPEND is not set | 368 | # CONFIG_PM_TEST_SUSPEND is not set |
| 369 | CONFIG_SUSPEND_FREEZER=y | 369 | CONFIG_SUSPEND_FREEZER=y |
| 370 | # CONFIG_APM_EMULATION is not set | 370 | # CONFIG_APM_EMULATION is not set |
| 371 | # CONFIG_PM_RUNTIME is not set | 371 | CONFIG_PM_RUNTIME=y |
| 372 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | 372 | CONFIG_ARCH_SUSPEND_POSSIBLE=y |
| 373 | CONFIG_NET=y | 373 | CONFIG_NET=y |
| 374 | 374 | ||
diff --git a/arch/arm/configs/omap_3430sdp_defconfig b/arch/arm/configs/omap_3430sdp_defconfig index bb2917e5cb47..ddde429a7d9b 100644 --- a/arch/arm/configs/omap_3430sdp_defconfig +++ b/arch/arm/configs/omap_3430sdp_defconfig | |||
| @@ -363,6 +363,7 @@ CONFIG_PM_SLEEP=y | |||
| 363 | CONFIG_SUSPEND=y | 363 | CONFIG_SUSPEND=y |
| 364 | CONFIG_SUSPEND_FREEZER=y | 364 | CONFIG_SUSPEND_FREEZER=y |
| 365 | # CONFIG_APM_EMULATION is not set | 365 | # CONFIG_APM_EMULATION is not set |
| 366 | CONFIG_PM_RUNTIME=y | ||
| 366 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | 367 | CONFIG_ARCH_SUSPEND_POSSIBLE=y |
| 367 | CONFIG_NET=y | 368 | CONFIG_NET=y |
| 368 | 369 | ||
diff --git a/arch/arm/configs/omap_3630sdp_defconfig b/arch/arm/configs/omap_3630sdp_defconfig index d25c3d4424ca..609f348b1055 100644 --- a/arch/arm/configs/omap_3630sdp_defconfig +++ b/arch/arm/configs/omap_3630sdp_defconfig | |||
| @@ -361,7 +361,7 @@ CONFIG_SUSPEND=y | |||
| 361 | # CONFIG_PM_TEST_SUSPEND is not set | 361 | # CONFIG_PM_TEST_SUSPEND is not set |
| 362 | CONFIG_SUSPEND_FREEZER=y | 362 | CONFIG_SUSPEND_FREEZER=y |
| 363 | # CONFIG_APM_EMULATION is not set | 363 | # CONFIG_APM_EMULATION is not set |
| 364 | # CONFIG_PM_RUNTIME is not set | 364 | CONFIG_PM_RUNTIME=y |
| 365 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | 365 | CONFIG_ARCH_SUSPEND_POSSIBLE=y |
| 366 | CONFIG_NET=y | 366 | CONFIG_NET=y |
| 367 | 367 | ||
diff --git a/arch/arm/configs/omap_h2_1610_defconfig b/arch/arm/configs/omap_h2_1610_defconfig index 523189586a4b..91ef2ed0f80a 100644 --- a/arch/arm/configs/omap_h2_1610_defconfig +++ b/arch/arm/configs/omap_h2_1610_defconfig | |||
| @@ -331,6 +331,7 @@ CONFIG_PM_SLEEP=y | |||
| 331 | CONFIG_SUSPEND=y | 331 | CONFIG_SUSPEND=y |
| 332 | CONFIG_SUSPEND_FREEZER=y | 332 | CONFIG_SUSPEND_FREEZER=y |
| 333 | # CONFIG_APM_EMULATION is not set | 333 | # CONFIG_APM_EMULATION is not set |
| 334 | CONFIG_PM_RUNTIME=y | ||
| 334 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | 335 | CONFIG_ARCH_SUSPEND_POSSIBLE=y |
| 335 | 336 | ||
| 336 | # | 337 | # |
diff --git a/arch/arm/configs/omap_zoom2_defconfig b/arch/arm/configs/omap_zoom2_defconfig index a82e81332a03..f5c6e11cf189 100644 --- a/arch/arm/configs/omap_zoom2_defconfig +++ b/arch/arm/configs/omap_zoom2_defconfig | |||
| @@ -343,6 +343,7 @@ CONFIG_SUSPEND=y | |||
| 343 | # CONFIG_PM_TEST_SUSPEND is not set | 343 | # CONFIG_PM_TEST_SUSPEND is not set |
| 344 | CONFIG_SUSPEND_FREEZER=y | 344 | CONFIG_SUSPEND_FREEZER=y |
| 345 | # CONFIG_APM_EMULATION is not set | 345 | # CONFIG_APM_EMULATION is not set |
| 346 | CONFIG_PM_RUNTIME=y | ||
| 346 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | 347 | CONFIG_ARCH_SUSPEND_POSSIBLE=y |
| 347 | CONFIG_NET=y | 348 | CONFIG_NET=y |
| 348 | 349 | ||
diff --git a/arch/arm/configs/omap_zoom3_defconfig b/arch/arm/configs/omap_zoom3_defconfig index ff8ac3dcc31d..ea9a5012d332 100644 --- a/arch/arm/configs/omap_zoom3_defconfig +++ b/arch/arm/configs/omap_zoom3_defconfig | |||
| @@ -361,7 +361,7 @@ CONFIG_SUSPEND=y | |||
| 361 | # CONFIG_PM_TEST_SUSPEND is not set | 361 | # CONFIG_PM_TEST_SUSPEND is not set |
| 362 | CONFIG_SUSPEND_FREEZER=y | 362 | CONFIG_SUSPEND_FREEZER=y |
| 363 | # CONFIG_APM_EMULATION is not set | 363 | # CONFIG_APM_EMULATION is not set |
| 364 | # CONFIG_PM_RUNTIME is not set | 364 | CONFIG_PM_RUNTIME=y |
| 365 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | 365 | CONFIG_ARCH_SUSPEND_POSSIBLE=y |
| 366 | CONFIG_NET=y | 366 | CONFIG_NET=y |
| 367 | 367 | ||
diff --git a/arch/arm/configs/rx51_defconfig b/arch/arm/configs/rx51_defconfig index 193bd334fbbf..45135ffadc57 100644 --- a/arch/arm/configs/rx51_defconfig +++ b/arch/arm/configs/rx51_defconfig | |||
| @@ -322,6 +322,7 @@ CONFIG_PM_SLEEP=y | |||
| 322 | CONFIG_SUSPEND=y | 322 | CONFIG_SUSPEND=y |
| 323 | CONFIG_SUSPEND_FREEZER=y | 323 | CONFIG_SUSPEND_FREEZER=y |
| 324 | # CONFIG_APM_EMULATION is not set | 324 | # CONFIG_APM_EMULATION is not set |
| 325 | CONFIG_PM_RUNTIME=y | ||
| 325 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | 326 | CONFIG_ARCH_SUSPEND_POSSIBLE=y |
| 326 | CONFIG_NET=y | 327 | CONFIG_NET=y |
| 327 | 328 | ||
