[kernel] r19626 - in dists/trunk/linux/debian: . config config/kernelarch-x86

[Ben Hutchings]

Author: benh
Date: Sat Dec 22 03:35:05 2012
New Revision: 19626

Log:
Fix up config for renaming, merging and addition of dependencies in 3.7 and earlier

Modified:
   dists/trunk/linux/debian/changelog
   dists/trunk/linux/debian/config/config
   dists/trunk/linux/debian/config/kernelarch-x86/config

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Sat Dec 22 02:52:54 2012	(r19625)
+++ dists/trunk/linux/debian/changelog	Sat Dec 22 03:35:05 2012	(r19626)
@@ -13,6 +13,10 @@
   * Make gcc-4.7 the default compiler
   * [mips,mipsel,sparc] media/parpot: Disable VIDEO_PMS in all
     configurations where the other parport video drivers are disabled
+  * [x86] fs: Re-enable PSTORE_RAM (formerly known as RAMOOPS) as module
+  * 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
 
  -- 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 02:52:54 2012	(r19625)
+++ dists/trunk/linux/debian/config/config	Sat Dec 22 03:35:05 2012	(r19626)
@@ -1285,6 +1285,7 @@
 CONFIG_IR_REDRAT3=m
 CONFIG_IR_STREAMZAP=m
 CONFIG_IR_IGUANA=m
+CONFIG_IR_TTUSBIR=m
 CONFIG_RC_LOOPBACK=m
 
 ##
@@ -2444,6 +2445,11 @@
 # CONFIG_RTLWIFI_DEBUG is not set
 
 ##
+## file: drivers/net/wireless/ti/Kconfig
+##
+CONFIG_WL_TI=y
+
+##
 ## file: drivers/net/wireless/ti/wl1251/Kconfig
 ##
 CONFIG_WL1251=m
@@ -3783,6 +3789,11 @@
 CONFIG_PROC_SYSCTL=y
 
 ##
+## file: fs/pstore/Kconfig
+##
+CONFIG_PSTORE_RAM=m
+
+##
 ## file: fs/qnx4/Kconfig
 ##
 CONFIG_QNX4FS_FS=m
@@ -4347,7 +4358,7 @@
 CONFIG_IP_NF_FILTER=m
 CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_NF_NAT=m
+CONFIG_NF_NAT_IPV4=m
 CONFIG_IP_NF_TARGET_MASQUERADE=m
 CONFIG_IP_NF_TARGET_NETMAP=m
 CONFIG_IP_NF_TARGET_REDIRECT=m
@@ -4937,7 +4948,6 @@
 ##
 ## file: unknown
 ##
-CONFIG_HID_QUANTA=m
 CONFIG_HID_ROCCAT_ARVO=m
 CONFIG_HID_ROCCAT_KONE=m
 CONFIG_HID_ROCCAT_KONEPLUS=m

Modified: dists/trunk/linux/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux/debian/config/kernelarch-x86/config	Sat Dec 22 02:52:54 2012	(r19625)
+++ dists/trunk/linux/debian/config/kernelarch-x86/config	Sat Dec 22 03:35:05 2012	(r19626)
@@ -1232,6 +1232,7 @@
 # CONFIG_COMEDI_SKEL is not set
 # CONFIG_COMEDI_ISA_DRIVERS is not set
 CONFIG_COMEDI_PCI_DRIVERS=y
+CONFIG_COMEDI_8255_PCI=m
 CONFIG_COMEDI_ADDI_APCI_035=m
 CONFIG_COMEDI_ADDI_APCI_1032=m
 CONFIG_COMEDI_ADDI_APCI_1500=m
@@ -1246,9 +1247,7 @@
 CONFIG_COMEDI_ADDI_APCI_3501=m
 CONFIG_COMEDI_ADDI_APCI_3XXX=m
 CONFIG_COMEDI_ADL_PCI6208=m
-CONFIG_COMEDI_ADL_PCI7230=m
-CONFIG_COMEDI_ADL_PCI7296=m
-CONFIG_COMEDI_ADL_PCI7432=m
+CONFIG_COMEDI_ADL_PCI7X3X=m
 CONFIG_COMEDI_ADL_PCI8164=m
 CONFIG_COMEDI_ADL_PCI9111=m
 CONFIG_COMEDI_ADL_PCI9118=m
@@ -1274,7 +1273,6 @@
 CONFIG_COMEDI_CB_PCIDAS64=m
 CONFIG_COMEDI_CB_PCIDAS=m
 CONFIG_COMEDI_CB_PCIDDA=m
-CONFIG_COMEDI_CB_PCIDIO=m
 CONFIG_COMEDI_CB_PCIMDAS=m
 CONFIG_COMEDI_CB_PCIMDDA=m
 CONFIG_COMEDI_ME4000=m
@@ -1354,6 +1352,7 @@
 ##
 ## file: drivers/staging/rtl8192e/rtl8192e/Kconfig
 ##
+CONFIG_RTLLIB=m
 CONFIG_RTL8192E=m
 
 ##