[kernel/f15] Fixup acpi patch to select CPU_FREQ_TABLE so we don't get an undefined link error

[Josh Boyer]

commit 1c814032e0c813db3a0d705d2890c51aaef15168
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Tue Aug 30 10:18:01 2011 -0400

    Fixup acpi patch to select CPU_FREQ_TABLE so we don't get an undefined link
    error

 acpi-ensure-thermal-limits-match-cpu-freq.patch |   22 ++++++++++++++++++++--
 kernel.spec                                     |    5 ++++-
 2 files changed, 24 insertions(+), 3 deletions(-)
---
diff --git a/acpi-ensure-thermal-limits-match-cpu-freq.patch b/acpi-ensure-thermal-limits-match-cpu-freq.patch
index 3945af1..9d97b60 100644
--- a/acpi-ensure-thermal-limits-match-cpu-freq.patch
+++ b/acpi-ensure-thermal-limits-match-cpu-freq.patch
@@ -1,3 +1,8 @@
+From 9a056a5843ff83db987d6e18625f4a2ee64b5450 Mon Sep 17 00:00:00 2001
+From: Matthew Garrett <mjg at redhat.com>
+Date: Tue, 30 Aug 2011 10:07:24 -0400
+Subject: [PATCH] ACPI: Ensure thermal limits match CPU frequencies
+
 The ACPI thermal management code supports slowing down a CPU when it's
 overheating. Right now that's done by choosing to run it at 100%, 75%, 50%
 or 25% of full speed. However, most CPUs do not allow an arbitrary
@@ -9,9 +14,22 @@ so it uses actual frequencies rather than percentages.
 Reported by: Gene Snider <snider6982 at comcast.net>
 Signed-off-by: Matthew Garrett <mjg at redhat.com>
 ---
+ drivers/acpi/Kconfig             |    1 +
  drivers/acpi/processor_thermal.c |   45 +++++++++++++++++++++----------------
- 1 files changed, 25 insertions(+), 20 deletions(-)
+ 2 files changed, 26 insertions(+), 20 deletions(-)
 
+diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
+index de0e3df..7d1bdb5 100644
+--- a/drivers/acpi/Kconfig
++++ b/drivers/acpi/Kconfig
+@@ -185,6 +185,7 @@ config ACPI_PROCESSOR
+ 	tristate "Processor"
+ 	select THERMAL
+ 	select CPU_IDLE
++	select CPU_FREQ_TABLE
+ 	default y
+ 	help
+ 	  This driver installs ACPI as the idle handler for Linux and uses
 diff --git a/drivers/acpi/processor_thermal.c b/drivers/acpi/processor_thermal.c
 index 870550d..1c4eb60 100644
 --- a/drivers/acpi/processor_thermal.c
@@ -124,5 +142,5 @@ index 870550d..1c4eb60 100644
  	if (pr->flags.throttling)
  		max_state += (pr->throttling.state_count -1);
 -- 
-1.7.6.1
+1.7.6
 
diff --git a/kernel.spec b/kernel.spec
index c1a0e15..2ec686e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -42,7 +42,7 @@ Summary: The Linux kernel
 # When changing real_sublevel below, reset this by hand to 1
 # (or to 0 and then use rpmdev-bumpspec).
 #
-%global baserelease 4
+%global baserelease 5
 %global fedora_build %{baserelease}
 
 # real_sublevel is the 3.x kernel version we're starting with
@@ -1857,6 +1857,9 @@ fi
 # and build.
 
 %changelog
+* Tue Aug 30 2011 Josh Boyer <jwboyer at redhat.com> 2.6.40.4-5
+- Fix kconfig error in patch for rhbz 606017
+
 * Tue Aug 30 2011 Chuck Ebbert <cebbert at redhat.com> 2.6.40.4-4
 - Fix unsafe pointer access in sendmsg/sendmmsg