Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=7e244322cd4ea361ef9ee623b3fcb4d9f4ff841c
Commit:     7e244322cd4ea361ef9ee623b3fcb4d9f4ff841c
Parent:     463e7c7cf9aaf95dd05e97e1a47854fdf5454cdc
Author:     Len Brown <[EMAIL PROTECTED]>
AuthorDate: Sat Dec 16 00:59:38 2006 -0500
Committer:  Len Brown <[EMAIL PROTECTED]>
CommitDate: Sat Dec 16 00:59:38 2006 -0500

    ACPI: fix git automerge failure
    
    Signed-off-by: Len Brown <[EMAIL PROTECTED]>
---
 arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c 
b/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
index 39bc16b..18f4715 100644
--- a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
+++ b/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
@@ -569,7 +569,6 @@ static int sw_any_bug_found(struct dmi_system_id *d)
        return 0;
 }
 
-#ifdef CONFIG_SMP
 static struct dmi_system_id sw_any_bug_dmi_table[] = {
        {
                .callback = sw_any_bug_found,
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to