From c509ae3d1e70d1cad89ad613365aed8b70b9739d Mon Sep 17 00:00:00 2001 From: Maximilian Attems Date: Tue, 11 Mar 2008 14:15:55 +0000 Subject: [PATCH] i386: nuke dup config settings already set in topconfig cleanup also remove useless blank lines svn path=/dists/trunk/linux-2.6/; revision=10785 --- debian/config/i386/config | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/debian/config/i386/config b/debian/config/i386/config index 3a2a67098..cd33bdc3d 100644 --- a/debian/config/i386/config +++ b/debian/config/i386/config @@ -7,7 +7,6 @@ CONFIG_GENERIC_ISA_DMA=y CONFIG_GENERIC_IOMAP=y CONFIG_DMI=y CONFIG_DMIID=y -# CONFIG_IKCONFIG is not set # CONFIG_KALLSYMS_ALL is not set CONFIG_X86_PC=y # CONFIG_X86_ELAN is not set @@ -245,7 +244,6 @@ CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0 # CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set # CONFIG_MTD_NAND_NANDSIM is not set CONFIG_MTD_NAND_PLATFORM=m - CONFIG_PNP=y # CONFIG_PNP_DEBUG is not set CONFIG_ISAPNP=y @@ -308,7 +306,6 @@ CONFIG_BLK_DEV_CMD640=y CONFIG_BLK_DEV_IDEPCI=y # CONFIG_BLK_DEV_OFFBOARD is not set CONFIG_BLK_DEV_GENERIC=m -CONFIG_BLK_DEV_JMICRON=m CONFIG_BLK_DEV_OPTI621=m CONFIG_BLK_DEV_RZ1000=m CONFIG_BLK_DEV_IDEDMA_PCI=y @@ -411,7 +408,6 @@ CONFIG_I2O_BLOCK=m CONFIG_I2O_SCSI=m CONFIG_I2O_PROC=m # CONFIG_MACINTOSH_DRIVERS is not set -# CONFIG_IP_PNP is not set CONFIG_ATM=y CONFIG_ATM_CLIP=y # CONFIG_ATM_CLIP_NO_ICMP is not set @@ -463,7 +459,6 @@ CONFIG_IRDA_CACHE_LAST_LSAP=y CONFIG_IRDA_FAST_RR=y # CONFIG_IRDA_DEBUG is not set CONFIG_IRTTY_SIR=m - CONFIG_USB_IRDA=m CONFIG_SIGMATEL_FIR=m CONFIG_NSC_FIR=m @@ -499,7 +494,6 @@ CONFIG_BT_HCIVHCI=m CONFIG_AF_RXRPC=m # CONFIG_AF_RXRPC_DEBUG is not set CONFIG_RXKAD=m - CONFIG_NETDEVICES_MULTIQUEUE=y CONFIG_DUMMY=m CONFIG_NET_SB1000=m @@ -877,7 +871,6 @@ CONFIG_ROCKETPORT=m CONFIG_CYCLADES=m # CONFIG_CYZ_INTR is not set # CONFIG_ESPSERIAL is not set -CONFIG_MOXA_SMARTIO=m # CONFIG_ISI is not set CONFIG_SYNCLINK=m CONFIG_SYNCLINKMP=m @@ -1005,7 +998,6 @@ CONFIG_I2C_PCA_ISA=m CONFIG_SENSORS_ADM1021=m CONFIG_SENSORS_ADM1025=m CONFIG_SENSORS_ADM1026=m -CONFIG_SENSORS_ADM1029=m CONFIG_SENSORS_ADM1031=m CONFIG_SENSORS_ASB100=m CONFIG_SENSORS_DS1621=m @@ -1401,8 +1393,6 @@ CONFIG_KEXEC=y CONFIG_PHYSICAL_START=0x100000 CONFIG_HOTPLUG_CPU=y CONFIG_HPET_EMULATE_RTC=y -CONFIG_VIDEO_CX88_DVB=m -CONFIG_VIDEO_CX88=m CONFIG_SENSORS_HDAPS=m CONFIG_DCDBAS=m CONFIG_IBMASR=m @@ -1417,7 +1407,6 @@ CONFIG_FLATMEM_MANUAL=y # CONFIG_SPARSEMEM_MANUAL is not set # CONFIG_DISCONTIGMEM_MANUAL is not set CONFIG_SPLIT_PTLOCK_CPUS=4 -CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_IPW2100=m CONFIG_IPW2100_MONITOR=y # CONFIG_IPW2100_DEBUG is not set