From: Sam Ravnborg Date: Mon, 4 Feb 2008 15:47:55 +0000 (+0100) Subject: x86: rename module scx200_32 to scx200 X-Git-Tag: v3.12-rc1~23948^2~74 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3bc9a77e84096148d5ada29c986d6e71a20eaeda;p=kernel%2Fkernel-generic.git x86: rename module scx200_32 to scx200 The module scx200 were renamed to scx200_32 by the merge of the 32 and 64 bit x86 arch trees. Keep the _32 prefix on the .c file as it is 32 bit specific and fix the module name in the Makefile. Signed-off-by: Sam Ravnborg Cc: "H. Peter Anvin" Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner --- diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index f080635..21dc1a0 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile @@ -75,7 +75,8 @@ ifdef CONFIG_INPUT_PCSPKR obj-y += pcspeaker.o endif -obj-$(CONFIG_SCx200) += scx200_32.o +obj-$(CONFIG_SCx200) += scx200.o +scx200-y += scx200_32.o ### # 64 bit specific files