diff --git a/[refs] b/[refs] index 998bcbcc502e..6b2b413d6ba8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aced3cee555f0b2fd58501e9b8a8a1295011e134 +refs/heads/master: f2fc0e3071230bb9ea9f64a08c3e619ad1357cfb diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig index df952e788a64..8e6413e0e7cb 100644 --- a/trunk/arch/x86/Kconfig +++ b/trunk/arch/x86/Kconfig @@ -144,7 +144,6 @@ config ARCH_HIBERNATION_POSSIBLE config ARCH_SUSPEND_POSSIBLE def_bool y - depends on !X86_VOYAGER config ZONE_DMA32 bool