SOURCES: kernel-desktop-common.config - reverse config from i686

glen glen at pld-linux.org
Tue Apr 8 23:41:54 CEST 2008 

Author: glen                         Date: Tue Apr  8 21:41:54 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- reverse config from i686

---- Files affected:
SOURCES:
   kernel-desktop-common.config (1.37 -> 1.38) 

---- Diffs:

================================================================
Index: SOURCES/kernel-desktop-common.config
diff -u SOURCES/kernel-desktop-common.config:1.37 SOURCES/kernel-desktop-common.config:1.38
--- SOURCES/kernel-desktop-common.config:1.37	Tue Apr  8 23:33:54 2008
+++ SOURCES/kernel-desktop-common.config	Tue Apr  8 23:41:48 2008
@@ -3,7 +3,7 @@
 # Code maturity level options
 #
 EXPERIMENTAL all=y
-BROKEN_ON_SMP all=y
+BROKEN_ON_SMP all=y i386=
 LOCK_KERNEL all=y
 INIT_ENV_ARG_LIMIT all=32
 
@@ -14,7 +14,7 @@
 LOCALVERSION_AUTO all=n
 SWAP all=y
 SYSVIPC all=y
-IPC_NS all=n
+IPC_NS all=n i386=
 POSIX_MQUEUE all=y
 BSD_PROCESS_ACCT all=y
 BSD_PROCESS_ACCT_V3 all=y
@@ -37,25 +37,25 @@
 #
 SMP all=y
 HIGH_RES_TIMERS all=n
-PARAVIRT all=y
-VMI all=y
+PARAVIRT all=y i386=
+VMI all=y i386=
 
 #
 # Timer frequency
 #
-NO_HZ all=n
+NO_HZ all=n i386=n
 HZ_100 all=n
 HZ_250 all=n
 HZ_300 all=n
-HZ_1000 all=n
-HZ_1500 all=n
-HZ_2000 all=n
-HZ_3000 all=n
-HZ_4000 all=n
-HZ_5000 all=n
-HZ_7500 all=n
-HZ_10000 all=n
-HZ all=n
+HZ_1000 all=n i386=y
+HZ_1500 all=n i386=
+HZ_2000 all=n i386=
+HZ_3000 all=n i386=
+HZ_4000 all=n i386=
+HZ_5000 all=n i386=
+HZ_7500 all=n i386=
+HZ_10000 all=n i386=
+HZ all=n i386=1000
 
 #
 # Subarchitecture Type
@@ -78,7 +78,7 @@
 M586 all=n
 M586TSC all=n
 M586MMX all=n
-M686 all=n
+M686 all=n i386=y
 MPENTIUMII all=n
 MPENTIUMIII all=n
 MPENTIUMM all=n
@@ -99,10 +99,10 @@
 MVIAC7 all=n
 X86_GENERIC all=y
 X86_L1_CACHE_SHIFT all=7
-RWSEM_GENERIC_SPINLOCK all=y
+RWSEM_GENERIC_SPINLOCK all=y i386=n
 GENERIC_CALIBRATE_DELAY all=y
 X86_PPRO_FENCE all=y
-X86_F00F_BUG all=y
+X86_F00F_BUG all=y i386=
 X86_INTEL_USERCOPY all=y
 HPET_TIMER all=y
 HPET_EMULATE_RTC all=y
@@ -139,17 +139,17 @@
 NOHIGHMEM all=n
 HIGHMEM4G all=y
 HIGHMEM64G all=n
-VMSPLIT_3G all=y
-VMSPLIT_3G_OPT all=n
-VMSPLIT_2G all=n
-VMSPLIT_1G all=n
+VMSPLIT_3G all=y i386=
+VMSPLIT_3G_OPT all=n i386=
+VMSPLIT_2G all=n i386=
+VMSPLIT_1G all=n i386=
 PAGE_OFFSET all=0xC0000000
 HIGHMEM all=y
 ARCH_FLATMEM_ENABLE all=y
 ARCH_SPARSEMEM_ENABLE all=y
 ARCH_SELECT_MEMORY_MODEL all=y
 HIGHPTE all=n
