Changeset 80

Timestamp:

04/29/07 18:04:11 (19 months ago)

Author:

free

Message:

disable apm

Files:

• linux-2.6/trunk/subarch-i386-multimedia.patch (modified) (6 diffs)

linux-2.6/trunk/subarch-i386-multimedia.patch

@@ -3 +3 @@
 --- debian/arch/i386/multimedia/config  (revision 0)
 +++ debian/arch/i386/multimedia/config  (revision 0)
-@@ -0,0 +1,54 @@
+@@ -0,0 +1,73 @@
 +CONFIG_DVB_PLL=m
 +CONFIG_AUDIT_ARCH=y
@@ -46 +46 @@
 +CONFIG_GENERIC_CLOCKEVENTS=y
 +# CONFIG_DEBUG_PREEMPT is not set
-+CONFIG_LOG_BUF_SHIFT=15
 +# CONFIG_DEBUG_KERNEL is not set
 +# CONFIG_UNUSED_SYMBOLS is not set
@@ -58 +57 @@
 +CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
 +CONFIG_LOCK_KERNEL=y
++CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
++CONFIG_HIGHMEM=y
++# CONFIG_HIGHPTE is not set
++# CONFIG_NOHIGHMEM is not set
++CONFIG_HIGHMEM4G=y
++CONFIG_X86_SMP=y
++CONFIG_IRQBALANCE=y
++CONFIG_X86_TRAMPOLINE=y
++CONFIG_NR_CPUS=8
++CONFIG_STOP_MACHINE=y
++CONFIG_X86_HT=y
++# CONFIG_CPUSETS is not set
++# CONFIG_FT_NORMAL_DEBUG is not set
++CONFIG_LOG_BUF_SHIFT=15
++# CONFIG_SCHED_SMT is not set
++# CONFIG_HOTPLUG_CPU is not set
++# CONFIG_FT_STD_FDC is not set
++CONFIG_SMP=y
++# CONFIG_PM_LEGACY is not set
++# CONFIG_APM is not set
 Index: debian/arch/i386/multimedia/config.486
 ===================================================================
 --- debian/arch/i386/multimedia/config.486      (revision 0)
 +++ debian/arch/i386/multimedia/config.486      (revision 0)
-@@ -0,0 +1,113 @@
+@@ -0,0 +1,107 @@
 +CONFIG_M486=y
 +# CONFIG_M686 is not set
@@ -72 +91 @@
 +CONFIG_X86_F00F_BUG=y
 +CONFIG_X86_INTEL_USERCOPY=y
-+# CONFIG_SMP is not set
 +CONFIG_X86_UP_APIC=y
 +CONFIG_X86_UP_IOAPIC=y
 +# CONFIG_X86_MCE is not set
-+CONFIG_NOHIGHMEM=y
-+# CONFIG_HIGHMEM4G is not set
 +CONFIG_MATH_EMULATION=y
 +CONFIG_CPU_FREQ_STAT_DETAILS=y
@@ -148 +164 @@
 +CONFIG_FT_NR_BUFFERS=3
 +CONFIG_FT_PROC_FS=y
-+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
-+CONFIG_FT_STD_FDC=y
 +# CONFIG_FT_MACH2 is not set
 +# CONFIG_FT_PROBE_FC10 is not set
@@ -165 +179 @@
 +CONFIG_EXT2_FS=y
 +CONFIG_FS_MBCACHE=y
-+CONFIG_LOG_BUF_SHIFT=14
 +# CONFIG_M386 is not set
 +CONFIG_X86_POPAD_OK=y