[kernel] r8828 - in dists/trunk/linux-2.6/debian/arch: . i386 powerpc

Maximilian Attems maks at alioth.debian.org
Wed May 30 12:09:28 UTC 2007


Author: maks
Date: Wed May 30 12:09:27 2007
New Revision: 8828

Log:
group topconfig usb serial variables
set whiteheat
remove special disable lines


Modified:
   dists/trunk/linux-2.6/debian/arch/config
   dists/trunk/linux-2.6/debian/arch/i386/config.486
   dists/trunk/linux-2.6/debian/arch/i386/config.686
   dists/trunk/linux-2.6/debian/arch/i386/config.686-bigmem
   dists/trunk/linux-2.6/debian/arch/i386/config.k7
   dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc
   dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-miboot
   dists/trunk/linux-2.6/debian/arch/powerpc/config.prep

Modified: dists/trunk/linux-2.6/debian/arch/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/config	Wed May 30 12:09:27 2007
@@ -510,6 +510,19 @@
 CONFIG_DM_DELAY=m
 
 #
+# USB Serial Converter support
+#
+CONFIG_USB_SERIAL_AIRCABLE=m
+CONFIG_USB_SERIAL_ARK3116=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_FUNSOFT=m
+CONFIG_USB_SERIAL_MOS7720=m
+CONFIG_USB_SERIAL_MOS7840=m
+CONFIG_USB_SERIAL_NAVMAN=m
+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
+CONFIG_USB_SERIAL_DEBUG=m
+
+#
 # USB Miscellaneous drivers
 #
 CONFIG_USB_ADUTUX=m
@@ -1164,7 +1177,6 @@
 CONFIG_NEW_LEDS=y
 CONFIG_RTC_DRV_M48T86=m
 CONFIG_SND_RIPTIDE=m
-CONFIG_USB_SERIAL_NAVMAN=m
 # CONFIG_RTC_DRV_TEST is not set
 CONFIG_W1_MASTER_MATROX=m
 
@@ -1203,7 +1215,6 @@
 CONFIG_SND_ALS300=m
 # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
 CONFIG_IP_DCCP_ACKVEC=y
-CONFIG_USB_SERIAL_FUNSOFT=m
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_DEBUG_KERNEL is not set
 CONFIG_DEBUG_FS=y
@@ -1212,7 +1223,6 @@
 # CONFIG_DEBUG_MUTEXES is not set
 CONFIG_SND_PDAUDIOCF=m
 CONFIG_SND_VXPOCKET=m
-CONFIG_USB_SERIAL_ARK3116=m
 CONFIG_MODVERSIONS=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 # CONFIG_MODULE_SRCVERSION_ALL is not set
@@ -1263,7 +1273,6 @@
 CONFIG_SND_GINA20=m
 CONFIG_VITESSE_PHY=m
 CONFIG_SND_GINA24=m
-CONFIG_USB_SERIAL_SIERRAWIRELESS=m
 CONFIG_UNUSED_SYMBOLS=y
 CONFIG_W1_MASTER_DS2490=m
 # CONFIG_VT_HW_CONSOLE_BINDING is not set
@@ -1428,13 +1437,11 @@
 CONFIG_PATA_PCMCIA=m
 # CONFIG_JBD2_DEBUG is not set
 CONFIG_MMC_TIFM_SD=m
-CONFIG_USB_SERIAL_AIRCABLE=m
 # CONFIG_NETLABEL is not set
 CONFIG_INPUT_FF_MEMLESS=m
 CONFIG_PATA_PDC_OLD=m
 CONFIG_EXT4DEV_FS_SECURITY=y
 CONFIG_EXT4DEV_FS_XATTR=y
-CONFIG_USB_SERIAL_MOS7720=m
 CONFIG_BLK_DEV_JMICRON=m
 CONFIG_PATA_RADISYS=m
 # CONFIG_IPC_NS is not set
@@ -1445,7 +1452,6 @@
 CONFIG_TOUCHSCREEN_PENMOUNT=m
 CONFIG_GFS2_FS_LOCKING_NOLOCK=m
 CONFIG_PATA_EFAR=m
-CONFIG_USB_SERIAL_MOS7840=m
 # CONFIG_CC_STACKPROTECTOR is not set
 CONFIG_ASUS_LAPTOP=m
 CONFIG_MSI_LAPTOP=m
@@ -1496,7 +1502,6 @@
 CONFIG_PC87413_WDT=m
 CONFIG_IP_DCCP_CCID3_RTO=100
 CONFIG_BROADCOM_PHY=m
