SOURCES: kernel-desktop-x86_64.config, kernel-desktop-common.confi...

[glen]

Author: glen                         Date: Tue Apr  8 21:28:06 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- update duplicate syms for x86_64

---- Files affected:
SOURCES:
   kernel-desktop-x86_64.config (1.18 -> 1.19) , kernel-desktop-common.config (1.35 -> 1.36) 

---- Diffs:

================================================================
Index: SOURCES/kernel-desktop-x86_64.config
diff -u SOURCES/kernel-desktop-x86_64.config:1.18 SOURCES/kernel-desktop-x86_64.config:1.19
--- SOURCES/kernel-desktop-x86_64.config:1.18	Sat Mar  1 15:12:51 2008
+++ SOURCES/kernel-desktop-x86_64.config	Tue Apr  8 23:28:01 2008
@@ -124,9 +124,6 @@
 SOFTWARE_SUSPEND all=y
 SUSPEND_SMP all=y
 PM_STD_PARTITION all=""
-ACPI_PROCFS_POWER x86_64=y i386=y
-ACPI_SYSFS_POWER x86_64=y i386=y
-ACPI_PROC_EVENT x86_64=y i386=y
 
 #
 # CPU Frequency scaling
@@ -149,7 +146,6 @@
 CPU_FREQ_GOV_CONSERVATIVE all=m
 CPU_FREQ_DEFAULT_GOV_ONDEMAND all=n alpha= sparc=
 CPU_FREQ_DEFAULT_GOV_CONSERVATIVE all=n alpha= sparc=
-CPU_IDLE x86_64=n i386=n
 
 #
 # CPUFreq processor drivers

================================================================
Index: SOURCES/kernel-desktop-common.config
diff -u SOURCES/kernel-desktop-common.config:1.35 SOURCES/kernel-desktop-common.config:1.36
--- SOURCES/kernel-desktop-common.config:1.35	Tue Apr  8 22:10:50 2008
+++ SOURCES/kernel-desktop-common.config	Tue Apr  8 23:28:01 2008
@@ -3824,15 +3824,21 @@
 TEXTSEARCH_BM all=m
 
 # 2.6.24
+#
+# ACPI (Advanced Configuration and Power Interface) Support
+#
+ACPI_PROCFS_POWER x86_64=y i386=y
+ACPI_SYSFS_POWER x86_64=y i386=y
+ACPI_PROC_EVENT x86_64=y i386=y
+
 SUSPEND all=y alpha= sparc=
 HIBERNATION all=y ppc=
 
 PARAVIRT_GUEST i386=n
 SCHED_NO_NO_OMIT_FRAME_POINTER all=y ppc=y alpha= sparc= x86_64=
-ACPI_PROCFS_POWER x86_64=y i386=y
-ACPI_SYSFS_POWER x86_64=y i386=y
-ACPI_PROC_EVENT x86_64=y i386=y
+
 CPU_IDLE x86_64=n i386=n
+APM_CPU_IDLE i386=y
 NET_SCH_RR all=m
 NET_ACT_NAT all=m
 NET_CLS_POLICE all=y
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-desktop-x86_64.config?r1=1.18&r2=1.19&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-desktop-common.config?r1=1.35&r2=1.36&f=u