[kernel] r19627 - in dists/trunk/linux/debian: . config

[Ben Hutchings]

Author: benh
Date: Sat Dec 22 03:49:34 2012
New Revision: 19627

Log:
Fix up config for merging, replacement and removals in 3.7 and earlier

Modified:
   dists/trunk/linux/debian/changelog
   dists/trunk/linux/debian/config/config

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Sat Dec 22 03:35:05 2012	(r19626)
+++ dists/trunk/linux/debian/changelog	Sat Dec 22 03:49:34 2012	(r19627)
@@ -17,6 +17,7 @@
   * net/wireless: Enable WL_TI; re-enable WL1251 and WL12XX as modules
   * staging: Enable RTLLIB; re-enable RTL8192E as module
   * media: Enable IR_TTUSBIR as module, replacing LIRC_TTUSBIR
+  * media: Enable VIDEO_STK1160 as module, replacing EASYCAP
 
  -- maximilian attems <maks at debian.org>  Thu, 06 Dec 2012 18:14:33 +0100
 

Modified: dists/trunk/linux/debian/config/config
==============================================================================
--- dists/trunk/linux/debian/config/config	Sat Dec 22 03:35:05 2012	(r19626)
+++ dists/trunk/linux/debian/config/config	Sat Dec 22 03:49:34 2012	(r19627)
@@ -1485,6 +1485,11 @@
 CONFIG_USB_SN9C102=m
 
 ##
+## file: drivers/media/usb/stk1160/Kconfig
+##
+CONFIG_VIDEO_STK1160=m
+
+##
 ## file: drivers/media/usb/stkwebcam/Kconfig
 ##
 CONFIG_USB_STKWEBCAM=m
@@ -4352,15 +4357,12 @@
 CONFIG_IP_NF_QUEUE=m
 CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_MATCH_AH=m
-CONFIG_IP_NF_MATCH_ECN=m
 CONFIG_IP_NF_MATCH_RPFILTER=m
 CONFIG_IP_NF_MATCH_TTL=m
 CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_ULOG=m
 CONFIG_NF_NAT_IPV4=m
 CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_NETMAP=m
 CONFIG_IP_NF_TARGET_REDIRECT=m
 CONFIG_NF_NAT_SNMP_BASIC=m
 CONFIG_IP_NF_MANGLE=m
@@ -4491,10 +4493,11 @@
 CONFIG_NETFILTER_XT_TARGET_LED=m
 CONFIG_NETFILTER_XT_TARGET_LOG=m
 CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NETMAP=m
 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
 CONFIG_NETFILTER_XT_TARGET_RATEEST=m
+CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
 CONFIG_NETFILTER_XT_TARGET_TEE=m
 CONFIG_NETFILTER_XT_TARGET_TPROXY=m
 CONFIG_NETFILTER_XT_TARGET_TRACE=m
@@ -4512,6 +4515,7 @@
 CONFIG_NETFILTER_XT_MATCH_DCCP=m
 CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
 CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ECN=m
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
@@ -4956,7 +4960,6 @@
 CONFIG_HID_SUPPORT=y
 CONFIG_HID_WACOM_POWER_SUPPLY=y
 CONFIG_INPUT_ATI_REMOTE=m
-CONFIG_IP6_NF_QUEUE=m
 CONFIG_IPV6_GRE=m
 CONFIG_IWM=m
 CONFIG_LEDS_ALIX2=m