[kernel/f15] Disable CONFIG_HID_BATTERY_STRENGTH (rhbz 806295)

[Josh Boyer]

commit e417ace608ad628741e22ad5e32aa58e8e497f69
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Wed Apr 18 09:49:29 2012 -0400

    Disable CONFIG_HID_BATTERY_STRENGTH (rhbz 806295)

 disable-hid-battery.patch |   11 +++++++++++
 kernel.spec               |   11 ++++++++++-
 2 files changed, 21 insertions(+), 1 deletions(-)
---
diff --git a/disable-hid-battery.patch b/disable-hid-battery.patch
new file mode 100644
index 0000000..98fe213
--- /dev/null
+++ b/disable-hid-battery.patch
@@ -0,0 +1,11 @@
+--- linux-2.6.43.noarch.orig/drivers/hid/Kconfig
++++ linux-2.6.43.noarch/drivers/hid/Kconfig
+@@ -34,7 +34,7 @@ config HID
+ config HID_BATTERY_STRENGTH
+ 	bool
+ 	depends on HID && POWER_SUPPLY && HID = POWER_SUPPLY
+-	default y
++	default n
+ 
+ config HIDRAW
+ 	bool "/dev/hidraw raw HID device support"
diff --git a/kernel.spec b/kernel.spec
index 7f7fb2f..c6112c3 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 3
+%global baserelease 4
 %global fedora_build %{baserelease}
 
 # real_sublevel is the 3.x kernel version we're starting with
@@ -708,6 +708,9 @@ Patch21530: ALSA-hda-realtek-Add-quirk-for-Mac-Pro-5-1-machines.patch
 Patch21700: x86-microcode-Fix-sysfs-warning-during-module-unload-on-unsupported-CPUs.patch
 Patch21701: x86-microcode-Ensure-that-module-is-only-loaded-for-supported-AMD-CPUs.patch
 
+#rhbz 806295
+Patch21710: disable-hid-battery.patch
+
 Patch22000: weird-root-dentry-name-debug.patch
 
 # END OF PATCH DEFINITIONS
@@ -1313,6 +1316,9 @@ ApplyPatch x86-Use-correct-byte-sized-register-constraint-in-__add.patch
 ApplyPatch x86-microcode-Fix-sysfs-warning-during-module-unload-on-unsupported-CPUs.patch
 ApplyPatch x86-microcode-Ensure-that-module-is-only-loaded-for-supported-AMD-CPUs.patch
 
+#rhbz 806295
+ApplyPatch disable-hid-battery.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1965,6 +1971,9 @@ fi
 # and build.
 
 %changelog
+* Wed Apr 18 2012 Josh Boyer <jwboyer at redhat.com>
+- Disable CONFIG_HID_BATTERY_STRENGTH (rhbz 806295)
+
 * Tue Apr 17 2012 Josh Boyer <jwboyer at redhat.com>
 - Fix oops in nfs_have_delegation (rhbz 811138)
 - Fix oops on invalid AMD microcode load (rhbz 797559)