SOURCES (hawk-LINUX_2_6): kernel-common.config, kernel-i386.config...

hawk hawk at pld-linux.org
Sun Jun 24 00:04:41 CEST 2007 

Author: hawk                         Date: Sat Jun 23 22:04:41 2007 GMT
Module: SOURCES                       Tag: hawk-LINUX_2_6
---- Log message:
- merged config cleanups from kernel-vanilla-*.config files

---- Files affected:
SOURCES:
   kernel-common.config (1.1.2.4 -> 1.1.2.5) , kernel-i386.config (1.82.10.163.2.3 -> 1.82.10.163.2.4) , kernel-i386-smp.config (1.59.10.154.2.3 -> 1.59.10.154.2.4) , kernel-netfilter.config (1.34.2.63.4.4 -> 1.34.2.63.4.5) , kernel-ppc.config (1.3.2.3.2.2.2.206.4.3 -> 1.3.2.3.2.2.2.206.4.4) , kernel-ppc-smp.config (1.6.4.1.2.206.4.3 -> 1.6.4.1.2.206.4.4) , kernel-x86_64.config (1.1.2.137.2.4 -> 1.1.2.137.2.5) , kernel-x86_64-smp.config (1.1.2.137.2.4 -> 1.1.2.137.2.5) 

---- Diffs:

================================================================
Index: SOURCES/kernel-common.config
diff -u SOURCES/kernel-common.config:1.1.2.4 SOURCES/kernel-common.config:1.1.2.5
--- SOURCES/kernel-common.config:1.1.2.4	Mon May  7 16:16:04 2007
+++ SOURCES/kernel-common.config	Sun Jun 24 00:04:36 2007
@@ -27,7 +27,6 @@
 CONFIG_RELAY=y
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_UID16=y
-CONFIG_VM86=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 # CONFIG_EMBEDDED is not set
 CONFIG_KALLSYMS=y
@@ -173,7 +172,6 @@
 CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
 CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
 CONFIG_HOTPLUG_PCI_SHPC=m
-# CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE is not set
 
 #
 # Executable file formats / Emulations
@@ -205,7 +203,6 @@
 # CONFIG_IP_FIB_TRIE is not set
 CONFIG_IP_FIB_HASH=y
 CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_FWMARK=y
 CONFIG_IP_ROUTE_MULTIPATH=y
 CONFIG_IP_ROUTE_MULTIPATH_CACHED=y
 CONFIG_IP_ROUTE_MULTIPATH_RR=m
@@ -365,7 +362,6 @@
 CONFIG_VLAN_8021Q=m
 CONFIG_DECNET=m
 CONFIG_DECNET_ROUTER=y
-CONFIG_DECNET_ROUTE_FWMARK=y
 CONFIG_LLC=y
 CONFIG_LLC2=m
 CONFIG_IPX=m
@@ -381,7 +377,6 @@
 CONFIG_IPDDP_DECAP=y
 CONFIG_X25=m
 CONFIG_LAPB=m
-# CONFIG_NET_DIVERT is not set
 CONFIG_ECONET=m
 CONFIG_ECONET_AUNUDP=y
 CONFIG_ECONET_NATIVE=y
@@ -774,7 +769,6 @@
 CONFIG_MAC_FLOPPY=m
 CONFIG_BLK_DEV_XD=m
 CONFIG_PARIDE=m
-CONFIG_PARIDE_PARPORT=m
 
 #
 # Parallel IDE high-level drivers
@@ -863,7 +857,6 @@
 CONFIG_BLK_DEV_SL82C105=m
 CONFIG_BLK_DEV_IDEDMA_PCI=y
 # CONFIG_BLK_DEV_IDEDMA_FORCED is not set
-CONFIG_IDEDMA_PCI_AUTO=y
 # CONFIG_IDEDMA_ONLYDISK is not set
 CONFIG_BLK_DEV_AEC62XX=m
 CONFIG_BLK_DEV_ALI15X3=m
@@ -912,7 +905,6 @@
 CONFIG_BLK_DEV_UMC8672=m
 CONFIG_BLK_DEV_IDEDMA=y
 CONFIG_IDEDMA_IVB=y