-MATH_EMULATION all=y
+MATH_EMULATION all=y i386=n
 MTRR all=y
 EFI all=y
 IRQBALANCE all=n
@@ -164,7 +164,7 @@
 PHYSICAL_ALIGN all=0x100000
 HOTPLUG_CPU all=y
 
-# 
+#
 # Per task I/O stats
 #
 TASKSTATS all=y
@@ -172,13 +172,13 @@
 TASK_XACCT all=y
 TASK_IO_ACCOUNTING all=y
 
-UTS_NS all=n
+UTS_NS all=n i386=
 SYSCTL all=y
 AUDIT all=y
 AUDITSYSCALL all=y
 IKCONFIG all=y
 IKCONFIG_PROC all=y
-IKPROC all=y
+IKPROC all=y i386=
 SYSFS_DEPRECATED all=y
 CPUSETS all=y
 CGROUPS all=y
@@ -256,16 +256,16 @@
 #
 # Memory model
 #
-FLATMEM_MANUAL all=n
+FLATMEM_MANUAL all=n i386=y
 RESOURCES_64BIT all=n
 DISCONTIGMEM_MANUAL all=n
 SPARSEMEM_MANUAL all=n
 FLATMEM all=y
 FLAT_NODE_MEM_MAP all=y
-NEED_MULTIPLE_NODES all=y
-SPARSEMEM_STATIC all=n
+NEED_MULTIPLE_NODES all=y i386=
+SPARSEMEM_STATIC all=n i386=y
 SPLIT_PTLOCK_CPUS all=4
-MIGRATION all=y
+MIGRATION all=y i386=
 
 #
 # Power management options
@@ -273,15 +273,15 @@
 PM all=y
 PM_LEGACY all=y
 PM_DEBUG all=n
-PM_SYSFS_DEPRECATED all=n
+PM_SYSFS_DEPRECATED all=n i386=
 
 #
 # ACPI (Advanced Configuration and Power Interface) Support
 #
 ACPI all=y
 ACPI_SLEEP all=y
-ACPI_SLEEP_PROC_FS all=y
-ACPI_SLEEP_PROC_SLEEP all=n
+ACPI_SLEEP_PROC_FS all=y i386=
+ACPI_SLEEP_PROC_SLEEP all=n i386=
 ACPI_PROCFS all=y
 ACPI_AC all=m
 ACPI_BATTERY all=m
@@ -311,8 +311,8 @@
 APM_DISPLAY_BLANK all=n
 APM_ALLOW_INTS all=n
 APM_REAL_MODE_POWER_OFF all=y
-SOFTWARE_SUSPEND all=y
-SUSPEND_SMP all=y
+SOFTWARE_SUSPEND all=y i386=
+SUSPEND_SMP all=y i386=
 PM_STD_PARTITION all=""
 
 #
@@ -348,7 +348,7 @@
 X86_POWERNOW_K8_ACPI all=y
 X86_GX_SUSPMOD all=m
 X86_SPEEDSTEP_CENTRINO all=m
-X86_SPEEDSTEP_CENTRINO_ACPI all=y
+X86_SPEEDSTEP_CENTRINO_ACPI all=y i386=
 X86_SPEEDSTEP_CENTRINO_TABLE all=y
 X86_SPEEDSTEP_ICH all=m
 X86_SPEEDSTEP_SMI all=m
@@ -358,9 +358,9 @@
 X86_LONGHAUL all=m
 X86_E_POWERSAVER all=m
 
-PROFILING all=y
-OPROFILE all=m
-KPROBES all=n
+PROFILING all=y i386=
+OPROFILE all=m i386=
+KPROBES all=n i386=
 
 #
 # Kernel hacking
