SOURCES (LINUX_2_6): kernel-x86_64.config, kernel-multiarch.config - cleanu...

[pluto]

Author: pluto                        Date: Fri Sep 19 08:26:19 2008 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- cleanup x86_64 from repeated defs and move some related defs to multiarch.

---- Files affected:
SOURCES:
   kernel-x86_64.config (1.1.2.178 -> 1.1.2.179) , kernel-multiarch.config (1.1.2.35 -> 1.1.2.36) 

---- Diffs:

================================================================
Index: SOURCES/kernel-x86_64.config
diff -u SOURCES/kernel-x86_64.config:1.1.2.178 SOURCES/kernel-x86_64.config:1.1.2.179
--- SOURCES/kernel-x86_64.config:1.1.2.178	Tue May 20 22:20:53 2008
+++ SOURCES/kernel-x86_64.config	Fri Sep 19 10:26:12 2008
@@ -33,8 +33,6 @@
 #
 # General setup
 #
-CONFIG_AUDITSYSCALL=y
-CONFIG_LOG_BUF_SHIFT=16
 CONFIG_UID16=y
 CONFIG_SLABINFO=y
 
@@ -170,8 +168,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
@@ -410,8 +406,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
@@ -530,17 +524,10 @@
 #
 # 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
 CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
 CONFIG_I2O_EXT_ADAPTEC=y
 CONFIG_I2O_EXT_ADAPTEC_DMA64=y
@@ -944,11 +931,6 @@
 CONFIG_VIDEO_CX88_BLACKBIRD=m
 CONFIG_VIDEO_CX88_DVB=m
 CONFIG_VIDEO_CX88_VP3054=m
-CONFIG_VIDEO_IVTV=m
-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
@@ -1011,7 +993,6 @@
 CONFIG_DVB_CINERGYT2_ENABLE_RC_INPUT_DEVICE=y
 CONFIG_DVB_CINERGYT2_RC_QUERY_INTERVAL=100
 
-CONFIG_TUNER_TEA5761=m
 CONFIG_VGASTATE=m
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
@@ -1032,7 +1013,6 @@
 CONFIG_FB_ASILIANT=y
 # CONFIG_FB_IMSTT is not set
 CONFIG_FB_VGA16=m
-# CONFIG_FB_VESA is not set
 CONFIG_FB_HECUBA=m
 CONFIG_FB_HGA=m
 CONFIG_FB_HGA_ACCEL=y
@@ -1078,8 +1058,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_CORGI=m
 CONFIG_BACKLIGHT_PROGEAR=m
 CONFIG_BACKLIGHT_CARILLO_RANCH=m
 
@@ -1455,9 +1433,7 @@
 # CONFIG_PROVE_LOCKING is not set
 # CONFIG_LOCK_STAT is not set
 CONFIG_DEBUG_BUGVERBOSE=y
-# CONFIG_FRAME_POINTER is not set
 # CONFIG_DEBUG_RODATA is not set
 # CONFIG_IOMMU_DEBUG is not set
-CONFIG_EARLY_PRINTK=y
 # CONFIG_DEBUG_STACKOVERFLOW is not set
 # CONFIG_DEBUG_STACK_USAGE is not set

================================================================
Index: SOURCES/kernel-multiarch.config
diff -u SOURCES/kernel-multiarch.config:1.1.2.35 SOURCES/kernel-multiarch.config:1.1.2.36
--- SOURCES/kernel-multiarch.config:1.1.2.35	Wed Sep 17 21:41:02 2008
+++ SOURCES/kernel-multiarch.config	Fri Sep 19 10:26:13 2008
@@ -931,7 +931,9 @@
 # Protocols
 #
 IEEE1394_VIDEO1394 all=m sparc=
+IEEE1394_SBP2_PHYS_DMA all=n
 IEEE1394_SBP2 all=m sparc=
+IEEE1394_ETH1394_ROM_ENTRY all=y sparc=
 IEEE1394_ETH1394 all=m sparc=
 IEEE1394_DV1394 all=m sparc=
 IEEE1394_RAWIO all=m sparc=
@@ -1579,6 +1581,8 @@
 VIDEO_PVRUSB2_DVB all=y sparc=n
 VIDEO_PVRUSB2_ONAIR_CREATOR all=y sparc=
 VIDEO_PVRUSB2_ONAIR_USB2 all=y sparc=
+VIDEO_PVRUSB2_SYSFS all=y sparc=n
+VIDEO_PVRUSB2_DEBUGIFC all=n
 VIDEO_EM28XX_ALSA all=m sparc=n
 VIDEO_EM28XX_DVB all=m sparc=n
 USB_STKWEBCAM all=m
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-x86_64.config?r1=1.1.2.178&r2=1.1.2.179&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-multiarch.config?r1=1.1.2.35&r2=1.1.2.36&f=u