lkml.org 
[lkml]   [2007]   [Mar]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH take3 11/20] pcspeaker.c switch
    Move the pcspeaker.c to the common area.

    Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

    diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile
    index ac925bc..ce1f742 100644
    --- a/arch/i386/kernel/Makefile
    +++ b/arch/i386/kernel/Makefile
    @@ -37,7 +37,6 @@ obj-$(CONFIG_K8_NB) += k8.o

    obj-$(CONFIG_VMI) += vmi.o vmitime.o
    obj-$(CONFIG_PARAVIRT) += paravirt.o
    -obj-y += pcspeaker.o

    EXTRA_AFLAGS := -traditional

    diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
    index f1c6b2e..3e15c9e 100644
    --- a/arch/x86/kernel/Makefile
    +++ b/arch/x86/kernel/Makefile
    @@ -5,6 +5,8 @@ obj-$(CONFIG_X86_CPUID) += cpuid.o
    obj-$(CONFIG_MICROCODE) += microcode.o
    obj-$(CONFIG_EARLY_PRINTK) += early_printk.o

    +obj-y += pcspeaker.o
    +
    # i386 defines CONFIG_X86_SMP when CONFIG_SMP and !CONFIG_X86_VOYAGER
    ifeq ($(CONFIG_X86_VOYAGER), )
    obj-$(CONFIG_SMP) += tsc_sync.o
    diff --git a/arch/i386/kernel/pcspeaker.c b/arch/x86/kernel/pcspeaker.c
    similarity index 100%
    rename from arch/i386/kernel/pcspeaker.c
    rename to arch/x86/kernel/pcspeaker.c
    diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile
    index 08795d8..3fae694 100644
    --- a/arch/x86_64/kernel/Makefile
    +++ b/arch/x86_64/kernel/Makefile
    @@ -38,10 +38,8 @@ obj-$(CONFIG_MODULES) += module.o
    obj-$(CONFIG_PCI) += early-quirks.o

    obj-y += intel_cacheinfo.o
    -obj-y += pcspeaker.o

    CFLAGS_vsyscall.o := $(PROFILING) -g0

    therm_throt-y += ../../i386/kernel/cpu/mcheck/therm_throt.o
    intel_cacheinfo-y += ../../i386/kernel/cpu/intel_cacheinfo.o
    -pcspeaker-y += ../../i386/kernel/pcspeaker.o
    --
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-03-15 06:25    [W:0.023 / U:0.808 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site