Fix up config for renaming, merging and addition of dependencies in 3.7 and earlier
svn path=/dists/trunk/linux/; revision=19626
This commit is contained in:
parent
c6333e7726
commit
ea878cca88
|
@ -13,6 +13,10 @@ linux (3.7.1-1~experimental.1) UNRELEASED; urgency=low
|
|||
* 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@debian.org> Thu, 06 Dec 2012 18:14:33 +0100
|
||||
|
||||
|
|
|
@ -1285,6 +1285,7 @@ CONFIG_IR_MCEUSB=m
|
|||
CONFIG_IR_REDRAT3=m
|
||||
CONFIG_IR_STREAMZAP=m
|
||||
CONFIG_IR_IGUANA=m
|
||||
CONFIG_IR_TTUSBIR=m
|
||||
CONFIG_RC_LOOPBACK=m
|
||||
|
||||
##
|
||||
|
@ -2443,6 +2444,11 @@ CONFIG_RTL8192DE=m
|
|||
CONFIG_RTL8192CU=m
|
||||
# CONFIG_RTLWIFI_DEBUG is not set
|
||||
|
||||
##
|
||||
## file: drivers/net/wireless/ti/Kconfig
|
||||
##
|
||||
CONFIG_WL_TI=y
|
||||
|
||||
##
|
||||
## file: drivers/net/wireless/ti/wl1251/Kconfig
|
||||
##
|
||||
|
@ -3782,6 +3788,11 @@ CONFIG_OMFS_FS=m
|
|||
CONFIG_PROC_KCORE=y
|
||||
CONFIG_PROC_SYSCTL=y
|
||||
|
||||
##
|
||||
## file: fs/pstore/Kconfig
|
||||
##
|
||||
CONFIG_PSTORE_RAM=m
|
||||
|
||||
##
|
||||
## file: fs/qnx4/Kconfig
|
||||
##
|
||||
|
@ -4347,7 +4358,7 @@ 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=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 @@ CONFIG_INITRAMFS_SOURCE=""
|
|||
##
|
||||
## file: unknown
|
||||
##
|
||||
CONFIG_HID_QUANTA=m
|
||||
CONFIG_HID_ROCCAT_ARVO=m
|
||||
CONFIG_HID_ROCCAT_KONE=m
|
||||
CONFIG_HID_ROCCAT_KONEPLUS=m
|
||||
|
|
|
@ -1232,6 +1232,7 @@ CONFIG_COMEDI_SERIAL2002=m
|
|||
# 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_3120=m
|
|||
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_KE_COUNTER=m
|
|||
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 @@ CONFIG_R8187SE=m
|
|||
##
|
||||
## file: drivers/staging/rtl8192e/rtl8192e/Kconfig
|
||||
##
|
||||
CONFIG_RTLLIB=m
|
||||
CONFIG_RTL8192E=m
|
||||
|
||||
##
|
||||
|
|
Loading…
Reference in New Issue