@@ -372,7 +372,7 @@
 EARLY_PRINTK all=y
 DEBUG_STACKOVERFLOW all=n
 DEBUG_STACK_USAGE all=n
-DEBUG_PAGEALLOC all=n
+DEBUG_PAGEALLOC all=n i386=
 DEBUG_RODATA all=n
 4KSTACKS all=n
 X86_FIND_SMP_CONFIG all=y
@@ -408,7 +408,7 @@
 
 PCIEPORTBUS all=y
 HOTPLUG_PCI_PCIE all=m
-HOTPLUG_PCI_PCIE_POLL_EVENT_MODE all=n
+HOTPLUG_PCI_PCIE_POLL_EVENT_MODE all=n i386=
 
 #
 # PCI access mode
@@ -501,7 +501,7 @@
 XFRM_MIGRATE all=n
 NET_KEY all=m
 NET_KEY_MIGRATE all=n
-RING all=m
+RING all=m i386=
 INET all=y
 IP_MULTICAST all=y
 IP_ADVANCED_ROUTER all=y
@@ -510,11 +510,11 @@
 IP_FIB_HASH all=y
 IP_MULTIPLE_TABLES all=y
 IP_ROUTE_MULTIPATH all=y
-IP_ROUTE_MULTIPATH_CACHED all=y
-IP_ROUTE_MULTIPATH_RR all=m
-IP_ROUTE_MULTIPATH_RANDOM all=m
-IP_ROUTE_MULTIPATH_WRANDOM all=m
-IP_ROUTE_MULTIPATH_DRR all=m
+IP_ROUTE_MULTIPATH_CACHED all=y i386=
+IP_ROUTE_MULTIPATH_RR all=m i386=
+IP_ROUTE_MULTIPATH_RANDOM all=m i386=
+IP_ROUTE_MULTIPATH_WRANDOM all=m i386=
+IP_ROUTE_MULTIPATH_DRR all=m i386=
 IP_ROUTE_VERBOSE all=y
 IP_PNP all=y
 IP_PNP_DHCP all=y
@@ -600,7 +600,7 @@
 INET6_AH all=m
 INET6_ESP all=m
 INET6_IPCOMP all=m
-IPV6_MIP6 all=y
+IPV6_MIP6 all=y i386=m
 INET6_XFRM_MODE_TRANSPORT all=m
 INET6_XFRM_MODE_TUNNEL all=m
 INET6_XFRM_MODE_BEET all=m
@@ -669,7 +669,7 @@
 IPX all=m
 IPX_INTERN all=y
 ATALK all=m
-DEV_APPLETALK all=y
+DEV_APPLETALK all=y i386=m
 LTPC all=m
 COPS all=m
 COPS_DAYNA all=y
@@ -728,7 +728,7 @@
 NET_EMATCH_META all=m
 NET_EMATCH_TEXT all=m
 NET_CLS_ACT all=y
-NET_ACT_POLICE all=m
+NET_ACT_POLICE all=m i386=y
 NET_ACT_GACT all=m
 GACT_PROB all=n
 NET_ACT_MIRRED all=m
@@ -736,7 +736,7 @@
 NET_ACT_PEDIT all=m
 NET_ACT_SIMP all=n
 NET_CLS_IND all=y
-NET_ESTIMATOR all=y
+NET_ESTIMATOR all=y i386=
 
 #
 # Network testing
@@ -758,7 +758,7 @@
 MKISS all=m
 6PACK all=m
 BPQETHER all=m
-DMASCC all=m
+DMASCC all=m i386=
 SCC all=m
 SCC_DELAY all=n
 SCC_TRXECHO all=y
@@ -814,21 +814,21 @@
 #
 # Old SIR device drivers
 #
-IRPORT_SIR all=m
+IRPORT_SIR all=m i386=
 
 #
 # Old Serial dongle support
 #
