diff --git a/projects/Generic/linux/linux.x86_64.conf b/projects/Generic/linux/linux.x86_64.conf
index 94ab3be06c..ae02bae972 100644
--- a/projects/Generic/linux/linux.x86_64.conf
+++ b/projects/Generic/linux/linux.x86_64.conf
@@ -4412,9 +4412,7 @@ CONFIG_VT6656=m
 # CONFIG_SPEAKUP is not set
 CONFIG_STAGING_MEDIA=y
 CONFIG_DVB_CXD2099=m
-CONFIG_LIRC_STAGING=y
-# CONFIG_LIRC_ZILOG is not set
-CONFIG_LIRC_XBOX=m
+# CONFIG_LIRC_STAGING is not set
 
 #
 # Android
diff --git a/projects/RPi/devices/RPi/linux/linux.arm.conf b/projects/RPi/devices/RPi/linux/linux.arm.conf
index 13149b51e7..5ba95bd49a 100644
--- a/projects/RPi/devices/RPi/linux/linux.arm.conf
+++ b/projects/RPi/devices/RPi/linux/linux.arm.conf
@@ -3708,10 +3708,7 @@ CONFIG_VT6656=m
 #
 # CONFIG_SPEAKUP is not set
 CONFIG_STAGING_MEDIA=y
-CONFIG_LIRC_STAGING=y
-CONFIG_LIRC_RPI=m
-# CONFIG_LIRC_ZILOG is not set
-CONFIG_LIRC_XBOX=m
+# CONFIG_LIRC_STAGING is not set
 
 #
 # Android
diff --git a/projects/RPi/devices/RPi2/linux/linux.arm.conf b/projects/RPi/devices/RPi2/linux/linux.arm.conf
index 7399e64079..f95bc95a39 100644
--- a/projects/RPi/devices/RPi2/linux/linux.arm.conf
+++ b/projects/RPi/devices/RPi2/linux/linux.arm.conf
@@ -3801,10 +3801,7 @@ CONFIG_VT6656=m
 #
 # CONFIG_SPEAKUP is not set
 CONFIG_STAGING_MEDIA=y
-CONFIG_LIRC_STAGING=y
-CONFIG_LIRC_RPI=m
-# CONFIG_LIRC_ZILOG is not set
-CONFIG_LIRC_XBOX=m
+# CONFIG_LIRC_STAGING is not set
 
 #
 # Android