-CONFIG_IDEDMA_AUTO=y
 # CONFIG_BLK_DEV_HD is not set
 
 #
@@ -1173,10 +1165,8 @@
 # Subsystem Options
 #
 # CONFIG_IEEE1394_VERBOSEDEBUG is not set
-CONFIG_IEEE1394_OUI_DB=y
 CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y
 CONFIG_IEEE1394_CONFIG_ROM_IP1394=y
-CONFIG_IEEE1394_EXPORT_FULL_API=y
 
 #
 # Device Drivers
@@ -1393,9 +1383,6 @@
 CONFIG_TIGON3=m
 CONFIG_BNX2=m
 CONFIG_MV643XX_ETH=m
-CONFIG_MV643XX_ETH_0=y
-CONFIG_MV643XX_ETH_1=y
-CONFIG_MV643XX_ETH_2=y
 CONFIG_QLA3XXX=m
 CONFIG_ATL1=m
 
@@ -1538,7 +1525,6 @@
 CONFIG_C101=m
 CONFIG_FARSYNC=m
 CONFIG_DLCI=m
-CONFIG_DLCI_COUNT=24
 CONFIG_DLCI_MAX=8
 CONFIG_SDLA=m
 CONFIG_WAN_ROUTER_DRIVERS=y
@@ -1609,7 +1595,6 @@
 CONFIG_SHAPER=m
 CONFIG_NETCONSOLE=m
 CONFIG_NETPOLL=y
-CONFIG_NETPOLL_RX=y
 CONFIG_NETPOLL_TRAP=y
 CONFIG_NET_POLL_CONTROLLER=y
 
@@ -1915,7 +1900,6 @@
 #
 CONFIG_WATCHDOG=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
-CONFIG_ITCO_WDT=m
 
 #
 # Watchdog Device Drivers
@@ -1975,41 +1959,8 @@
 CONFIG_SONYPI=m
 
 #
-# Ftape, the floppy tape device driver
-#
-CONFIG_FTAPE=m
-CONFIG_ZFTAPE=m
-CONFIG_ZFT_DFLT_BLK_SZ=10240
-
-#
-# The compressor will be built as a module only!
-#
-CONFIG_ZFT_COMPRESSOR=m
-CONFIG_FT_NR_BUFFERS=3
-CONFIG_FT_PROC_FS=y
-
-#
-# Debugging output
-#
-CONFIG_FT_NORMAL_DEBUG=y
-# CONFIG_FT_FULL_DEBUG is not set
-# CONFIG_FT_NO_TRACE is not set
-# CONFIG_FT_NO_TRACE_AT_ALL is not set
-
-#
-# Hardware configuration
-#
-
-#
 # Floppy tape controllers
 #
-CONFIG_FT_STD_FDC=y
-# CONFIG_FT_MACH2 is not set
-# CONFIG_FT_PROBE_FC10 is not set
-# CONFIG_FT_ALT_FDC is not set
-CONFIG_FT_FDC_THR=8
-CONFIG_FT_FDC_MAX_RATE=2000
-CONFIG_FT_ALPHA_CLOCK=0
 # CONFIG_AGP configured per-arch
 CONFIG_AGP_ALI=m
 CONFIG_AGP_ATI=m
@@ -2245,7 +2196,7 @@
 CONFIG_VIDEO_DEV=m
 CONFIG_VIDEO_V4L1=y
 CONFIG_VIDEO_V4L1_COMPAT=y
-CONFIG_VIDEO_V4L2=m
+CONFIG_VIDEO_V4L2=y
 
 #
 # Video Capture Adapters
@@ -2280,7 +2231,6 @@
 CONFIG_VIDEO_SAA7134_ALSA=m
 CONFIG_VIDEO_SAA7134_OSS=m
 CONFIG_VIDEO_SAA7134_DVB=m
-CONFIG_VIDEO_SAA7134_DVB_ALL_FRONTENDS=y
 CONFIG_VIDEO_MXB=m
 CONFIG_VIDEO_DPC=m
 CONFIG_VIDEO_HEXIUM_ORION=m
