SOURCES (LINUX_2_6): kernel-ppc.config - remove options already defined in ...

[sparky]

Author: sparky                       Date: Fri Sep 19 01:39:15 2008 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- remove options already defined in multiarch.config

---- Files affected:
SOURCES:
   kernel-ppc.config (1.3.2.3.2.2.2.241 -> 1.3.2.3.2.2.2.242) 

---- Diffs:

================================================================
Index: SOURCES/kernel-ppc.config
diff -u SOURCES/kernel-ppc.config:1.3.2.3.2.2.2.241 SOURCES/kernel-ppc.config:1.3.2.3.2.2.2.242
--- SOURCES/kernel-ppc.config:1.3.2.3.2.2.2.241	Wed Sep 17 21:37:33 2008
+++ SOURCES/kernel-ppc.config	Fri Sep 19 03:39:09 2008
@@ -79,8 +79,6 @@
 # CONFIG_CPU_FREQ_DEBUG is not set
 CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_FREQ_STAT_DETAILS=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=m
 CONFIG_CPU_FREQ_GOV_POWERSAVE=m
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
@@ -399,11 +397,6 @@
 CONFIG_EEPROM_93CX6=m
 # CONFIG_SGI_IOC4 is not set
 
-#
-# ATA/ATAPI/MFM/RLL support
-#
-CONFIG_IDE=m
-CONFIG_BLK_DEV_IDE=m
 
 #
 # Please see Documentation/ide.txt for help/info on IDE drives
@@ -456,11 +449,7 @@
 CONFIG_BLK_DEV_TRM290=m
 CONFIG_BLK_DEV_VIA82CXXX=m
 CONFIG_BLK_DEV_TC86C001=m
-CONFIG_BLK_DEV_IDE_PMAC=y
-CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y
-CONFIG_BLK_DEV_IDEDMA_PMAC=y
 # CONFIG_IDE_ARM is not set
-CONFIG_BLK_DEV_IDEDMA=y
 # CONFIG_BLK_DEV_HD is not set
 
 #
@@ -485,7 +474,6 @@
 CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
 CONFIG_AIC79XX_CMDS_PER_DEVICE=32
 # CONFIG_AIC94XX_DEBUG is not set
-# CONFIG_SCSI_DPT_I2O is not set
 CONFIG_SCSI_BUSLOGIC=m
 # CONFIG_SCSI_OMIT_FLASHPOINT is not set
 CONFIG_SCSI_EATA=m
@@ -538,20 +526,12 @@
 # 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
@@ -951,11 +931,6 @@
 CONFIG_HVC_RTAS=y
 
 #
-# IPMI
-#
-CONFIG_WATCHDOG_NOWAYOUT=y
-
-#
 # Watchdog Device Drivers
 #
 CONFIG_MPC5200_WDT=m
@@ -1069,7 +1044,6 @@
 CONFIG_VIDEO_CPIA_PP=m
 CONFIG_VIDEO_CPIA_USB=m
 CONFIG_VIDEO_CPIA2=m
-# CONFIG_TUNER_TEA5761 is not set
 # CONFIG_VIDEO_STRADIS is not set
 # CONFIG_VIDEO_ZORAN is not set
 CONFIG_VIDEO_SAA7134_ALSA=m
@@ -1078,13 +1052,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
@@ -1220,7 +1191,6 @@
 CONFIG_FB_PM3=m
 CONFIG_FB_FSL_DIU=m
 CONFIG_FB_IBM_GXT4500=m
-CONFIG_LCD_LTV350QV=m
 CONFIG_SND_POWERMAC=m
 CONFIG_SND_POWERMAC_AUTO_DRC=y
 CONFIG_SND_AOA=m
@@ -1405,7 +1375,6 @@
 CONFIG_USB_STORAGE_SDDR55=y
 CONFIG_USB_STORAGE_JUMPSHOT=y
 CONFIG_USB_STORAGE_ALAUDA=y
-CONFIG_USB_STORAGE_ONETOUCH=y
 CONFIG_USB_STORAGE_KARMA=y
 CONFIG_USB_LIBUSUAL=y
 
@@ -1613,7 +1582,6 @@
 CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_STACKOVERFLOW is not set
 # CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
 # CONFIG_DEBUGGER is not set
 # CONFIG_XMON is not set
 # CONFIG_BDI_SWITCH is not set
================================================================

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