From 45ee6fc66b240fcc3e4b77d2a9a21d87c08b0946 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Tue, 9 Dec 2014 21:10:10 +0000 Subject: [PATCH] Remove obsolete config symbols from topconfig Most of these have been completely removed but: - HID_LENOVO_TPKBD was renamed to HID_LENOVO - VIDEO_VIVI was replaced with VIDEO_VIVID svn path=/dists/trunk/linux/; revision=22169 --- debian/changelog | 1 + debian/config/config | 41 ++++++----------------------------------- 2 files changed, 7 insertions(+), 35 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2779430ce..9df664ac3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,7 @@ linux (3.18-1~exp1) UNRELEASED; urgency=medium * wireless: Enable BRCMFMAC, BRCMFMAC_USB, BRCMFMAC_PCIE as modules * wireless: Enable RTL8192EE, RTL8821AE as modules for all architectures (replacing R8192EE, R8821AE for x86 only) + * media: Enable VIDEO_VIVID as module (replacing VIDEO_VIVI) -- Ben Hutchings Tue, 09 Dec 2014 02:08:47 +0000 diff --git a/debian/config/config b/debian/config/config index dfd231ed9..3639947e3 100644 --- a/debian/config/config +++ b/debian/config/config @@ -593,6 +593,7 @@ CONFIG_HID_ICADE=m CONFIG_HID_TWINHAN=m CONFIG_HID_KENSINGTON=y CONFIG_HID_LCPOWER=m +CONFIG_HID_LENOVO=m CONFIG_HID_LOGITECH=y CONFIG_HID_LOGITECH_DJ=m CONFIG_LOGITECH_FF=y @@ -1715,6 +1716,11 @@ CONFIG_VIDEO_CAFE_CCIC=m # CONFIG_SOC_CAMERA_PLATFORM is not set # CONFIG_VIDEO_SH_MOBILE_CEU is not set +## +## file: drivers/media/platform/vivid/Kconfig +## +CONFIG_VIDEO_VIVID=m + ## ## file: drivers/media/radio/Kconfig ## @@ -6329,38 +6335,3 @@ CONFIG_RD_XZ=y CONFIG_RD_LZO=y CONFIG_RD_LZ4=y -## -## file: unknown -## -CONFIG_88EU_P2P=y -# CONFIG_ATMEL_PWM is not set -CONFIG_BRIDGE_EBT_ULOG=m -# CONFIG_CED1401 is not set -# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set -# CONFIG_CRYSTALHD is not set -# CONFIG_CXT1E1 is not set -# CONFIG_DX_SEP is not set -# CONFIG_FB_SM7XX is not set -# CONFIG_FW_LOADER_USER_HELPER is not set -CONFIG_HID_LENOVO_TPKBD=m -# CONFIG_IDE_PHISON is not set -CONFIG_IP_NF_TARGET_ULOG=m -CONFIG_IR_RC5_SZ_DECODER=m -# CONFIG_MAC80211_RC_DEFAULT_PID is not set -# CONFIG_MAC80211_RC_PID is not set -# CONFIG_NET_VENDOR_SILICOM is not set -# CONFIG_R8821AE is not set -# CONFIG_SAMSUNG_USB2PHY is not set -# CONFIG_SAMSUNG_USB3PHY is not set -CONFIG_SCSI_FC_TGT_ATTRS=y -CONFIG_SCSI_MULTI_LUN=y -CONFIG_SCSI_SRP=m -CONFIG_SCSI_SRP_TGT_ATTRS=y -CONFIG_SCSI_TGT=m -CONFIG_TABLET_USB_WACOM=m -# CONFIG_TRANZPORT is not set -# CONFIG_USB_SERIAL_QUATECH2 is not set -CONFIG_USB_SERIAL_ZTE=m -CONFIG_VIDEO_VIVI=m -# CONFIG_W35UND is not set -