@@ -2290,7 +2240,6 @@
 CONFIG_VIDEO_CX88_ALSA=m
 CONFIG_VIDEO_CX88_BLACKBIRD=m
 CONFIG_VIDEO_CX88_DVB=m
-CONFIG_VIDEO_CX88_DVB_ALL_FRONTENDS=y
 CONFIG_VIDEO_OVCAMCHIP=m
 CONFIG_VIDEO_CAFE_CCIC=m
 
@@ -2345,8 +2294,6 @@
 CONFIG_RADIO_GEMTEK_PCI=m
 CONFIG_RADIO_MAXIRADIO=m
 CONFIG_RADIO_MAESTRO=m
-CONFIG_RADIO_MIROPCM20=m
-CONFIG_RADIO_MIROPCM20_RDS=m
 CONFIG_RADIO_SF16FMI=m
 CONFIG_RADIO_SF16FMR2=m
 CONFIG_RADIO_TERRATEC=m
@@ -2463,7 +2410,6 @@
 CONFIG_DVB_LGDT330X=m
 CONFIG_VIDEO_SAA7146=m
 CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_VIDEO_VIDEOBUF=m
 CONFIG_VIDEO_TUNER=m
 CONFIG_VIDEO_BUF=m
 CONFIG_VIDEO_BUF_DVB=m
@@ -2480,7 +2426,6 @@
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
-CONFIG_FB_FIRMWARE_EDID=y
 CONFIG_FB_MODE_HELPERS=y
 # CONFIG_FB_TILEBLITTING is not set
 CONFIG_FB_CIRRUS=m
@@ -2587,10 +2532,8 @@
 # CONFIG_LOGO is not set
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=m
-CONFIG_BACKLIGHT_DEVICE=y
 CONFIG_LCD_CLASS_DEVICE=m
 CONFIG_BACKLIGHT_PROGEAR=m
-CONFIG_LCD_DEVICE=y
 
 #
 # Sound
@@ -2630,7 +2573,6 @@
 CONFIG_SND_OPL4_LIB=m
 CONFIG_SND_VX_LIB=m
 CONFIG_SND_AC97_CODEC=m
-CONFIG_SND_AC97_BUS=m
 CONFIG_SND_DUMMY=m
 CONFIG_SND_VIRMIDI=m
 CONFIG_SND_MTPAV=m
@@ -2765,10 +2707,6 @@
 CONFIG_OBSOLETE_OSS=y
 CONFIG_SOUND_BT878=m
 CONFIG_SOUND_ES1371=m
-CONFIG_SOUND_EMU10K1=m
-CONFIG_MIDI_EMU10K1=y
-CONFIG_SOUND_FUSION=m
-CONFIG_SOUND_ES1371=m
 CONFIG_SOUND_ICH=m
 CONFIG_SOUND_TRIDENT=m
 # CONFIG_SOUND_MSNDCLAS is not set
@@ -2778,24 +2716,18 @@
 CONFIG_SOUND_OSS=m
 # CONFIG_SOUND_TRACEINIT is not set
 # CONFIG_SOUND_DMAP is not set
-CONFIG_SOUND_AD1816=m
-CONFIG_SOUND_AD1889=m
-CONFIG_SOUND_ADLIB=m
-CONFIG_SOUND_ACI_MIXER=m
 CONFIG_SOUND_CS4232=m
 CONFIG_SOUND_SSCAPE=m
 CONFIG_SOUND_VMIDI=m
 CONFIG_SOUND_TRIX=m
 CONFIG_SOUND_MSS=m
 CONFIG_SOUND_MPU401=m
-CONFIG_SOUND_NM256=m
 CONFIG_SOUND_PAS=m
 CONFIG_SOUND_PSS=m
 CONFIG_PSS_MIXER=y
 # CONFIG_PSS_HAVE_BOOT is not set
 CONFIG_SOUND_SB=m
 CONFIG_SOUND_YM3812=m
