From f56a70f3a69bbb21220666c5e30ca4acf444ddc1 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Thu, 21 Feb 2013 03:11:37 +0000 Subject: [PATCH] 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 --- debian/config/alpha/config | 7 ------- debian/config/config | 2 +- debian/config/hppa/config | 5 ----- debian/config/ia64/config | 7 ------- debian/config/kernelarch-x86/config | 9 --------- debian/config/m68k/config | 5 ----- debian/config/mips/config.4kc-malta | 6 ------ debian/config/mips/config.5kc-malta | 6 ------ debian/config/mips/config.r4k-ip22 | 5 ----- debian/config/mips/config.r5k-ip32 | 5 ----- debian/config/mips/config.sb1-bcm91250a | 5 ----- debian/config/mips/config.sb1a-bcm91480b | 5 ----- debian/config/mipsel/config.r5k-cobalt | 5 ----- debian/config/powerpc/config | 7 ------- debian/config/sparc/config | 5 ----- 15 files changed, 1 insertion(+), 83 deletions(-) diff --git a/debian/config/alpha/config b/debian/config/alpha/config index 0c7b39ace..56d9da49e 100644 --- a/debian/config/alpha/config +++ b/debian/config/alpha/config @@ -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 ## diff --git a/debian/config/config b/debian/config/config index c3fe57708..b8e5e7ce7 100644 --- a/debian/config/config +++ b/debian/config/config @@ -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 ## diff --git a/debian/config/hppa/config b/debian/config/hppa/config index 3baee028b..1c627bbca 100644 --- a/debian/config/hppa/config +++ b/debian/config/hppa/config @@ -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 ## diff --git a/debian/config/ia64/config b/debian/config/ia64/config index 0190686b4..2479dd52b 100644 --- a/debian/config/ia64/config +++ b/debian/config/ia64/config @@ -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 ## diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index d8ecf67aa..49ca0c67c 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -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 ## diff --git a/debian/config/m68k/config b/debian/config/m68k/config index 20fa58594..0f8ef8a24 100644 --- a/debian/config/m68k/config +++ b/debian/config/m68k/config @@ -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 ## diff --git a/debian/config/mips/config.4kc-malta b/debian/config/mips/config.4kc-malta index 34ee0af60..7daa30336 100644 --- a/debian/config/mips/config.4kc-malta +++ b/debian/config/mips/config.4kc-malta @@ -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 ## diff --git a/debian/config/mips/config.5kc-malta b/debian/config/mips/config.5kc-malta index e1c33344b..38b9345ff 100644 --- a/debian/config/mips/config.5kc-malta +++ b/debian/config/mips/config.5kc-malta @@ -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 ## diff --git a/debian/config/mips/config.r4k-ip22 b/debian/config/mips/config.r4k-ip22 index 62b03a270..0e476f3e7 100644 --- a/debian/config/mips/config.r4k-ip22 +++ b/debian/config/mips/config.r4k-ip22 @@ -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 ## diff --git a/debian/config/mips/config.r5k-ip32 b/debian/config/mips/config.r5k-ip32 index a5de14130..a4ed26288 100644 --- a/debian/config/mips/config.r5k-ip32 +++ b/debian/config/mips/config.r5k-ip32 @@ -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 ## diff --git a/debian/config/mips/config.sb1-bcm91250a b/debian/config/mips/config.sb1-bcm91250a index 2cce14991..da84f2099 100644 --- a/debian/config/mips/config.sb1-bcm91250a +++ b/debian/config/mips/config.sb1-bcm91250a @@ -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 ## diff --git a/debian/config/mips/config.sb1a-bcm91480b b/debian/config/mips/config.sb1a-bcm91480b index 7c7593ac9..6c4eeacdc 100644 --- a/debian/config/mips/config.sb1a-bcm91480b +++ b/debian/config/mips/config.sb1a-bcm91480b @@ -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 ## diff --git a/debian/config/mipsel/config.r5k-cobalt b/debian/config/mipsel/config.r5k-cobalt index 918d2b4cf..55bc2a6e4 100644 --- a/debian/config/mipsel/config.r5k-cobalt +++ b/debian/config/mipsel/config.r5k-cobalt @@ -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 ## diff --git a/debian/config/powerpc/config b/debian/config/powerpc/config index e6feb31b9..1bd2e9155 100644 --- a/debian/config/powerpc/config +++ b/debian/config/powerpc/config @@ -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 ## diff --git a/debian/config/sparc/config b/debian/config/sparc/config index 42059f28d..8b07ec032 100644 --- a/debian/config/sparc/config +++ b/debian/config/sparc/config @@ -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 ##