SOURCES (LINUX_2_6): kernel-i386.config - remove duplicated optios

[sparky]

Author: sparky                       Date: Sat Sep 27 00:10:11 2008 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- remove duplicated optios

---- Files affected:
SOURCES:
   kernel-i386.config (1.82.10.214 -> 1.82.10.215) 

---- Diffs:

================================================================
Index: SOURCES/kernel-i386.config
diff -u SOURCES/kernel-i386.config:1.82.10.214 SOURCES/kernel-i386.config:1.82.10.215
--- SOURCES/kernel-i386.config:1.82.10.214	Mon Sep 22 22:21:25 2008
+++ SOURCES/kernel-i386.config	Sat Sep 27 02:10:05 2008
@@ -57,8 +57,6 @@
 # Processor type and features
 #
 CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
 CONFIG_X86_PC=y
 # CONFIG_X86_ELAN is not set
 # CONFIG_X86_VOYAGER is not set
@@ -173,7 +171,6 @@
 CONFIG_SUSPEND=y
 CONFIG_HIBERNATION=y
 CONFIG_PM_STD_PARTITION=""
-CONFIG_CPU_IDLE=y
 # CONFIG_PRINTK_NOSAVE is not set
 
 #
@@ -232,8 +229,6 @@
 # CONFIG_CPU_FREQ_DEBUG is not set
 CONFIG_CPU_FREQ_STAT=m
 CONFIG_CPU_FREQ_STAT_DETAILS=y
-CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=m
 CONFIG_CPU_FREQ_GOV_USERSPACE=m
@@ -572,8 +567,6 @@
 CONFIG_THINKPAD_ACPI=m
 # CONFIG_THINKPAD_ACPI_DEBUG is not set
 CONFIG_THINKPAD_ACPI_BAY=y
-CONFIG_IDE=m
-CONFIG_BLK_DEV_IDE=m
 
 #
 # Please see Documentation/ide.txt for help/info on IDE drives
@@ -674,8 +667,6 @@
 CONFIG_AIC7XXX_CMDS_PER_DEVICE=253
 CONFIG_AIC79XX_CMDS_PER_DEVICE=253
 # CONFIG_AIC94XX_DEBUG is not set
-CONFIG_SCSI_DPT_I2O=m
-CONFIG_SCSI_ADVANSYS=m
 CONFIG_SCSI_IN2000=m
 CONFIG_SCSI_BUSLOGIC=m
 # CONFIG_SCSI_FLASHPOINT is not set
@@ -735,36 +726,16 @@
 #
 # CONFIG_ATA_NONSTANDARD is not set
 CONFIG_ATA_ACPI=y
-CONFIG_PATA_CS5535=m
 CONFIG_PATA_ISAPNP=m
 CONFIG_PATA_LEGACY=m
 CONFIG_PATA_PCMCIA=m
 CONFIG_PATA_QDI=m
-CONFIG_PATA_WINBOND_VLB=m
 
 #
 # IEEE 1394 (FireWire) support
 #
 # CONFIG_FIREWIRE is not set
 
-#
-# Subsystem Options
-#
-
-#
-# Controllers
-#
-CONFIG_IEEE1394_PCILYNX=m
-CONFIG_IEEE1394_OHCI1394=m
-
-#
-# Protocols
-#
-# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set
-CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y
-CONFIG_IEEE1394_ETH1394=m
-CONFIG_IEEE1394_DV1394=m
-CONFIG_IEEE1394_RAWIO=m
 
 #
 # I2O device support
@@ -934,13 +905,6 @@
 CONFIG_HOSTAP_FIRMWARE=y
 CONFIG_HOSTAP_FIRMWARE_NVRAM=y
 CONFIG_HOSTAP_CS=m
-CONFIG_BCM43XX=m
-CONFIG_BCM43XX_DEBUG=y
-CONFIG_BCM43XX_DMA=y
-CONFIG_BCM43XX_PIO=y
-CONFIG_BCM43XX_DMA_AND_PIO_MODE=y
-# CONFIG_BCM43XX_DMA_MODE is not set
-# CONFIG_BCM43XX_PIO_MODE is not set
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
 
@@ -1185,7 +1149,6 @@
 #
 # Watchdog Cards
 #
-# CONFIG_WATCHDOG_NOWAYOUT is not set
 
 #
 # Watchdog Device Drivers
@@ -1390,15 +1353,10 @@
 CONFIG_VIDEO_CX88_BLACKBIRD=m
 CONFIG_VIDEO_CX88_DVB=m
 CONFIG_VIDEO_CX88_VP3054=m
-CONFIG_VIDEO_IVTV=m
 
 #
 # V4L USB devices
 #
-CONFIG_V4L_USB_DRIVERS=y
-CONFIG_VIDEO_PVRUSB2=m
-CONFIG_VIDEO_PVRUSB2_SYSFS=y
-# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
 CONFIG_VIDEO_EM28XX=m
 CONFIG_VIDEO_USBVISION=m
 CONFIG_VIDEO_USBVIDEO=m
@@ -1505,8 +1463,6 @@
 CONFIG_FB_ASILIANT=y
 CONFIG_FB_IMSTT=y
 CONFIG_FB_VGA16=m
-CONFIG_FB_VESA=y
-CONFIG_FB_IMAC=y
 CONFIG_FB_HECUBA=m
 CONFIG_FB_HGA=m
 CONFIG_FB_HGA_ACCEL=y
@@ -1556,7 +1512,6 @@
 CONFIG_FB_GEODE_GX_SET_FBSIZE=y
 CONFIG_FB_GEODE_GX_FBSIZE=0x1600000
 CONFIG_FB_GEODE_GX1=m
-CONFIG_LCD_LTV350QV=m
 CONFIG_BACKLIGHT_PROGEAR=m
 CONFIG_BACKLIGHT_CARILLO_RANCH=m
 
@@ -1675,7 +1630,6 @@
 CONFIG_USB_DEVICE_CLASS=y
 CONFIG_USB_DYNAMIC_MINORS=y
 CONFIG_USB_SUSPEND=y
-# CONFIG_USB_PERSIST is not set
 # CONFIG_USB_OTG is not set
 
 #
@@ -1982,8 +1936,6 @@
 # CONFIG_LOCK_STAT is not set
 # CONFIG_DEBUG_HIGHMEM is not set
 CONFIG_DEBUG_BUGVERBOSE=y
-# CONFIG_FRAME_POINTER is not set
-CONFIG_EARLY_PRINTK=y
 # CONFIG_DEBUG_STACKOVERFLOW is not set
 # CONFIG_DEBUG_STACK_USAGE is not set
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-i386.config?r1=1.82.10.214&r2=1.82.10.215&f=u