-CONFIG_SOUND_OPL3SA2=m
 CONFIG_SOUND_UART6850=m
 CONFIG_SOUND_AEDSP16=m
 CONFIG_SC6600=y
@@ -2804,7 +2736,6 @@
 CONFIG_SC6600_CDROMBASE=0x0
 # CONFIG_AEDSP16_MSS is not set
 CONFIG_AEDSP16_SBPRO=y
-CONFIG_AEDSP16_MPU401=y
 CONFIG_SOUND_TVMIXER=m
 CONFIG_SOUND_KAHLUA=m
 
@@ -2827,7 +2758,6 @@
 # Miscellaneous USB options
 #
 CONFIG_USB_DEVICEFS=y
-CONFIG_USB_BANDWIDTH=y
 CONFIG_USB_DYNAMIC_MINORS=y
 CONFIG_USB_SUSPEND=y
 # CONFIG_USB_OTG is not set
@@ -2841,7 +2771,6 @@
 CONFIG_USB_EHCI_TT_NEWSCHED=y
 CONFIG_USB_ISP116X_HCD=m
 CONFIG_USB_OHCI_HCD=m
-# CONFIG_USB_OHCI_BIG_ENDIAN is not set
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_UHCI_HCD=m
 CONFIG_USB_SL811_HCD=m
@@ -2879,7 +2808,6 @@
 # USB Input Devices
 #
 CONFIG_USB_HID=m
-CONFIG_USB_HIDINPUT=y
 CONFIG_USB_HIDINPUT_POWERBOOK=y
 CONFIG_HID_FF=y
 CONFIG_HID_PID=y
@@ -3029,9 +2957,7 @@
 CONFIG_USB_TEST=m
 CONFIG_USB_ADUTUX=m
 CONFIG_USB_PHIDGET=m
-CONFIG_USB_PHIDGETKIT=m
 CONFIG_USB_PHIDGETMOTORCONTROL=m
-CONFIG_USB_PHIDGETSERVO=m
 CONFIG_USB_FTDI_ELAN=m
 CONFIG_USB_TRANCEVIBRATOR=m
 CONFIG_USB_IOWARRIOR=m
@@ -3078,11 +3004,6 @@
 CONFIG_USB_G_SERIAL=m
 
 #
-# HID Devices
-#
-CONFIG_HID=m
-
-#
 # MMC/SD Card support
 #
 CONFIG_MMC=m
@@ -3134,7 +3055,6 @@
 CONFIG_INFINIBAND_USER_ACCESS=m
 CONFIG_INFINIBAND_MTHCA=m
 # CONFIG_INFINIBAND_MTHCA_DEBUG is not set
-CONFIG_IPATH_CORE=m
 CONFIG_INFINIBAND_IPATH=m
 CONFIG_INFINIBAND_IPOIB=m
 # CONFIG_INFINIBAND_IPOIB_DEBUG is not set
@@ -3287,7 +3207,6 @@
 CONFIG_ISO9660_FS=m
 CONFIG_JOLIET=y
 CONFIG_ZISOFS=y
-CONFIG_ZISOFS_FS=m
 CONFIG_UDF_FS=m
 CONFIG_UDF_NLS=y
 
@@ -3330,9 +3249,6 @@
 # CONFIG_BEFS_DEBUG is not set
 CONFIG_BFS_FS=m
 CONFIG_EFS_FS=m
-CONFIG_JFFS_FS=m
-CONFIG_JFFS_FS_VERBOSE=0
-# CONFIG_JFFS_PROC_FS is not set
 CONFIG_JFFS2_FS=m
 CONFIG_JFFS2_FS_DEBUG=0
 CONFIG_JFFS2_FS_WRITEBUFFER=y
@@ -3501,7 +3417,6 @@
 CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_CAPABILITIES=m
 CONFIG_SECURITY_ROOTPLUG=m
-CONFIG_SECURITY_SECLVL=m
 CONFIG_SECURITY_SELINUX=y
 CONFIG_SECURITY_SELINUX_BOOTPARAM=y
 CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0

