diff --git a/[refs] b/[refs] index 7de2cf7c6b8d..01ab61f8a7ad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ea2e79fb3299f5ad57f22f9a587221c55106d831 +refs/heads/master: b9124eaa1b18e24bb670a962e2f461963703efcc diff --git a/trunk/drivers/media/platform/s5p-tv/Kconfig b/trunk/drivers/media/platform/s5p-tv/Kconfig index ea11a513033f..7b659bd09bfd 100644 --- a/trunk/drivers/media/platform/s5p-tv/Kconfig +++ b/trunk/drivers/media/platform/s5p-tv/Kconfig @@ -7,9 +7,8 @@ # Licensed under GPL config VIDEO_SAMSUNG_S5P_TV - bool "Samsung TV driver for S5P platform (experimental)" + bool "Samsung TV driver for S5P platform" depends on PLAT_S5P && PM_RUNTIME - depends on EXPERIMENTAL default n ---help--- Say Y here to enable selecting the TV output devices for