summaryrefslogtreecommitdiffstats
path: root/arch/openrisc
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@linaro.org>2013-08-28 20:18:13 +0100
committerGrant Likely <grant.likely@linaro.org>2013-08-28 20:18:13 +0100
commit8be137f2664f0abb096626a9d2ce0fcdd955b109 (patch)
tree2c53a5535265a58eb397d6fbbab2ec26e92e6931 /arch/openrisc
parent8851b9f1625ce0858e9b1bb0ae4a57d4b43178b1 (diff)
parentd8dfad3876e4386666b759da3c833d62fb8b2267 (diff)
downloadblackbird-op-linux-8be137f2664f0abb096626a9d2ce0fcdd955b109.tar.gz
blackbird-op-linux-8be137f2664f0abb096626a9d2ce0fcdd955b109.zip
Merge tag 'v3.11-rc7' into devicetree/next
Linux 3.11-rc7
Diffstat (limited to 'arch/openrisc')
-rw-r--r--arch/openrisc/Kconfig1
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
source "init/Kconfig"
+source "kernel/Kconfig.freezer"
menu "Processor type and features"
OpenPOWER on IntegriCloud