================================================================
Index: SOURCES/kernel-i386.config
diff -u SOURCES/kernel-i386.config:1.82.10.163.2.3 SOURCES/kernel-i386.config:1.82.10.163.2.4
--- SOURCES/kernel-i386.config:1.82.10.163.2.3	Mon May  7 16:16:04 2007
+++ SOURCES/kernel-i386.config	Sun Jun 24 00:04:36 2007
@@ -63,6 +63,7 @@
 CONFIG_X86_INTEL_USERCOPY=y
 CONFIG_HPET_TIMER=y
 CONFIG_HPET_EMULATE_RTC=y
+CONFIG_VM86=y
 
 #
 # RCU implementation type:
@@ -109,7 +110,6 @@
 CONFIG_MTRR=y
 CONFIG_EFI=y
 CONFIG_BOOT_IOREMAP=y
-# CONFIG_REGPARM is not set
 CONFIG_SECCOMP=y
 
 #
@@ -138,7 +138,6 @@
 CONFIG_ACPI_BATTERY=m
 CONFIG_ACPI_BUTTON=m
 CONFIG_ACPI_VIDEO=m
-CONFIG_ACPI_HOTKEY=m
 CONFIG_ACPI_FAN=m
 CONFIG_ACPI_DOCK=m
 CONFIG_ACPI_BAY=m
@@ -230,9 +229,6 @@
 CONFIG_PCI_BIOS=y
 CONFIG_PCI_DIRECT=y
 CONFIG_PCI_MMCONFIG=y
-CONFIG_PCIEPORTBUS=y
-CONFIG_HOTPLUG_PCI_PCIE=m
-# CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set
 CONFIG_ISA_DMA_API=y
 CONFIG_ISA=y
 CONFIG_EISA=y
@@ -265,7 +261,6 @@
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_RWSEMS is not set
 # CONFIG_DEBUG_LOCK_ALLOC is not set
 # CONFIG_PROVE_LOCKING is not set
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
@@ -277,7 +272,6 @@
 # CONFIG_DEBUG_FS is not set
 # CONFIG_DEBUG_VM is not set
 # CONFIG_FRAME_POINTER is not set
-# CONFIG_UNWIND_INFO is not set
 CONFIG_FORCED_INLINING=y
 CONFIG_RCU_TORTURE_TEST=m
 # CONFIG_FAULT_INJECTION is not set

================================================================
Index: SOURCES/kernel-i386-smp.config
diff -u SOURCES/kernel-i386-smp.config:1.59.10.154.2.3 SOURCES/kernel-i386-smp.config:1.59.10.154.2.4
--- SOURCES/kernel-i386-smp.config:1.59.10.154.2.3	Mon May  7 16:16:04 2007
+++ SOURCES/kernel-i386-smp.config	Sun Jun 24 00:04:36 2007
@@ -66,6 +66,7 @@
 CONFIG_NR_CPUS=16
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
+CONFIG_VM86=y
 
 #
 # RCU implementation type:
@@ -111,7 +112,6 @@
 CONFIG_EFI=y
 CONFIG_IRQBALANCE=y
 CONFIG_BOOT_IOREMAP=y
-# CONFIG_REGPARM is not set
 CONFIG_SECCOMP=y
 
 CONFIG_KEXEC=y
@@ -139,7 +139,6 @@
 CONFIG_ACPI_BATTERY=m
 CONFIG_ACPI_BUTTON=m
 CONFIG_ACPI_VIDEO=m
-CONFIG_ACPI_HOTKEY=m
 CONFIG_ACPI_FAN=m
 CONFIG_ACPI_DOCK=m
 CONFIG_ACPI_BAY=m
@@ -231,9 +230,6 @@
 CONFIG_PCI_BIOS=y
 CONFIG_PCI_DIRECT=y
 CONFIG_PCI_MMCONFIG=y
-CONFIG_PCIEPORTBUS=y
-CONFIG_HOTPLUG_PCI_PCIE=m
-# CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set
 CONFIG_ISA_DMA_API=y
 CONFIG_ISA=y
 CONFIG_EISA=y