-CONFIG_USB_SERIAL_DEBUG=m
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 CONFIG_DVB_DIB7000M=m
 CONFIG_DVB_DIB7000P=m

Modified: dists/trunk/linux-2.6/debian/arch/i386/config.486
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/config.486	(original)
+++ dists/trunk/linux-2.6/debian/arch/i386/config.486	Wed May 30 12:09:27 2007
@@ -68,7 +68,6 @@
 CONFIG_I2C_ELEKTOR=m
 CONFIG_I2C_STUB=m
 CONFIG_USB_W9968CF=m
-CONFIG_USB_SERIAL_WHITEHEAT=m
 CONFIG_EXT2_FS=y
 CONFIG_FS_MBCACHE=y
 CONFIG_LOG_BUF_SHIFT=14

Modified: dists/trunk/linux-2.6/debian/arch/i386/config.686
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/config.686	(original)
+++ dists/trunk/linux-2.6/debian/arch/i386/config.686	Wed May 30 12:09:27 2007
@@ -49,7 +49,6 @@
 # CONFIG_I2C_ELEKTOR is not set
 CONFIG_I2C_STUB=m
 # CONFIG_USB_W9968CF is not set
-# CONFIG_USB_SERIAL_WHITEHEAT is not set
 CONFIG_FS_MBCACHE=m
 CONFIG_LOG_BUF_SHIFT=15
 # CONFIG_DEBUG_HIGHMEM is not set

Modified: dists/trunk/linux-2.6/debian/arch/i386/config.686-bigmem
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/config.686-bigmem	(original)
+++ dists/trunk/linux-2.6/debian/arch/i386/config.686-bigmem	Wed May 30 12:09:27 2007
@@ -52,7 +52,6 @@
 # CONFIG_I2C_ELEKTOR is not set
 CONFIG_I2C_STUB=m
 # CONFIG_USB_W9968CF is not set
-# CONFIG_USB_SERIAL_WHITEHEAT is not set
 CONFIG_FS_MBCACHE=m
 CONFIG_LOG_BUF_SHIFT=15
 # CONFIG_DEBUG_HIGHMEM is not set

Modified: dists/trunk/linux-2.6/debian/arch/i386/config.k7
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/config.k7	(original)
+++ dists/trunk/linux-2.6/debian/arch/i386/config.k7	Wed May 30 12:09:27 2007
@@ -56,7 +56,6 @@
 # CONFIG_I2C_ELEKTOR is not set
 CONFIG_I2C_STUB=m
 CONFIG_USB_W9968CF=m
-# CONFIG_USB_SERIAL_WHITEHEAT is not set
 CONFIG_FS_MBCACHE=m
 CONFIG_LOG_BUF_SHIFT=15
 # CONFIG_DEBUG_HIGHMEM is not set

Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc	(original)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc	Wed May 30 12:09:27 2007
@@ -4,7 +4,6 @@
 CONFIG_PM_STD_PARTITION=""
 # CONFIG_IRPORT_SIR is not set
 CONFIG_PCMCIA_XIRTULIP=m
-# CONFIG_USB_SERIAL_WHITEHEAT is not set
 CONFIG_MAC_FLOPPY=y
 CONFIG_FLATMEM_MANUAL=y
 CONFIG_FB_CONTROL=y

Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-miboot
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-miboot	(original)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-miboot	Wed May 30 12:09:27 2007
@@ -55,7 +55,6 @@
 CONFIG_IRDA=m
 CONFIG_PCMCIA_XIRTULIP=m
 # CONFIG_IRPORT_SIR is not set
-# CONFIG_USB_SERIAL_WHITEHEAT is not set
 # CONFIG_PMAC_BACKLIGHT is not set
 # CONFIG_SOFTWARE_SUSPEND is not set
 CONFIG_DEFAULT_DEADLINE=y

Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config.prep
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/config.prep	(original)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config.prep	Wed May 30 12:09:27 2007
@@ -4,7 +4,6 @@
 CONFIG_PM_STD_PARTITION=""
 # CONFIG_IRPORT_SIR is not set
 CONFIG_PCMCIA_XIRTULIP=m
-# CONFIG_USB_SERIAL_WHITEHEAT is not set
 CONFIG_MAC_FLOPPY=y
 CONFIG_FLATMEM_MANUAL=y
 CONFIG_FB_CONTROL=y



More information about the Kernel-svn-changes mailing list