-DONGLE_OLD all=y
-ESI_DONGLE_OLD all=m
-ACTISYS_DONGLE_OLD all=m
-TEKRAM_DONGLE_OLD all=m
-GIRBIL_DONGLE_OLD all=m
-LITELINK_DONGLE_OLD all=m
-MCP2120_DONGLE_OLD all=m
-OLD_BELKIN_DONGLE_OLD all=m
-ACT200L_DONGLE_OLD all=m
-MA600_DONGLE_OLD all=m
+DONGLE_OLD all=y i386=
+ESI_DONGLE_OLD all=m i386=
+ACTISYS_DONGLE_OLD all=m i386=
+TEKRAM_DONGLE_OLD all=m i386=
+GIRBIL_DONGLE_OLD all=m i386=
+LITELINK_DONGLE_OLD all=m i386=
+MCP2120_DONGLE_OLD all=m i386=
+OLD_BELKIN_DONGLE_OLD all=m i386=
+ACT200L_DONGLE_OLD all=m i386=
+MA600_DONGLE_OLD all=m i386=
 
 #
 # FIR device drivers
@@ -905,7 +905,7 @@
 # Connector - unified userspace <-> kernelspace linker
 #
 CONNECTOR all=m
-PROC_EVENTS all=y
+PROC_EVENTS all=y i386=
 
 #
 # Memory Technology Devices (MTD)
@@ -918,7 +918,7 @@
 MTD_REDBOOT_DIRECTORY_BLOCK all=-1
 MTD_REDBOOT_PARTS_UNALLOCATED all=y
 MTD_REDBOOT_PARTS_READONLY all=y
-MTD_CMDLINE_PARTS all=y
+MTD_CMDLINE_PARTS all=y i386=
 
 #
 # User Modules And Translation Layers
@@ -975,7 +975,7 @@
 MTD_PHYSMAP_START all=0x8000000
 MTD_PHYSMAP_LEN all=0x4000000
 MTD_PHYSMAP_BANKWIDTH all=2
-MTD_PHYSMAP_OF all=m
+MTD_PHYSMAP_OF all=m i386=
 MTD_PNC2000 all=m
 MTD_SC520CDP all=m
 MTD_NETSC520 all=m
@@ -1090,7 +1090,7 @@
 # Block devices
 #
 BLK_DEV_FD all=m
-MAC_FLOPPY all=m
+MAC_FLOPPY all=m i386=
 BLK_DEV_XD all=m
 PARIDE all=m
 
@@ -1155,7 +1155,7 @@
 #
 BLK_DEV_IDE_SATA all=n
 BLK_DEV_HD_IDE all=n
-BLK_DEV_IDEDISK all=y
+BLK_DEV_IDEDISK all=y i386=m
 IDEDISK_MULTI_MODE all=y
 BLK_DEV_IDECS all=m
 BLK_DEV_DELKIN all=m
@@ -1184,7 +1184,7 @@
 IDE_GENERIC all=m
 BLK_DEV_PLATFORM all=n
 BLK_DEV_CMD640 all=n
-BLK_DEV_CMD640_ENHANCED all=y
+BLK_DEV_CMD640_ENHANCED all=y i386=
 BLK_DEV_IDEPNP all=y
 BLK_DEV_IDEPCI all=y
 IDEPCI_SHARE_IRQ all=y
@@ -1192,10 +1192,10 @@
 BLK_DEV_GENERIC all=m
 BLK_DEV_OPTI621 all=m
 BLK_DEV_RZ1000 all=n
-BLK_DEV_SL82C105 all=m
+BLK_DEV_SL82C105 all=m i386=
 BLK_DEV_IDEDMA_PCI all=y
-BLK_DEV_IDEDMA_FORCED all=n
-IDEDMA_ONLYDISK all=n
+BLK_DEV_IDEDMA_FORCED all=n i386=
+IDEDMA_ONLYDISK all=n i386=
 BLK_DEV_AEC62XX all=m
 BLK_DEV_ALI15X3 all=m
 WDC_ALI15X3 all=n
