diff --git a/config-generic b/config-generic index fbddfa25a..8b8fd36e9 100644 --- a/config-generic +++ b/config-generic @@ -4221,7 +4221,8 @@ CONFIG_UWB_I1480U=m CONFIG_STAGING=y # CONFIG_RTLLIB is not set # CONFIG_ANDROID is not set -# 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 3a52a76ce..e9e100fdd 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2278,6 +2278,7 @@ fi %changelog * Tue Jan 24 2012 Josh Boyer - Re-enable the ARCMSR module (rhbz 784287) +- Re-enable the LIRC_STAGING drivers (rhbz 784398) * Tue Jan 24 2012 Josh Boyer - 3.3.0-0.rc1.git1.1 - Linux 3.3-rc1-git1 (upstream c1aab02dac690af7ff634d8e1cb3be6a04387eef)