SOURCES (LINUX_2_6): kernel-sparc.config - remove options just merged to ke...

Sat Sep 27 23:13:39 CEST 2008

Author: sparky                       Date: Sat Sep 27 21:13:39 2008 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- remove options just merged to kernel-multiarch.config

---- Files affected:
SOURCES:
   kernel-sparc.config (1.37.2.166 -> 1.37.2.167) 

---- Diffs:

================================================================
Index: SOURCES/kernel-sparc.config
diff -u SOURCES/kernel-sparc.config:1.37.2.166 SOURCES/kernel-sparc.config:1.37.2.167

--- SOURCES/kernel-sparc.config:1.37.2.166	Sat Sep 27 21:42:15 2008
+++ SOURCES/kernel-sparc.config	Sat Sep 27 23:13:33 2008
@@ -44,538 +44,3 @@
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 #- file lib/Kconfig.debug goes here
 # CONFIG_DEBUG_STACK_USAGE is not set
-
-#-
-#- *** FILE: block/Kconfig ***
-#-
-CONFIG_LBD=y
-CONFIG_LSF=y
-#- file block/Kconfig.iosched goes here
-
-#-
-#- *** FILE: drivers/ata/Kconfig ***
-#-
-# CONFIG_ATA_NONSTANDARD is not set
-
-#-
-#- *** FILE: drivers/atm/Kconfig ***
-#-
-# CONFIG_ATM_IA is not set
-CONFIG_ATM_FORE200E_SBA=y
-CONFIG_ATM_FORE200E_SBA_DEFAULT_FW=y
-
-#-
-#- *** FILE: drivers/block/Kconfig ***
-#-
-CONFIG_BLK_DEV_FD=y
-#- file drivers/block/paride/Kconfig goes here
-#- file drivers/s390/block/Kconfig goes here
-
-#-
-#- *** FILE: drivers/char/Kconfig ***
-#-
-# CONFIG_SPECIALIX_RTSCTS is not set
-# CONFIG_RIO_OLDPCI is not set
-#- file drivers/serial/Kconfig goes here
-#- file drivers/char/ipmi/Kconfig goes here
-#- file drivers/char/hw_random/Kconfig goes here
-# CONFIG_RTC is not set
-# CONFIG_JS_RTC is not set
-#- file drivers/char/pcmcia/Kconfig goes here
-#- file drivers/char/tpm/Kconfig goes here
-#- file drivers/s390/char/Kconfig goes here
-
-#-
-#- *** FILE: drivers/char/hw_random/Kconfig ***
-#-
-# CONFIG_HW_RANDOM is not set
-
-#-
-#- *** FILE: drivers/firewire/Kconfig ***
-#-
-#- A new alternative FireWire stack is available with EXPERIMENTAL=y
-#- Enable only one of the two stacks, unless you know what you are doing
-# CONFIG_FIREWIRE is not set
-
-#-
-#- *** FILE: drivers/i2c/Kconfig ***
-#-
-CONFIG_I2C=m
-CONFIG_I2C_BOARDINFO=y
-#- file drivers/i2c/algos/Kconfig goes here
-#- file drivers/i2c/busses/Kconfig goes here
-#- file drivers/i2c/chips/Kconfig goes here
-
-#-
-#- *** FILE: drivers/i2c/busses/Kconfig ***
-#-
-# CONFIG_I2C_SIMTEC is not set
-CONFIG_I2C_PCA_ISA=m
-
-#-
-#- *** FILE: drivers/input/gameport/Kconfig ***
-#-
-# CONFIG_GAMEPORT_NS558 is not set
-# CONFIG_GAMEPORT_L4 is not set
-# CONFIG_GAMEPORT_EMU10K1 is not set
-# CONFIG_GAMEPORT_FM801 is not set
-
-#-
-#- *** FILE: drivers/input/joystick/Kconfig ***
-#-
-#- file drivers/input/joystick/iforce/Kconfig goes here
-# CONFIG_JOYSTICK_XPAD is not set
-
-#-
-#- *** FILE: drivers/input/keyboard/Kconfig ***
-#-
-CONFIG_KEYBOARD_ATKBD=m
-CONFIG_KEYBOARD_SUNKBD=y
-
-#-
-#- *** FILE: drivers/input/misc/Kconfig ***
-#-
-# CONFIG_INPUT_ATI_REMOTE is not set
-# CONFIG_INPUT_ATI_REMOTE2 is not set
-# CONFIG_INPUT_KEYSPAN_REMOTE is not set
-# CONFIG_INPUT_POWERMATE is not set
-# CONFIG_INPUT_YEALINK is not set
-
-#-
-#- *** FILE: drivers/input/mouse/Kconfig ***
-#-
-CONFIG_MOUSE_PS2_ALPS=y
-CONFIG_MOUSE_PS2_LOGIPS2PP=y
-CONFIG_MOUSE_PS2_SYNAPTICS=y
-CONFIG_MOUSE_PS2_LIFEBOOK=y
-CONFIG_MOUSE_PS2_TRACKPOINT=y
-# CONFIG_MOUSE_PS2_TOUCHKIT is not set
-# CONFIG_MOUSE_APPLETOUCH is not set
-
-#-
-#- *** FILE: drivers/input/serio/Kconfig ***
-#-
-# CONFIG_SERIO_PARKBD is not set
-CONFIG_SERIO_LIBPS2=m
-
-#-
-#- *** FILE: drivers/input/tablet/Kconfig ***
-#-
-# CONFIG_INPUT_TABLET is not set
-
-#-
-#- *** FILE: drivers/input/touchscreen/Kconfig ***
-#-
-# CONFIG_TOUCHSCREEN_ADS7846 is not set
-CONFIG_TOUCHSCREEN_FUJITSU=m
-# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
-
-#-
-#- *** FILE: drivers/isdn/Kconfig ***
-#-
-CONFIG_ISDN=m
-# CONFIG_ISDN_I4L is not set
-#- file drivers/isdn/i4l/Kconfig goes here
-CONFIG_ISDN_CAPI=m
-#- file drivers/isdn/capi/Kconfig goes here
-#- file drivers/isdn/hardware/Kconfig goes here
-
-#-
-#- *** FILE: drivers/isdn/capi/Kconfig ***
-#-
-# CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set
-CONFIG_CAPI_TRACE=y
-CONFIG_ISDN_CAPI_MIDDLEWARE=y
-CONFIG_ISDN_CAPI_CAPI20=m
-CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
-CONFIG_ISDN_CAPI_CAPIFS=m
-
-#-
-#- *** FILE: drivers/isdn/hardware/avm/Kconfig ***
-#-
-CONFIG_CAPI_AVM=y
-# CONFIG_ISDN_DRV_AVMB1_B1PCI is not set
-CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
-# CONFIG_ISDN_DRV_AVMB1_T1PCI is not set
-# CONFIG_ISDN_DRV_AVMB1_C4 is not set
-
-#-
-#- *** FILE: drivers/isdn/hardware/eicon/Kconfig ***
-#-
-CONFIG_CAPI_EICON=y
-# CONFIG_ISDN_DIVAS is not set
-
-#-
-#- *** FILE: drivers/media/video/Kconfig ***
-#-
-#- Audio decoders
-#- Video decoders
-#- Video and audio decoders
-#- file drivers/media/video/cx25840/Kconfig goes here
-#- MPEG video encoders
-#- Video encoders
-#- Video improvement chips
-#- file drivers/media/video/bt8xx/Kconfig goes here
-CONFIG_VIDEO_W9966=m
-#- file drivers/media/video/cpia2/Kconfig goes here
-# CONFIG_VIDEO_STRADIS is not set
-# CONFIG_VIDEO_ZORAN is not set
-#- file drivers/media/video/saa7134/Kconfig goes here
-#- file drivers/media/video/cx88/Kconfig goes here
-#- file drivers/media/video/cx23885/Kconfig goes here
-#- file drivers/media/video/au0828/Kconfig goes here
-#- file drivers/media/video/ivtv/Kconfig goes here
-#- file drivers/media/video/cx18/Kconfig goes here
-#- file drivers/media/video/uvc/Kconfig goes here
-#- file drivers/media/video/pvrusb2/Kconfig goes here
-#- file drivers/media/video/em28xx/Kconfig goes here
-#- file drivers/media/video/usbvision/Kconfig goes here
-#- file drivers/media/video/usbvideo/Kconfig goes here
-#- file drivers/media/video/et61x251/Kconfig goes here
-#- file drivers/media/video/sn9c102/Kconfig goes here
-#- file drivers/media/video/zc0301/Kconfig goes here
-#- file drivers/media/video/pwc/Kconfig goes here
-
-#-
-#- *** FILE: drivers/misc/Kconfig ***
-#-
-CONFIG_MISC_DEVICES=y
-CONFIG_PHANTOM=m
-CONFIG_EEPROM_93CX6=m
-CONFIG_SGI_IOC4=m
-
-#-
-#- *** FILE: drivers/mtd/devices/Kconfig ***
-#-
-# CONFIG_MTD_DATAFLASH is not set
-# CONFIG_MTD_M25P80 is not set
-#- Disk-On-Chip Device Drivers
-
-#-
-#- *** FILE: drivers/mtd/maps/Kconfig ***
-#-
-# CONFIG_MTD_SUN_UFLASH is not set
-
-#-
-#- *** FILE: drivers/mtd/nand/Kconfig ***
-#-
-# CONFIG_MTD_NAND_CAFE is not set
-# CONFIG_MTD_NAND_NANDSIM is not set
-# CONFIG_MTD_NAND_PLATFORM is not set
-
-#-
-#- *** FILE: drivers/mtd/onenand/Kconfig ***
-#-
-CONFIG_MTD_ONENAND_VERIFY_WRITE=y
-# CONFIG_MTD_ONENAND_OTP is not set
-
-#-
-#- *** FILE: drivers/mtd/ubi/Kconfig ***
-#-
-# CONFIG_MTD_UBI is not set
-#- file drivers/mtd/ubi/Kconfig.debug goes here
-
-#-
-#- *** FILE: drivers/net/Kconfig ***
-#-
-#- file drivers/net/arcnet/Kconfig goes here
-#- file drivers/net/phy/Kconfig goes here
-#- file drivers/net/arm/Kconfig goes here
-CONFIG_SUNLANCE=m
-CONFIG_SUNBMAC=m
-CONFIG_SUNQE=m
-#- file drivers/net/tulip/Kconfig goes here
-#- file drivers/net/ibm_emac/Kconfig goes here
-#- file drivers/net/ibm_newemac/Kconfig goes here
-CONFIG_ADAPTEC_STARFIRE_NAPI=y
-CONFIG_8139TOO_TUNE_TWISTER=y
-CONFIG_8139TOO_8129=y
-# CONFIG_8139_OLD_RX_RESET is not set
-CONFIG_SUNDANCE_MMIO=y
-# CONFIG_TLAN is not set
-CONFIG_VIA_RHINE_MMIO=y
-CONFIG_VIA_RHINE_NAPI=y
-#- file drivers/net/fec_8xx/Kconfig goes here
-#- file drivers/net/fs_enet/Kconfig goes here
-#- file drivers/net/ixp2000/Kconfig goes here
-CONFIG_MYRI_SBUS=m
-# CONFIG_MLX4_CORE is not set
-#- file drivers/net/sfc/Kconfig goes here
-#- file drivers/net/tokenring/Kconfig goes here
-#- file drivers/net/wireless/Kconfig goes here
-#- file drivers/net/usb/Kconfig goes here
-#- file drivers/net/pcmcia/Kconfig goes here
-#- file drivers/net/wan/Kconfig goes here
-#- file drivers/atm/Kconfig goes here
-#- file drivers/s390/net/Kconfig goes here
-
-#-
-#- *** FILE: drivers/net/hamradio/Kconfig ***
-#-
-CONFIG_BAYCOM_EPP=m
-
-#-
-#- *** FILE: drivers/net/wan/Kconfig ***
-#-
-#- X.25/LAPB support is disabled
-#- Cyclades-PC300 MLPPP support is disabled.
-#- Refer to the file README.mlppp, provided by PC300 package.
-CONFIG_PC300TOO=m
-
-#-
-#- *** FILE: drivers/net/wireless/Kconfig ***
-#-
-CONFIG_WLAN_PRE80211=y
-CONFIG_STRIP=m
-CONFIG_WLAN_80211=y
-#- file drivers/net/wireless/p54/Kconfig goes here
-#- file drivers/net/wireless/ath5k/Kconfig goes here
-#- file drivers/net/wireless/iwlwifi/Kconfig goes here
-#- file drivers/net/wireless/hostap/Kconfig goes here
-#- file drivers/net/wireless/b43/Kconfig goes here
-#- file drivers/net/wireless/b43legacy/Kconfig goes here
-#- file drivers/net/wireless/zd1211rw/Kconfig goes here
-#- file drivers/net/wireless/rt2x00/Kconfig goes here
-
-#-
-#- *** FILE: drivers/net/wireless/hostap/Kconfig ***
-#-
-CONFIG_HOSTAP_FIRMWARE=y
-CONFIG_HOSTAP_FIRMWARE_NVRAM=y
-
-#-
-#- *** FILE: drivers/parport/Kconfig ***
-#-
-CONFIG_PARPORT_SUNBPP=m
-CONFIG_PARPORT_1284=y
-
-#-
-#- *** FILE: drivers/pci/Kconfig ***
-#-
-# CONFIG_ARCH_SUPPORTS_MSI is not set
-
-#-
-#- *** FILE: drivers/rtc/Kconfig ***
-#-
-CONFIG_RTC_LIB=m
-CONFIG_RTC_CLASS=m
-#- RTC interfaces
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_DEV=y
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-CONFIG_RTC_DRV_TEST=m
-#- I2C RTC drivers
-CONFIG_RTC_DRV_DS1307=m
-CONFIG_RTC_DRV_DS1672=m
-# CONFIG_RTC_DRV_MAX6900 is not set
-CONFIG_RTC_DRV_RS5C372=m
-CONFIG_RTC_DRV_ISL1208=m
-CONFIG_RTC_DRV_X1205=m
-CONFIG_RTC_DRV_PCF8563=m
-# CONFIG_RTC_DRV_PCF8583 is not set
-CONFIG_RTC_DRV_M41T80=m
-# CONFIG_RTC_DRV_M41T80_WDT is not set
-#- SPI RTC drivers
-CONFIG_RTC_DRV_MAX6902=m
-CONFIG_RTC_DRV_RS5C348=m
-#- Platform RTC drivers
-CONFIG_RTC_DRV_DS1553=m
-CONFIG_RTC_DRV_DS1742=m
-CONFIG_RTC_DRV_STK17TA8=m
-CONFIG_RTC_DRV_M48T86=m
-CONFIG_RTC_DRV_M48T59=m
-CONFIG_RTC_DRV_V3020=m
-#- on-CPU RTC drivers
-
-#-
-#- *** FILE: drivers/sbus/char/Kconfig ***
-#-
-CONFIG_SUN_OPENPROMIO=m
-CONFIG_SUN_MOSTEK_RTC=m
-CONFIG_SUN_BPP=m
-CONFIG_SUN_VIDEOPIX=m
-CONFIG_TADPOLE_TS102_UCTRL=m
-CONFIG_SUN_JSFLASH=m
-
-#-
-#- *** FILE: drivers/scsi/Kconfig ***
-#-
-#- SCSI support type (disk, tape, CD-ROM)
-#- Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-#- file drivers/scsi/libsas/Kconfig goes here
-#- file drivers/scsi/aic7xxx/Kconfig.aic7xxx goes here
-#- file drivers/scsi/aic7xxx/Kconfig.aic79xx goes here
-#- file drivers/scsi/aic94xx/Kconfig goes here
-#- file drivers/scsi/megaraid/Kconfig.megaraid goes here
-# CONFIG_SCSI_IPS is not set
-CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-CONFIG_SCSI_QLOGICPTI=m
-#- file drivers/scsi/qla2xxx/Kconfig goes here
-#- file drivers/scsi/qla4xxx/Kconfig goes here
-# CONFIG_SCSI_NSP32 is not set
-#- file drivers/scsi/arm/Kconfig goes here
-CONFIG_SCSI_SUNESP=m
-#- file drivers/scsi/pcmcia/Kconfig goes here
-
-#-
-#- *** FILE: drivers/scsi/aic7xxx/Kconfig.aic79xx ***
-#-
-CONFIG_AIC79XX_CMDS_PER_DEVICE=32
-
-#-
-#- *** FILE: drivers/scsi/aic7xxx/Kconfig.aic7xxx ***
-#-
-CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
-
-#-
-#- *** FILE: drivers/serial/Kconfig ***
-#-
-#- Non-8250 serial port support
-CONFIG_SERIAL_SUNCORE=y
-CONFIG_SERIAL_SUNZILOG=y
-CONFIG_SERIAL_SUNZILOG_CONSOLE=y
-CONFIG_SERIAL_SUNSU=y
-CONFIG_SERIAL_SUNSU_CONSOLE=y
-CONFIG_SERIAL_SUNSAB=y
-CONFIG_SERIAL_SUNSAB_CONSOLE=y
-
-#-
-#- *** FILE: drivers/video/Kconfig ***
-#-
-#- file drivers/char/agp/Kconfig goes here
-#- file drivers/char/drm/Kconfig goes here
-CONFIG_VGASTATE=m
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-CONFIG_FB_SYS_FILLRECT=m
-CONFIG_FB_SYS_COPYAREA=m
-CONFIG_FB_SYS_IMAGEBLIT=m
-CONFIG_FB_SYS_FOPS=m
-CONFIG_FB_DEFERRED_IO=y
-# CONFIG_FB_MACMODES is not set
-#- Frame buffer hardware drivers
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_IMSTT is not set
-CONFIG_FB_SBUS=y
-# CONFIG_FB_BW2 is not set
-CONFIG_FB_CG3=y
-CONFIG_FB_CG6=y
-CONFIG_FB_TCX=y
-CONFIG_FB_CG14=y
-CONFIG_FB_P9100=y
-CONFIG_FB_LEO=y
-# CONFIG_FB_IGA is not set
-# CONFIG_FB_RADEON is not set
-CONFIG_FB_ATY128=m
-# CONFIG_FB_VT8623 is not set
-# CONFIG_FB_ARK is not set
-# CONFIG_FB_PM3 is not set
-#- file drivers/video/geode/Kconfig goes here
-#- file drivers/video/omap/Kconfig goes here
-#- file drivers/video/backlight/Kconfig goes here
-#- file drivers/video/display/Kconfig goes here
-#- file drivers/video/console/Kconfig goes here
-#- file drivers/video/logo/Kconfig goes here
-
-#-
-#- *** FILE: drivers/video/console/Kconfig ***
-#-
-CONFIG_PROM_CONSOLE=y
-CONFIG_FONTS=y
-CONFIG_FONT_6x11=y
-# CONFIG_FONT_7x14 is not set
-# CONFIG_FONT_PEARL_8x8 is not set
-# CONFIG_FONT_ACORN_8x8 is not set
-CONFIG_FONT_SUN8x16=y
-CONFIG_FONT_SUN12x22=y
-# CONFIG_FONT_10x18 is not set
-
-#-
-#- *** FILE: drivers/video/logo/Kconfig ***
-#-
-CONFIG_LOGO=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-CONFIG_LOGO_LINUX_CLUT224=y
-CONFIG_LOGO_SUN_CLUT224=y
-
-#-
-#- *** FILE: fs/Kconfig.binfmt ***
-#-
-CONFIG_BINFMT_AOUT=y
-
-#-
-#- *** FILE: init/Kconfig ***
-#-
-#- file usr/Kconfig goes here
-CONFIG_UID16=y
-#- file arch/Kconfig goes here
-#- file block/Kconfig goes here
-
-#-
-#- *** FILE: lib/Kconfig.debug ***
-#-
-CONFIG_DEBUG_PI_LIST=y
-CONFIG_DEBUG_MUTEXES=y
-# CONFIG_DEBUG_HIGHMEM is not set
-CONFIG_DEBUG_BUGVERBOSE=y
-#- file samples/Kconfig goes here
-#- file lib/Kconfig.kgdb goes here
-
-#-
-#- *** FILE: mm/Kconfig ***
-#-
-CONFIG_FLATMEM_MANUAL=y
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-# CONFIG_SPARSEMEM_MANUAL is not set
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-# CONFIG_SPARSEMEM_STATIC is not set
-#- Memory hotplug is currently incompatible with Software Suspend
-# CONFIG_RESOURCES_64BIT is not set
-CONFIG_ZONE_DMA_FLAG=1
-
-#-
-#- *** FILE: net/bluetooth/cmtp/Kconfig ***
-#-
-# CONFIG_BT_CMTP is not set
-
-#-
-#- *** FILE: sound/pci/Kconfig ***
-#-
-# CONFIG_SND_HDA_INTEL is not set
-# CONFIG_SND_HDSP is not set
-# CONFIG_SND_HDSPM is not set
-CONFIG_SND_ICE1712=m
-CONFIG_SND_ICE1724=m
-# CONFIG_SND_INTEL8X0 is not set
-CONFIG_SND_INTEL8X0M=m
-CONFIG_SND_KORG1212=m
-CONFIG_SND_KORG1212_FIRMWARE_IN_KERNEL=y
-CONFIG_SND_MAESTRO3=m
-CONFIG_SND_MAESTRO3_FIRMWARE_IN_KERNEL=y
-CONFIG_SND_MIXART=m
-CONFIG_SND_NM256=m
-# CONFIG_SND_PCXHR is not set
-# CONFIG_SND_RIPTIDE is not set
-CONFIG_SND_RME32=m
-# CONFIG_SND_RME96 is not set
-CONFIG_SND_RME9652=m
-CONFIG_SND_SONICVIBES=m
-CONFIG_SND_TRIDENT=m
-# CONFIG_SND_VIA82XX is not set
-CONFIG_SND_VIA82XX_MODEM=m
-CONFIG_SND_VX222=m
-CONFIG_SND_YMFPCI=m
-CONFIG_SND_YMFPCI_FIRMWARE_IN_KERNEL=y
-CONFIG_SND_AC97_POWER_SAVE=y
-
-#-
-#- *** FILE: sound/sparc/Kconfig ***
-#-
-CONFIG_SND_SUN_AMD7930=m
-CONFIG_SND_SUN_CS4231=m
-CONFIG_SND_SUN_DBRI=m
================================================================

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

