Update config selections for 3.8

All Atheros wireless drivers depend on a new symbol ATH_CARDS.

Two comedi drivers were merged into others and no longer have their
own config symbols.

drivers/staging/telephony has been removed.

svn path=/dists/trunk/linux/; revision=19832
This commit is contained in:
Ben Hutchings 2013-02-21 03:11:37 +00:00
parent 72eeaf1a22
commit f56a70f3a6
15 changed files with 1 additions and 83 deletions

View File

@ -915,13 +915,6 @@ CONFIG_PCMCIA_SYM53C500=m
CONFIG_PC300=m
CONFIG_PC300_MLPPP=y
##
## file: drivers/staging/telephony/Kconfig
##
CONFIG_PHONE=m
CONFIG_PHONE_IXJ=m
CONFIG_PHONE_IXJ_PCMCIA=m
##
## file: drivers/tty/Kconfig
##

View File

@ -2338,7 +2338,7 @@ CONFIG_MWL8K=m
##
## file: drivers/net/wireless/ath/Kconfig
##
CONFIG_ATH_COMMON=m
CONFIG_ATH_CARDS=y
# CONFIG_ATH_DEBUG is not set
##

View File

@ -526,11 +526,6 @@ CONFIG_PCMCIA_FDOMAIN=m
CONFIG_PCMCIA_QLOGIC=m
CONFIG_PCMCIA_SYM53C500=m
##
## file: drivers/staging/telephony/Kconfig
##
# CONFIG_PHONE is not set
##
## file: drivers/tty/Kconfig
##

View File

@ -670,13 +670,6 @@ CONFIG_SGI_IOC3=m
CONFIG_PC300=m
CONFIG_PC300_MLPPP=y
##
## file: drivers/staging/telephony/Kconfig
##
CONFIG_PHONE=m
CONFIG_PHONE_IXJ=m
CONFIG_PHONE_IXJ_PCMCIA=m
##
## file: drivers/staging/wlan-ng/Kconfig
##

View File

@ -1257,10 +1257,8 @@ CONFIG_COMEDI_ADDI_APCI_1500=m
CONFIG_COMEDI_ADDI_APCI_1516=m
CONFIG_COMEDI_ADDI_APCI_1564=m
CONFIG_COMEDI_ADDI_APCI_16XX=m
CONFIG_COMEDI_ADDI_APCI_2016=m
CONFIG_COMEDI_ADDI_APCI_2032=m
CONFIG_COMEDI_ADDI_APCI_2200=m
CONFIG_COMEDI_ADDI_APCI_3001=m
CONFIG_COMEDI_ADDI_APCI_3120=m
CONFIG_COMEDI_ADDI_APCI_3501=m
CONFIG_COMEDI_ADDI_APCI_3XXX=m
@ -1394,13 +1392,6 @@ CONFIG_RTS5139=m
##
CONFIG_RTS_PSTOR=m
##
## file: drivers/staging/telephony/Kconfig
##
CONFIG_PHONE=m
CONFIG_PHONE_IXJ=m
CONFIG_PHONE_IXJ_PCMCIA=m
##
## file: drivers/staging/usbip/Kconfig
##

View File

@ -125,11 +125,6 @@ CONFIG_BLK_DEV_SD=y
##
# CONFIG_STAGING is not set
##
## file: drivers/staging/telephony/Kconfig
##
# CONFIG_PHONE is not set
##
## file: drivers/tty/Kconfig
##

View File

@ -916,12 +916,6 @@ CONFIG_SPI_BITBANG=m
CONFIG_SPI_BUTTERFLY=m
# CONFIG_SPI_SPIDEV is not set
##
## file: drivers/staging/telephony/Kconfig
##
CONFIG_PHONE=m
CONFIG_PHONE_IXJ=m
##
## file: drivers/tty/Kconfig
##

View File

@ -920,12 +920,6 @@ CONFIG_SPI_BITBANG=m
CONFIG_SPI_BUTTERFLY=m
# CONFIG_SPI_SPIDEV is not set
##
## file: drivers/staging/telephony/Kconfig
##
CONFIG_PHONE=m
CONFIG_PHONE_IXJ=m
##
## file: drivers/tty/Kconfig
##

View File

@ -419,11 +419,6 @@ CONFIG_SPI=y
CONFIG_SPI_BITBANG=m
CONFIG_SPI_BUTTERFLY=m
##
## file: drivers/staging/telephony/Kconfig
##
# CONFIG_PHONE is not set
##
## file: drivers/tty/Kconfig
##

View File

@ -502,11 +502,6 @@ CONFIG_SPI=y
CONFIG_SPI_BITBANG=m
CONFIG_SPI_BUTTERFLY=m
##
## file: drivers/staging/telephony/Kconfig
##
# CONFIG_PHONE is not set
##
## file: drivers/tty/Kconfig
##

View File

@ -631,11 +631,6 @@ CONFIG_SPI=y
CONFIG_SPI_BITBANG=m
CONFIG_SPI_BUTTERFLY=m
##
## file: drivers/staging/telephony/Kconfig
##
# CONFIG_PHONE is not set
##
## file: drivers/tty/Kconfig
##

View File

@ -637,11 +637,6 @@ CONFIG_SPI=y
CONFIG_SPI_BITBANG=m
CONFIG_SPI_BUTTERFLY=m
##
## file: drivers/staging/telephony/Kconfig
##
# CONFIG_PHONE is not set
##
## file: drivers/tty/Kconfig
##

View File

@ -632,11 +632,6 @@ CONFIG_SPI=y
CONFIG_SPI_BITBANG=m
# CONFIG_SPI_BUTTERFLY is not set
##
## file: drivers/staging/telephony/Kconfig
##
# CONFIG_PHONE is not set
##
## file: drivers/tty/Kconfig
##

View File

@ -753,13 +753,6 @@ CONFIG_PCMCIA_SYM53C500=m
CONFIG_PC300=m
CONFIG_PC300_MLPPP=y
##
## file: drivers/staging/telephony/Kconfig
##
CONFIG_PHONE=m
CONFIG_PHONE_IXJ=m
CONFIG_PHONE_IXJ_PCMCIA=m
##
## file: drivers/tty/Kconfig
##

View File

@ -438,11 +438,6 @@ CONFIG_MEGARAID_MM=m
CONFIG_MEGARAID_MAILBOX=m
CONFIG_MEGARAID_LEGACY=m
##
## file: drivers/staging/telephony/Kconfig
##
# CONFIG_PHONE is not set
##
## file: drivers/tty/Kconfig
##