SOURCES (LINUX_2_6): kernel-sparc64.config - missing options and removed du...

[sparky]

Author: sparky                       Date: Sat Sep 27 00:24:11 2008 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- missing options and removed duplicates

---- Files affected:
SOURCES:
   kernel-sparc64.config (1.48.2.152 -> 1.48.2.153) 

---- Diffs:

================================================================
Index: SOURCES/kernel-sparc64.config
diff -u SOURCES/kernel-sparc64.config:1.48.2.152 SOURCES/kernel-sparc64.config:1.48.2.153
--- SOURCES/kernel-sparc64.config:1.48.2.152	Fri May 23 23:30:50 2008
+++ SOURCES/kernel-sparc64.config	Sat Sep 27 02:24:05 2008
@@ -45,15 +45,12 @@
 # General machine setup
 #
 CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ=y
 CONFIG_NR_CPUS=64
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_TABLE=m
 # 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
@@ -260,8 +257,6 @@
 CONFIG_PHANTOM=m
 CONFIG_EEPROM_93CX6=m
 CONFIG_SGI_IOC4=m
-CONFIG_IDE=m
-CONFIG_BLK_DEV_IDE=m
 
 #
 # Please see Documentation/ide.txt for help/info on IDE drives
@@ -356,16 +351,10 @@
 #
 # Controllers
 #
-CONFIG_IEEE1394_PCILYNX=m
-CONFIG_IEEE1394_OHCI1394=m
 
 #
 # Protocols
 #
-CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y
-CONFIG_IEEE1394_ETH1394=m
-CONFIG_IEEE1394_DV1394=m
-CONFIG_IEEE1394_RAWIO=m
 CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
 CONFIG_I2O_EXT_ADAPTEC=y
 CONFIG_I2O_EXT_ADAPTEC_DMA64=y
@@ -422,7 +411,6 @@
 CONFIG_RTL8187=m
 CONFIG_HOSTAP_FIRMWARE=y
 # CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
-# CONFIG_BCM43XX is not set
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
 
@@ -640,16 +628,11 @@
 CONFIG_VIDEO_CPIA_PP=m
 CONFIG_VIDEO_CPIA_USB=m
 CONFIG_VIDEO_CPIA2=m
-# CONFIG_TUNER_TEA5761 is not set
 CONFIG_VIDEO_SAA7134_ALSA=m
 # CONFIG_VIDEO_SAA7134_DVB is not set
 CONFIG_VIDEO_CX88_ALSA=m
 CONFIG_VIDEO_CX88_BLACKBIRD=m
 # CONFIG_VIDEO_CX88_DVB is not set
-CONFIG_VIDEO_IVTV=m
-# CONFIG_V4L_USB_DRIVERS is not set
-CONFIG_VIDEO_PVRUSB2_SYSFS=y
-# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
 CONFIG_VIDEO_EM28XX=m
 CONFIG_VIDEO_USBVISION=m
 CONFIG_USB_VICAM=m
@@ -887,7 +870,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
 
@@ -1014,7 +996,6 @@
 # CONFIG_USB_FILE_STORAGE_TEST is not set
 CONFIG_USB_G_SERIAL=m
 CONFIG_USB_MIDI_GADGET=m
-CONFIG_USB_G_PRINTER=m
 
 #
 # MMC/SD Card Drivers
@@ -1092,8 +1073,6 @@
 CONFIG_ENVCTRL=m
 CONFIG_DISPLAY7SEG=m
 
-CONFIG_DLM=m
-# CONFIG_DLM_DEBUG is not set
 
 #
 # Kernel hacking
@@ -1109,4 +1088,7 @@
 # CONFIG_DEBUG_STACK_USAGE is not set
 # CONFIG_DEBUG_DCFLUSH is not set
 # CONFIG_STACK_DEBUG is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
+
+CONFIG_NUMA=y
+CONFIG_MIGRATION=y
+CONFIG_INFINIBAND_IPATH=m
================================================================

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