[kernel] r19832 - in dists/trunk/linux/debian/config: . alpha hppa ia64 kernelarch-x86 m68k mips mipsel powerpc sparc
Ben Hutchings
benh at alioth.debian.org
Thu Feb 21 03:11:38 UTC 2013
Author: benh
Date: Thu Feb 21 03:11:37 2013
New Revision: 19832
Log:
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.
Modified:
dists/trunk/linux/debian/config/alpha/config
dists/trunk/linux/debian/config/config
dists/trunk/linux/debian/config/hppa/config
dists/trunk/linux/debian/config/ia64/config
dists/trunk/linux/debian/config/kernelarch-x86/config
dists/trunk/linux/debian/config/m68k/config
dists/trunk/linux/debian/config/mips/config.4kc-malta
dists/trunk/linux/debian/config/mips/config.5kc-malta
dists/trunk/linux/debian/config/mips/config.r4k-ip22
dists/trunk/linux/debian/config/mips/config.r5k-ip32
dists/trunk/linux/debian/config/mips/config.sb1-bcm91250a
dists/trunk/linux/debian/config/mips/config.sb1a-bcm91480b
dists/trunk/linux/debian/config/mipsel/config.r5k-cobalt
dists/trunk/linux/debian/config/powerpc/config
dists/trunk/linux/debian/config/sparc/config
Modified: dists/trunk/linux/debian/config/alpha/config
==============================================================================
--- dists/trunk/linux/debian/config/alpha/config Thu Feb 21 02:33:43 2013 (r19831)
+++ dists/trunk/linux/debian/config/alpha/config Thu Feb 21 03:11:37 2013 (r19832)
@@ -916,13 +916,6 @@
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
##
CONFIG_VT=y
Modified: dists/trunk/linux/debian/config/config
==============================================================================
--- dists/trunk/linux/debian/config/config Thu Feb 21 02:33:43 2013 (r19831)
+++ dists/trunk/linux/debian/config/config Thu Feb 21 03:11:37 2013 (r19832)
@@ -2338,7 +2338,7 @@
##
## file: drivers/net/wireless/ath/Kconfig
##
-CONFIG_ATH_COMMON=m
+CONFIG_ATH_CARDS=y
# CONFIG_ATH_DEBUG is not set
##
Modified: dists/trunk/linux/debian/config/hppa/config
==============================================================================
--- dists/trunk/linux/debian/config/hppa/config Thu Feb 21 02:33:43 2013 (r19831)
+++ dists/trunk/linux/debian/config/hppa/config Thu Feb 21 03:11:37 2013 (r19832)
@@ -527,11 +527,6 @@
CONFIG_PCMCIA_SYM53C500=m
##
-## file: drivers/staging/telephony/Kconfig
-##
-# CONFIG_PHONE is not set
-
-##
## file: drivers/tty/Kconfig
##
CONFIG_VT=y
Modified: dists/trunk/linux/debian/config/ia64/config
==============================================================================
--- dists/trunk/linux/debian/config/ia64/config Thu Feb 21 02:33:43 2013 (r19831)
+++ dists/trunk/linux/debian/config/ia64/config Thu Feb 21 03:11:37 2013 (r19832)
@@ -671,13 +671,6 @@
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
##
# CONFIG_PRISM2_USB is not set
Modified: dists/trunk/linux/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux/debian/config/kernelarch-x86/config Thu Feb 21 02:33:43 2013 (r19831)
+++ dists/trunk/linux/debian/config/kernelarch-x86/config Thu Feb 21 03:11:37 2013 (r19832)
@@ -1257,10 +1257,8 @@
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
@@ -1395,13 +1393,6 @@
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
##
CONFIG_USBIP_CORE=m
Modified: dists/trunk/linux/debian/config/m68k/config
==============================================================================
--- dists/trunk/linux/debian/config/m68k/config Thu Feb 21 02:33:43 2013 (r19831)
+++ dists/trunk/linux/debian/config/m68k/config Thu Feb 21 03:11:37 2013 (r19832)
@@ -126,11 +126,6 @@
# CONFIG_STAGING is not set
##
-## file: drivers/staging/telephony/Kconfig
-##
-# CONFIG_PHONE is not set
-
-##
## file: drivers/tty/Kconfig
##
CONFIG_VT=y
Modified: dists/trunk/linux/debian/config/mips/config.4kc-malta
==============================================================================
--- dists/trunk/linux/debian/config/mips/config.4kc-malta Thu Feb 21 02:33:43 2013 (r19831)
+++ dists/trunk/linux/debian/config/mips/config.4kc-malta Thu Feb 21 03:11:37 2013 (r19832)
@@ -917,12 +917,6 @@
# CONFIG_SPI_SPIDEV is not set
##
-## file: drivers/staging/telephony/Kconfig
-##
-CONFIG_PHONE=m
-CONFIG_PHONE_IXJ=m
-
-##
## file: drivers/tty/Kconfig
##
CONFIG_VT=y
Modified: dists/trunk/linux/debian/config/mips/config.5kc-malta
==============================================================================
--- dists/trunk/linux/debian/config/mips/config.5kc-malta Thu Feb 21 02:33:43 2013 (r19831)
+++ dists/trunk/linux/debian/config/mips/config.5kc-malta Thu Feb 21 03:11:37 2013 (r19832)
@@ -921,12 +921,6 @@
# CONFIG_SPI_SPIDEV is not set
##
-## file: drivers/staging/telephony/Kconfig
-##
-CONFIG_PHONE=m
-CONFIG_PHONE_IXJ=m
-
-##
## file: drivers/tty/Kconfig
##
CONFIG_VT=y
Modified: dists/trunk/linux/debian/config/mips/config.r4k-ip22
==============================================================================
--- dists/trunk/linux/debian/config/mips/config.r4k-ip22 Thu Feb 21 02:33:43 2013 (r19831)
+++ dists/trunk/linux/debian/config/mips/config.r4k-ip22 Thu Feb 21 03:11:37 2013 (r19832)
@@ -420,11 +420,6 @@
CONFIG_SPI_BUTTERFLY=m
##
-## file: drivers/staging/telephony/Kconfig
-##
-# CONFIG_PHONE is not set
-
-##
## file: drivers/tty/Kconfig
##
CONFIG_VT=y
Modified: dists/trunk/linux/debian/config/mips/config.r5k-ip32
==============================================================================
--- dists/trunk/linux/debian/config/mips/config.r5k-ip32 Thu Feb 21 02:33:43 2013 (r19831)
+++ dists/trunk/linux/debian/config/mips/config.r5k-ip32 Thu Feb 21 03:11:37 2013 (r19832)
@@ -503,11 +503,6 @@
CONFIG_SPI_BUTTERFLY=m
##
-## file: drivers/staging/telephony/Kconfig
-##
-# CONFIG_PHONE is not set
-
-##
## file: drivers/tty/Kconfig
##
CONFIG_VT=y
Modified: dists/trunk/linux/debian/config/mips/config.sb1-bcm91250a
==============================================================================
--- dists/trunk/linux/debian/config/mips/config.sb1-bcm91250a Thu Feb 21 02:33:43 2013 (r19831)
+++ dists/trunk/linux/debian/config/mips/config.sb1-bcm91250a Thu Feb 21 03:11:37 2013 (r19832)
@@ -632,11 +632,6 @@
CONFIG_SPI_BUTTERFLY=m
##
-## file: drivers/staging/telephony/Kconfig
-##
-# CONFIG_PHONE is not set
-
-##
## file: drivers/tty/Kconfig
##
CONFIG_VT=y
Modified: dists/trunk/linux/debian/config/mips/config.sb1a-bcm91480b
==============================================================================
--- dists/trunk/linux/debian/config/mips/config.sb1a-bcm91480b Thu Feb 21 02:33:43 2013 (r19831)
+++ dists/trunk/linux/debian/config/mips/config.sb1a-bcm91480b Thu Feb 21 03:11:37 2013 (r19832)
@@ -638,11 +638,6 @@
CONFIG_SPI_BUTTERFLY=m
##
-## file: drivers/staging/telephony/Kconfig
-##
-# CONFIG_PHONE is not set
-
-##
## file: drivers/tty/Kconfig
##
CONFIG_VT=y
Modified: dists/trunk/linux/debian/config/mipsel/config.r5k-cobalt
==============================================================================
--- dists/trunk/linux/debian/config/mipsel/config.r5k-cobalt Thu Feb 21 02:33:43 2013 (r19831)
+++ dists/trunk/linux/debian/config/mipsel/config.r5k-cobalt Thu Feb 21 03:11:37 2013 (r19832)
@@ -633,11 +633,6 @@
# CONFIG_SPI_BUTTERFLY is not set
##
-## file: drivers/staging/telephony/Kconfig
-##
-# CONFIG_PHONE is not set
-
-##
## file: drivers/tty/Kconfig
##
CONFIG_VT=y
Modified: dists/trunk/linux/debian/config/powerpc/config
==============================================================================
--- dists/trunk/linux/debian/config/powerpc/config Thu Feb 21 02:33:43 2013 (r19831)
+++ dists/trunk/linux/debian/config/powerpc/config Thu Feb 21 03:11:37 2013 (r19832)
@@ -754,13 +754,6 @@
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
##
CONFIG_VT=y
Modified: dists/trunk/linux/debian/config/sparc/config
==============================================================================
--- dists/trunk/linux/debian/config/sparc/config Thu Feb 21 02:33:43 2013 (r19831)
+++ dists/trunk/linux/debian/config/sparc/config Thu Feb 21 03:11:37 2013 (r19832)
@@ -439,11 +439,6 @@
CONFIG_MEGARAID_LEGACY=m
##
-## file: drivers/staging/telephony/Kconfig
-##
-# CONFIG_PHONE is not set
-
-##
## file: drivers/tty/Kconfig
##
CONFIG_VT=y
More information about the Kernel-svn-changes
mailing list