From 940319a74355dc6eb895bff88561a06e53fab4bd Mon Sep 17 00:00:00 2001
From: Ben Hutchings <benh@debian.org>
Date: Fri, 22 Mar 2013 01:16:31 +0000
Subject: [PATCH] [x86,powerpc/powerpc64] random: Change HW_RANDOM back from
 built-in to module, as we now have a real fix for #701784

svn path=/dists/sid/linux/; revision=19934
---
 debian/changelog                       | 2 ++
 debian/config/kernelarch-x86/config    | 2 +-
 debian/config/powerpc/config.powerpc64 | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4464e0020..ddd804baa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -114,6 +114,8 @@ linux (3.2.41-1) UNRELEASED; urgency=low
   * vhost/net: fix heads usage of ubuf_info
   * udf: avoid info leak on export (CVE-2012-6548)
   * isofs: avoid info leak on export (CVE-2012-6549)
+  * [x86,powerpc/powerpc64] random: Change HW_RANDOM back from built-in to
+    module, as we now have a real fix for #701784
 
  -- Ben Hutchings <ben@decadent.org.uk>  Wed, 27 Feb 2013 03:48:30 +0000
 
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index 77d0945a1..0aadf769b 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -293,7 +293,7 @@ CONFIG_AGP_VIA=y
 ##
 ## file: drivers/char/hw_random/Kconfig
 ##
-CONFIG_HW_RANDOM=y
+CONFIG_HW_RANDOM=m
 CONFIG_HW_RANDOM_INTEL=m
 CONFIG_HW_RANDOM_AMD=m
 CONFIG_HW_RANDOM_GEODE=m
diff --git a/debian/config/powerpc/config.powerpc64 b/debian/config/powerpc/config.powerpc64
index 2bdb29fcf..5b29c839b 100644
--- a/debian/config/powerpc/config.powerpc64
+++ b/debian/config/powerpc/config.powerpc64
@@ -95,7 +95,7 @@ CONFIG_PATA_AMD=m
 ##
 ## file: drivers/char/hw_random/Kconfig
 ##
-CONFIG_HW_RANDOM=y
+CONFIG_HW_RANDOM=m
 CONFIG_HW_RANDOM_PASEMI=m
 
 ##