@@ -1226,11 +1226,11 @@
 BLK_DEV_TRM290 all=m
 BLK_DEV_VIA82CXXX all=m
 BLK_DEV_TC86C001 all=m
-BLK_DEV_IDE_PMAC all=y
-BLK_DEV_IDE_PMAC_ATA100FIRST all=y
-BLK_DEV_IDEDMA_PMAC all=y
+BLK_DEV_IDE_PMAC all=y i386=
+BLK_DEV_IDE_PMAC_ATA100FIRST all=y i386=
+BLK_DEV_IDEDMA_PMAC all=y i386=
 IDE_ARM all=n
-IDE_CHIPSETS all=y
+IDE_CHIPSETS all=y i386=
 
 #
 # Note: most of these also require special kernel boot parameters
@@ -1242,7 +1242,7 @@
 BLK_DEV_QD65XX all=m
 BLK_DEV_UMC8672 all=m
 BLK_DEV_IDEDMA all=y
-IDEDMA_IVB all=y
+IDEDMA_IVB all=y i386=
 BLK_DEV_HD all=n
 
 #
@@ -1419,7 +1419,7 @@
 SCSI_PAS16 all=m
 SCSI_PSI240I all=m
 SCSI_QLOGIC_FAS all=m
-SCSI_QLOGIC_FC_FIRMWARE all=y
+SCSI_QLOGIC_FC_FIRMWARE all=y i386=
 SCSI_QLOGIC_1280 all=m
 SCSI_QLA_FC all=m
 SCSI_QLA_ISCSI all=m
@@ -1437,10 +1437,10 @@
 SCSI_ULTRASTOR all=m
 SCSI_NSP32 all=m
 SCSI_DEBUG all=m
-SCSI_MESH all=m
-SCSI_MESH_SYNC_RATE all=5
-SCSI_MESH_RESET_DELAY_MS all=4000
-SCSI_MAC53C94 all=m
+SCSI_MESH all=m i386=
+SCSI_MESH_SYNC_RATE all=5 i386=
+SCSI_MESH_RESET_DELAY_MS all=4000 i386=
+SCSI_MAC53C94 all=m i386=
 SCSI_SRP all=m
 SCSI_FC_TGT_ATTRS all=n
 SCSI_SAS_ATA all=n
@@ -1452,22 +1452,22 @@
 #
 # PCMCIA SCSI adapter support
 #
-PCMCIA_AHA152X all=m
-PCMCIA_FDOMAIN all=m
-PCMCIA_NINJA_SCSI all=m
-PCMCIA_QLOGIC all=m
-PCMCIA_SYM53C500 all=m
-CD_NO_IDESCSI all=y
-AZTCD all=m
-GSCD all=m
-SBPCD all=m
-MCDX all=m
-OPTCD all=m
-CM206 all=m
-SJCD all=m
-ISP16_CDI all=m
-CDU31A all=m
-CDU535 all=m
+PCMCIA_AHA152X all=m i386=
+PCMCIA_FDOMAIN all=m i386=
+PCMCIA_NINJA_SCSI all=m i386=
+PCMCIA_QLOGIC all=m i386=
+PCMCIA_SYM53C500 all=m i386=
+CD_NO_IDESCSI all=y i386=
+AZTCD all=m i386=
+GSCD all=m i386=
+SBPCD all=m i386=
+MCDX all=m i386=
+OPTCD all=m i386=
+CM206 all=m i386=
+SJCD all=m i386=
+ISP16_CDI all=m i386=
+CDU31A all=m i386=
+CDU535 all=m i386=
 
 #
 # Multi-device support (RAID and LVM)
@@ -1538,7 +1538,7 @@
 
 #
 # Macintosh device drivers
-# 
+#
 MACINTOSH_DRIVERS all=y
 MAC_EMUMOUSEBTN all=y
 
