diff options
| author | Grant Likely <grant.likely@linaro.org> | 2013-08-28 15:18:13 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2013-08-28 15:18:13 -0400 |
| commit | 8be137f2664f0abb096626a9d2ce0fcdd955b109 (patch) | |
| tree | 2c53a5535265a58eb397d6fbbab2ec26e92e6931 /arch/openrisc | |
| parent | 8851b9f1625ce0858e9b1bb0ae4a57d4b43178b1 (diff) | |
| parent | d8dfad3876e4386666b759da3c833d62fb8b2267 (diff) | |
Merge tag 'v3.11-rc7' into devicetree/next
Linux 3.11-rc7
Diffstat (limited to 'arch/openrisc')
| -rw-r--r-- | arch/openrisc/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig index 99dbab1c59ac..d60bf98fa5cf 100644 --- a/arch/openrisc/Kconfig +++ b/arch/openrisc/Kconfig | |||
| @@ -55,6 +55,7 @@ config GENERIC_CSUM | |||
| 55 | 55 | ||
| 56 | source "init/Kconfig" | 56 | source "init/Kconfig" |
| 57 | 57 | ||
| 58 | source "kernel/Kconfig.freezer" | ||
| 58 | 59 | ||
| 59 | menu "Processor type and features" | 60 | menu "Processor type and features" |
| 60 | 61 | ||