aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@s-opensource.com>2017-12-14 15:31:16 (GMT)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2017-12-14 15:31:16 (GMT)
commite4100f4213579abad4a1b3e25a387a78075c9f0b (patch)
tree0d26109ab05ae7eb5553203a53b28a36501faf49
parentbce71de364494554ee59fb41f633188eb7de1d58 (diff)
media: staging: fix a merge conflictold/cs_e4100f421357
Lirc is not at staging anymore. Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
-rw-r--r--drivers/staging/media/Kconfig3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig
index 3d11355..227437f 100644
--- a/drivers/staging/media/Kconfig
+++ b/drivers/staging/media/Kconfig
@@ -33,7 +33,4 @@ source "drivers/staging/media/omap4iss/Kconfig"
source "drivers/staging/media/tegra-vde/Kconfig"
-# Keep LIRC at the end, as it has sub-menus
-source "drivers/staging/media/lirc/Kconfig"
-
endif

Privacy Policy