[kernel/f16] Re-enable the LIRC_STAGING drivers (rhbz 784398)

[Josh Boyer]

commit bb1165406c967187c01391de51bb170064112ee9
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Tue Jan 24 14:33:03 2012 -0500

    Re-enable the LIRC_STAGING drivers (rhbz 784398)

 config-generic |    3 ++-
 kernel.spec    |    1 +
 2 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/config-generic b/config-generic
index 5cf2577..bd2c476 100644
--- a/config-generic
+++ b/config-generic
@@ -4408,7 +4408,8 @@ CONFIG_UWB_WHCI=m
 CONFIG_UWB_I1480U=m
 
 CONFIG_STAGING=y
-# CONFIG_STAGING_MEDIA is not set
+CONFIG_STAGING_MEDIA=y
+# CONFIG_DVB_AS102 is not set
 # CONFIG_ET131X is not set
 # CONFIG_SLICOSS is not set
 # CONFIG_WLAGS49_H2 is not set
diff --git a/kernel.spec b/kernel.spec
index c254a99..ef9e2ea 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2298,6 +2298,7 @@ fi
 * Tue Jan 24 2012 Josh Boyer <jwboyer at redhat.com>
 - Re-enable the ARCMSR module (rhbz 784287)
 - Add back a set of patches that were erroneously dropped during the rebase
+- Re-enable the LIRC_STAGING drivers (rhbz 784398)
 
 * Mon Jan 23 2012 Josh Boyer <jwboyer at redhat.com> 3.2.1-3
 - Fix oops in iwlwifi/iwlagn driver (rhbz 766071)