SOURCES (LINUX_2_6): kernel-ppc64.config - remove options already in multiarch

[sparky]

Author: sparky                       Date: Sat Sep 27 19:26:17 2008 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- remove options already in multiarch

---- Files affected:
SOURCES:
   kernel-ppc64.config (1.1.2.38 -> 1.1.2.39) 

---- Diffs:

================================================================
Index: SOURCES/kernel-ppc64.config
diff -u SOURCES/kernel-ppc64.config:1.1.2.38 SOURCES/kernel-ppc64.config:1.1.2.39
--- SOURCES/kernel-ppc64.config:1.1.2.38	Sat Sep 27 21:21:02 2008
+++ SOURCES/kernel-ppc64.config	Sat Sep 27 21:26:11 2008
@@ -13,7 +13,6 @@
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_PPC=y
-CONFIG_EARLY_PRINTK=y
 CONFIG_COMPAT=y
 CONFIG_SYSVIPC_COMPAT=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
@@ -90,7 +89,6 @@
 CONFIG_XMON=y
 # CONFIG_XMON_DEFAULT is not set
 CONFIG_XMON_DISASSEMBLY=y
-# CONFIG_IRQSTACKS is not set
 CONFIG_BOOTX_TEXT=y
 # CONFIG_PPC_EARLY_DEBUG is not set
 
@@ -372,8 +370,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
@@ -443,8 +439,6 @@
 #-
 #- *** FILE: drivers/ide/Kconfig ***
 #-
-CONFIG_IDE=m
-CONFIG_BLK_DEV_IDE=m
 #- Please see Documentation/ide/ide.txt for help/info on IDE drives
 # CONFIG_BLK_DEV_IDE_SATA is not set
 # CONFIG_BLK_DEV_IDEDISK is not set
@@ -504,13 +498,6 @@
 #- *** FILE: drivers/ieee1394/Kconfig ***
 #-
 #- file drivers/firewire/Kconfig goes here
-CONFIG_IEEE1394_OHCI1394=m
-#- PCILynx controller requires I2C
-CONFIG_IEEE1394_PCILYNX=m
-#- SBP-2 support (for storage devices) requires SCSI
-CONFIG_IEEE1394_ETH1394=m
-CONFIG_IEEE1394_RAWIO=m
-CONFIG_IEEE1394_DV1394=m
 
 #-
 #- *** FILE: drivers/infiniband/hw/ipath/Kconfig ***
@@ -780,7 +767,6 @@
 #- file drivers/media/video/au0828/Kconfig goes here
 #- file drivers/media/video/ivtv/Kconfig goes here
 #- file drivers/media/video/cx18/Kconfig goes here
-CONFIG_V4L_USB_DRIVERS=y
 #- file drivers/media/video/uvc/Kconfig goes here
 #- file drivers/media/video/pvrusb2/Kconfig goes here
 #- file drivers/media/video/em28xx/Kconfig goes here
@@ -828,9 +814,6 @@
 #-
 #- *** FILE: drivers/media/video/pvrusb2/Kconfig ***
 #-
-CONFIG_VIDEO_PVRUSB2=m
-CONFIG_VIDEO_PVRUSB2_SYSFS=y
-# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
 
 #-
 #- *** FILE: drivers/media/video/pwc/Kconfig ***
@@ -1606,7 +1589,6 @@
 #-
 #- *** FILE: drivers/watchdog/Kconfig ***
 #-
-CONFIG_WATCHDOG_NOWAYOUT=y
 #- Watchdog Device Drivers
 CONFIG_WATCHDOG_RTAS=m
 #- ISA-based Watchdog Cards
================================================================

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