SOURCES: kernel-desktop-common.config - collision with x86_64

[glen]

Author: glen                         Date: Tue Apr  8 21:44:19 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- collision with x86_64

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

---- Diffs:

================================================================
Index: SOURCES/kernel-desktop-common.config
diff -u SOURCES/kernel-desktop-common.config:1.38 SOURCES/kernel-desktop-common.config:1.39
--- SOURCES/kernel-desktop-common.config:1.38	Tue Apr  8 23:41:48 2008
+++ SOURCES/kernel-desktop-common.config	Tue Apr  8 23:44:14 2008
@@ -36,7 +36,7 @@
 # Processor type and features
 #
 SMP all=y
-HIGH_RES_TIMERS all=n
+HIGH_RES_TIMERS i386=y x86_64=n ppc=y
 PARAVIRT all=y i386=
 VMI all=y i386=
 
================================================================

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