@@ -266,7 +262,6 @@
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_RWSEMS is not set
 # CONFIG_DEBUG_LOCK_ALLOC is not set
 # CONFIG_PROVE_LOCKING is not set
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
@@ -278,7 +273,6 @@
 # CONFIG_DEBUG_FS is not set
 # CONFIG_DEBUG_VM is not set
 # CONFIG_FRAME_POINTER is not set
-# CONFIG_UNWIND_INFO is not set
 CONFIG_FORCED_INLINING=y
 CONFIG_RCU_TORTURE_TEST=m
 # CONFIG_FAULT_INJECTION is not set

================================================================
Index: SOURCES/kernel-netfilter.config
diff -u SOURCES/kernel-netfilter.config:1.34.2.63.4.4 SOURCES/kernel-netfilter.config:1.34.2.63.4.5
--- SOURCES/kernel-netfilter.config:1.34.2.63.4.4	Sun Jun 17 21:53:19 2007
+++ SOURCES/kernel-netfilter.config	Sun Jun 24 00:04:36 2007
@@ -30,7 +30,6 @@
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
-CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
 CONFIG_NETFILTER_XT_TARGET_SECMARK=m
 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
@@ -38,7 +37,6 @@
 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
 CONFIG_NETFILTER_XT_MATCH_DCCP=m
 CONFIG_NETFILTER_XT_MATCH_DSCP=m
 CONFIG_NETFILTER_XT_MATCH_ESP=m
@@ -87,28 +85,20 @@
 CONFIG_IP_NF_MATCH_TOS=m
 CONFIG_IP_NF_MATCH_RECENT=m
 CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_DSCP=m
 CONFIG_IP_NF_MATCH_AH=m
-CONFIG_IP_NF_MATCH_MH=m
 CONFIG_IP_NF_MATCH_TTL=m
 CONFIG_IP_NF_MATCH_OWNER=m
 CONFIG_IP_NF_MATCH_ADDRTYPE=m
-CONFIG_IP_NF_MATCH_HASHLIMIT=m
 CONFIG_IP_NF_FILTER=m
 CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_LOG=m
 CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_IP_NF_TARGET_TCPMSS=m
 CONFIG_IP_NF_TARGET_MASQUERADE=m
 CONFIG_IP_NF_TARGET_REDIRECT=m
 CONFIG_IP_NF_TARGET_NETMAP=m
 CONFIG_IP_NF_TARGET_SAME=m
 CONFIG_IP_NF_NAT=m
 CONFIG_IP_NF_NAT_NEEDED=y
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_SAME=m
 CONFIG_NF_NAT_SNMP_BASIC=m
 CONFIG_IP_NF_NAT_SNMP_BASIC=m
 CONFIG_IP_NF_NAT_IRC=m
@@ -120,7 +110,6 @@
 CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_TARGET_TOS=m
 CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_DSCP=m
 CONFIG_IP_NF_TARGET_TTL=m
 CONFIG_IP_NF_TARGET_CLUSTERIP=m
 CONFIG_IP_NF_RAW=m

================================================================
Index: SOURCES/kernel-ppc.config
diff -u SOURCES/kernel-ppc.config:1.3.2.3.2.2.2.206.4.3 SOURCES/kernel-ppc.config:1.3.2.3.2.2.2.206.4.4
--- SOURCES/kernel-ppc.config:1.3.2.3.2.2.2.206.4.3	Mon May  7 16:16:04 2007
+++ SOURCES/kernel-ppc.config	Sun Jun 24 00:04:36 2007
@@ -23,14 +23,13 @@
 # Processor Type
 #
 CONFIG_CLASSIC32=y
-# CONFIG_PPC_52xx is not set
 # CONFIG_PPC_82xx is not set
 # CONFIG_PPC_83xx is not set
 # CONFIG_PPC_85xx is not set
 # CONFIG_PPC_86xx is not set
+# CONFIG_PPC_8xx is not set
 # CONFIG_40x is not set
 # CONFIG_44x is not set
-# CONFIG_8xx is not set
 # CONFIG_E200 is not set
 CONFIG_6xx=y
 CONFIG_PPC_FPU=y
