remove duplicate settings
svn path=/dists/trunk/linux-2.6/; revision=9551
This commit is contained in:
parent
8b73e8befb
commit
9c16fe5eed
|
@ -695,7 +695,6 @@ CONFIG_ACPI_EC=y
|
|||
CONFIG_AGP_VIA=m
|
||||
# CONFIG_BLK_DEV_IDEPNP is not set
|
||||
CONFIG_GENERIC_PENDING_IRQ=y
|
||||
CONFIG_IA64_UNCACHED_ALLOCATOR=y
|
||||
CONFIG_IA64_SGI_SN_XP=m
|
||||
CONFIG_HOTPLUG_CPU=y
|
||||
CONFIG_SCHED_SMT=y
|
||||
|
@ -841,33 +840,13 @@ CONFIG_ARCNET_RIM_I=m
|
|||
CONFIG_ARCNET_COM20020=m
|
||||
CONFIG_ARCNET_COM20020_PCI=m
|
||||
CONFIG_NET_VENDOR_3COM=y
|
||||
CONFIG_VORTEX=m
|
||||
CONFIG_TYPHOON=m
|
||||
CONFIG_DE4X5=y
|
||||
CONFIG_PCMCIA_XIRCOM=m
|
||||
CONFIG_3C359=m
|
||||
CONFIG_PCMCIA_WAVELAN=m
|
||||
CONFIG_PCMCIA_NETWAVE=m
|
||||
CONFIG_PCMCIA_RAYCS=m
|
||||
CONFIG_IPW2100=m
|
||||
CONFIG_IPW2100_MONITOR=y
|
||||
CONFIG_PCMCIA_HERMES=m
|
||||
CONFIG_PCMCIA_SPECTRUM=m
|
||||
CONFIG_AIRO_CS=m
|
||||
CONFIG_PCMCIA_ATMEL=m
|
||||
CONFIG_PCMCIA_WL3501=m
|
||||
CONFIG_HOSTAP_CS=m
|
||||
CONFIG_NET_PCMCIA=y
|
||||
CONFIG_PCMCIA_3C589=m
|
||||
CONFIG_PCMCIA_3C574=m
|
||||
CONFIG_PCMCIA_FMVJ18X=m
|
||||
CONFIG_PCMCIA_PCNET=m
|
||||
CONFIG_PCMCIA_NMCLAN=m
|
||||
CONFIG_PCMCIA_SMC91C92=m
|
||||
CONFIG_PCMCIA_XIRC2PS=m
|
||||
CONFIG_PCMCIA_AXNET=m
|
||||
CONFIG_ARCNET_COM20020_CS=m
|
||||
CONFIG_USB_STORAGE_ISD200=y
|
||||
CONFIG_USB_LIBUSUAL=y
|
||||
CONFIG_USB_SERIAL_WHITEHEAT=m
|
||||
CONFIG_USB_SERIAL_EDGEPORT=m
|
||||
|
@ -877,4 +856,3 @@ CONFIG_USB_EMI26=m
|
|||
CONFIG_LEDS_TRIGGER_IDE_DISK=y
|
||||
CONFIG_INFINIBAND_IPATH=m
|
||||
CONFIG_PROC_VMCORE=y
|
||||
CONFIG_SYSVIPC_COMPAT=y
|
||||
|
|
Loading…
Reference in New Issue