diff options
| author | Chris Zankel <chris@zankel.net> | 2014-12-16 05:10:39 +0100 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2014-12-16 05:10:39 +0100 |
| commit | 2cb54e8493615484fd3e29f1f51d96201706b419 (patch) | |
| tree | 00a5e7ce228628d5850a9de397eba8d2f2ade0b9 /arch/xtensa/Kconfig | |
| parent | Merge tag 'v3.18' into for_next (diff) | |
| parent | xtensa: fix kmap_prot definition (diff) | |
| download | linux-2cb54e8493615484fd3e29f1f51d96201706b419.tar.xz linux-2cb54e8493615484fd3e29f1f51d96201706b419.zip | |
Merge tag 'xtensa-for-next-20141213' of git://github.com/jcmvbkbc/linux-xtensa into for_next
Xtensa improvements for 3.19:
- fix permissions for kmapped pages so that copy_to_user_page works with
them;
- add power management menu to Kconfig to allow use of runtime PM.
Diffstat (limited to 'arch/xtensa/Kconfig')
| -rw-r--r-- | arch/xtensa/Kconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig index 8cdbc4cc830c..e31d4949124a 100644 --- a/arch/xtensa/Kconfig +++ b/arch/xtensa/Kconfig @@ -436,6 +436,12 @@ source "fs/Kconfig.binfmt" endmenu +menu "Power management options" + +source "kernel/power/Kconfig" + +endmenu + source "net/Kconfig" source "drivers/Kconfig" |