@@ -43,6 +42,8 @@
 # Machine type
 #
 CONFIG_PPC_MULTIPLATFORM=y
+# CONFIG_PPC_EFIKA is not set
+# CONFIG_PPC_LITE5200 is not set
 # CONFIG_PPC_ISERIES is not set
 # CONFIG_EMBEDDED6xx is not set
 # CONFIG_APUS is not set
@@ -61,6 +62,7 @@
 # CONFIG_CPU_FREQ_DEBUG is not set
 CONFIG_CPU_FREQ_STAT=m
 # CONFIG_CPU_FREQ_STAT_DETAILS is not set
+CONFIG_UDBG_RTAS_CONSOLE=y
 
 #
 # Default CPUFreq governor
@@ -141,7 +143,6 @@
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_RWSEMS is not set
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_DEBUG_KOBJECT is not set
@@ -161,7 +162,6 @@
 #
 # CONFIG_PPC_EARLY_DEBUG_LPAR is not set
 # CONFIG_PPC_EARLY_DEBUG_G5 is not set
-# CONFIG_PPC_EARLY_DEBUG_RTAS is not set
 # CONFIG_PPC_EARLY_DEBUG_MAPLE is not set
 # CONFIG_PPC_EARLY_DEBUG_ISERIES is not set
 
@@ -177,3 +177,20 @@
 CONFIG_FB_RADEON=y
 CONFIG_FB_ATY128=y
 CONFIG_FB_ATY=y
+CONFIG_MTD_PHYSMAP_OF=m
+CONFIG_PMAC_RACKMETER=m
+CONFIG_SERIAL_UARTLITE=m
+CONFIG_SERIAL_OF_PLATFORM=m
+CONFIG_BRIQ_PANEL=m
+CONFIG_SENSORS_AMS=m
+CONFIG_SENSORS_AMS_PMU=y
+CONFIG_SENSORS_AMS_I2C=y
+CONFIG_FB_IBM_GXT4500=m
+CONFIG_USB_OHCI_HCD_PPC_OF=y
+CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
+# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
+CONFIG_USB_OHCI_HCD_PCI=y
+# CONFIG_KPROBES is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+# CONFIG_DEBUG_STACK_USAGE is not set

================================================================
Index: SOURCES/kernel-ppc-smp.config
diff -u SOURCES/kernel-ppc-smp.config:1.6.4.1.2.206.4.3 SOURCES/kernel-ppc-smp.config:1.6.4.1.2.206.4.4
--- SOURCES/kernel-ppc-smp.config:1.6.4.1.2.206.4.3	Mon May  7 16:16:04 2007
+++ SOURCES/kernel-ppc-smp.config	Sun Jun 24 00:04:36 2007
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kernel-common.config?r1=1.1.2.4&r2=1.1.2.5&f=u
    http://cvs.pld-linux.org/SOURCES/kernel-i386.config?r1=1.82.10.163.2.3&r2=1.82.10.163.2.4&f=u
    http://cvs.pld-linux.org/SOURCES/kernel-i386-smp.config?r1=1.59.10.154.2.3&r2=1.59.10.154.2.4&f=u
    http://cvs.pld-linux.org/SOURCES/kernel-netfilter.config?r1=1.34.2.63.4.4&r2=1.34.2.63.4.5&f=u
    http://cvs.pld-linux.org/SOURCES/kernel-ppc.config?r1=1.3.2.3.2.2.2.206.4.3&r2=1.3.2.3.2.2.2.206.4.4&f=u
    http://cvs.pld-linux.org/SOURCES/kernel-ppc-smp.config?r1=1.6.4.1.2.206.4.3&r2=1.6.4.1.2.206.4.4&f=u
    http://cvs.pld-linux.org/SOURCES/kernel-x86_64.config?r1=1.1.2.137.2.4&r2=1.1.2.137.2.5&f=u
    http://cvs.pld-linux.org/SOURCES/kernel-x86_64-smp.config?r1=1.1.2.137.2.4&r2=1.1.2.137.2.5&f=u

More information about the pld-cvs-commit mailing list