summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/Kconfig
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-09-11 12:38:45 +0200
committerTakashi Iwai <tiwai@suse.de>2013-09-11 12:38:45 +0200
commit3d0049e8529adaa36c38a7b400792f6c37b66c92 (patch)
tree7d2e30a5e3f12207305ffc76d80d310c0a95fdcc /arch/powerpc/Kconfig
parentbe8cf44526d8972c2dbf6e561162dad924a712a5 (diff)
parent2ae2caff8348378c9e464353e9860ee97583c00b (diff)
downloadop-kernel-dev-3d0049e8529adaa36c38a7b400792f6c37b66c92.zip
op-kernel-dev-3d0049e8529adaa36c38a7b400792f6c37b66c92.tar.gz
Merge tag 'asoc-v3.12-4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.12 A few small fixes, nothing with any broad impact but all useful for the affected systems. The Kirkwood compatible string change is fixing up a string just added in the merge window so that we don't get any changes in released kernels.
Diffstat (limited to 'arch/powerpc/Kconfig')
-rw-r--r--arch/powerpc/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index dbd9d3c..9cf59816d 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -979,6 +979,7 @@ config RELOCATABLE
must live at a different physical address than the primary
kernel.
+# This value must have zeroes in the bottom 60 bits otherwise lots will break
config PAGE_OFFSET
hex
default "0xc000000000000000"
OpenPOWER on IntegriCloud