projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'renesas-soc2-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
arch
/
x86
/
Kconfig
diff --git
a/arch/x86/Kconfig
b/arch/x86/Kconfig
index
fcefdda
..
a8f749e
100644
(file)
--- a/
arch/x86/Kconfig
+++ b/
arch/x86/Kconfig
@@
-1672,7
+1672,6
@@
config RELOCATABLE
config RANDOMIZE_BASE
bool "Randomize the address of the kernel image"
depends on RELOCATABLE
- depends on !HIBERNATION
default n
---help---
Randomizes the physical and virtual address at which the