@@ -1548,30 +1548,30 @@
 I2O all=m
 I2O_LCT_NOTIFY_ON_CHANGES all=y
 I2O_EXT_ADAPTEC all=y
-I2O_EXT_ADAPTEC_DMA64 all=y
+I2O_EXT_ADAPTEC_DMA64 all=y i386=
 I2O_CONFIG all=m
 I2O_CONFIG_OLD_IOCTL all=n
-I2O_OLD_IOCTL all=y
+I2O_OLD_IOCTL all=y i386=
 I2O_BUS all=m
 I2O_BLOCK all=m
 I2O_SCSI all=m
 I2O_PROC all=m
-ADB all=y
-ADB_CUDA all=y
-ADB_PMU all=y
-ADB_PMU_LED all=y
-ADB_PMU_LED_IDE all=y
-PMAC_APM_EMU all=m
-PMAC_MEDIABAY all=y
-PMAC_BACKLIGHT all=y
-PMAC_BACKLIGHT_LEGACY all=y
-ADB_MACIO all=y
-INPUT_ADBHID all=y
-THERM_WINDTUNNEL all=m
-THERM_ADT746X all=m
-WINDFARM all=m
-ANSLCD all=m
-PMAC_RACKMETER all=m
+ADB all=y i386=
+ADB_CUDA all=y i386=
+ADB_PMU all=y i386=
+ADB_PMU_LED all=y i386=
+ADB_PMU_LED_IDE all=y i386=
+PMAC_APM_EMU all=m i386=
+PMAC_MEDIABAY all=y i386=
+PMAC_BACKLIGHT all=y i386=
+PMAC_BACKLIGHT_LEGACY all=y i386=
+ADB_MACIO all=y i386=
+INPUT_ADBHID all=y i386=
+THERM_WINDTUNNEL all=m i386=
+THERM_ADT746X all=m i386=
+WINDFARM all=m i386=
+ANSLCD all=m i386=
+PMAC_RACKMETER all=m i386=
 
 #
 # Network device support
@@ -1627,9 +1627,9 @@
 #
 NET_ETHERNET all=y
 MII all=m
-MACE all=m
-MACE_AAUI_PORT all=y
-BMAC all=m
+MACE all=m i386=
+MACE_AAUI_PORT all=y i386=
+BMAC all=m i386=
 HAPPYMEAL all=m
 SUNGEM all=m
 CASSINI all=m
@@ -1649,7 +1649,7 @@
 ULTRA32 all=m
 SMC9194 all=m
 NET_VENDOR_RACAL all=y
-NI5010 all=m
+NI5010 all=m i386=
 NI52 all=m
 NI65 all=m
 
@@ -1668,7 +1668,7 @@
 DM9102 all=m
 ULI526X all=m
 PCMCIA_XIRCOM all=m
-PCMCIA_XIRTULIP all=m
+PCMCIA_XIRTULIP all=m i386=
 AT1700 all=m
 DEPCA all=m
 HP100 all=m
@@ -1697,7 +1697,7 @@
 FORCEDETH all=m
 FORCEDETH_NAPI all=n
 CS89x0 all=m
-DGRS all=m
+DGRS all=m i386=
 EEPRO100 all=m
 E100 all=m
 LNE390 all=m
@@ -1753,7 +1753,7 @@
 VIA_VELOCITY all=m
 TIGON3 all=m
 BNX2 all=m
-MV643XX_ETH all=m
+MV643XX_ETH all=m i386=
 QLA3XXX all=m
 ATL1 all=m
 
@@ -1804,11 +1804,11 @@
 #
 # Obsolete Wireless cards support (pre-802.11)
 #
-STRIP all=m
-ARLAN all=m
-WAVELAN all=m
-PCMCIA_WAVELAN all=m
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-desktop-common.config?r1=1.37&r2=1.38&f=u

More information about the pld-cvs-commit mailing list