SOURCES: kernel-vanilla-multiarch.conf - x86_64 duplicates

[glen]

Author: glen                         Date: Mon Jan 28 18:23:23 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- x86_64 duplicates

---- Files affected:
SOURCES:
   kernel-vanilla-multiarch.conf (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SOURCES/kernel-vanilla-multiarch.conf
diff -u SOURCES/kernel-vanilla-multiarch.conf:1.7 SOURCES/kernel-vanilla-multiarch.conf:1.8
--- SOURCES/kernel-vanilla-multiarch.conf:1.7	Mon Jan 28 19:09:42 2008
+++ SOURCES/kernel-vanilla-multiarch.conf	Mon Jan 28 19:23:17 2008
@@ -3696,11 +3696,11 @@
 X86_32 i386=y
 SEMAPHORE_SLEEPERS i386=y x86_64=y
 X86 i386=y x86_64=y
-MMU i386=y
-GENERIC_ISA_DMA i386=y
-GENERIC_IOMAP i386=y
-ARCH_MAY_HAVE_PC_FDC i386=y
-DMI i386=y
+MMU i386=y x86_64=y
+GENERIC_ISA_DMA i386=y x86_64=y
+GENERIC_IOMAP i386=y x86_64=y
+ARCH_MAY_HAVE_PC_FDC i386=y x86_64=y
+DMI i386=y x86_64=y
 
 #
 # Processor type and features
@@ -3715,7 +3715,7 @@
 #
 # Subarchitecture Type
 #
-X86_PC i386=y
+X86_PC i386=y x86_64=y
 X86_ELAN i386=n
 X86_VOYAGER i386=n
 X86_NUMAQ i386=n
@@ -3737,11 +3737,11 @@
 MPENTIUMII i386=n
 MPENTIUMIII i386=n
 MPENTIUMM i386=n
-MCORE2 i386=n
+MCORE2 i386=n x86_64=n
 MPENTIUM4 i386=n
 MK6 i386=n
 MK7 i386=n
-MK8 i386=n
+MK8 i386=n x86_64=y
 MCRUSOE i386=n
 MEFFICEON i386=n
 MWINCHIPC6 i386=n
@@ -3754,11 +3754,11 @@
 MVIAC7 i386=n
 
 X86_GENERIC i386=y
-X86_L1_CACHE_SHIFT i386=7
+X86_L1_CACHE_SHIFT i386=7 x86_64=7
 RWSEM_GENERIC_SPINLOCK i386=y x86_64=y
 ARCH_HAS_ILOG2_U32 i386=n
 ARCH_HAS_ILOG2_U64 i386=n
-GENERIC_CALIBRATE_DELAY i386=y
+GENERIC_CALIBRATE_DELAY i386=y x86_64=y
 X86_PPRO_FENCE i386=y
 X86_F00F_BUG i386=y
 X86_INTEL_USERCOPY i386=y
@@ -3771,8 +3771,8 @@
 #
 # RCU implementation type:
 #
-X86_LOCAL_APIC i386=y
-X86_IO_APIC i386=y
+X86_LOCAL_APIC i386=y x86_64=y
+X86_IO_APIC i386=y x86_64=y
 X86_MCE i386=y x86_64=y
 X86_MCE_INTEL x86_64=y
 X86_MCE_AMD x86_64=y
@@ -3782,10 +3782,10 @@
 TOSHIBA i386=m
 I8K i386=m
 X86_REBOOTFIXUPS i386=y
-MICROCODE i386=m
+MICROCODE i386=m x86_64=m
 MICROCODE_OLD_INTERFACE i386=y
-X86_MSR i386=m
-X86_CPUID i386=m
+X86_MSR i386=m x86_64=m
+X86_CPUID i386=m x86_64=m
 
 #
 # Firmware Drivers
@@ -3812,7 +3812,7 @@
 ARCH_SELECT_MEMORY_MODEL i386=y
 HIGHPTE i386=n
 MATH_EMULATION i386=y
-MTRR i386=y
+MTRR i386=y x86_64=y
 EFI i386=y
 IRQBALANCE i386=y
 BOOT_IOREMAP i386=y
@@ -3981,7 +3981,7 @@
 FORCED_INLINING i386=y x86_64=y
 RCU_TORTURE_TEST i386=m x86_64=m
 FAULT_INJECTION i386=n x86_64=n
-EARLY_PRINTK i386=y
+EARLY_PRINTK i386=y x86_64=y
 DEBUG_STACKOVERFLOW i386=n x86_64=n
 DEBUG_STACK_USAGE i386=n x86_64=n
 DEBUG_PAGEALLOC i386=n
@@ -3996,7 +3996,7 @@
 GENERIC_IRQ_PROBE i386=y x86_64=y
 GENERIC_PENDING_IRQ i386=y x86_64=y
 X86_SMP i386=y
-X86_HT i386=y
+X86_HT i386=y x86_64=y
 X86_BIOS_REBOOT i386=y
 X86_TRAMPOLINE i386=y
 KTIME_SCALAR i386=y
@@ -4053,44 +4053,27 @@
 BT_HCIUART_LL all=y
 NL80211 all=y
 
+NET_9P all=m
 NET_9P_FD all=m
 
 # kernel-vanilla-x86_64.conf
 X86_64 x86_64=y
 64BIT x86_64=y
-MMU x86_64=y
-GENERIC_CALIBRATE_DELAY x86_64=y
 X86_CMPXCHG x86_64=y
-EARLY_PRINTK x86_64=y
-GENERIC_ISA_DMA x86_64=y
-GENERIC_IOMAP x86_64=y
-ARCH_MAY_HAVE_PC_FDC x86_64=y
-DMI x86_64=y
 
 #
 # Subarchitecture Type
 #
-X86_PC x86_64=y
 X86_VSMP x86_64=n
 
 #
 # Processor family
 #
-MK8 x86_64=y
 MPSC x86_64=n
-MCORE2 x86_64=n
 GENERIC_CPU x86_64=n
 X86_L1_CACHE_BYTES x86_64=128
-X86_L1_CACHE_SHIFT x86_64=7
 X86_TSC x86_64=y
 X86_GOOD_APIC x86_64=y
-MICROCODE x86_64=m
-X86_MSR x86_64=m
-X86_CPUID x86_64=m
-X86_HT x86_64=y
-X86_IO_APIC x86_64=y
-X86_LOCAL_APIC x86_64=y
-MTRR x86_64=y
 
 #
 # RCU implementation type:
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-vanilla-multiarch.conf?r1=1.7&r2=1.8&f=u