Commit:     3bc9a77e84096148d5ada29c986d6e71a20eaeda
Parent:     3a900d89db35c133bc0874e71d9156b22db362b4
Author:     Sam Ravnborg <[EMAIL PROTECTED]>
AuthorDate: Mon Feb 4 16:47:55 2008 +0100
Committer:  Ingo Molnar <[EMAIL PROTECTED]>
CommitDate: Mon Feb 4 16:47:55 2008 +0100

    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 <[EMAIL PROTECTED]>
    Cc: "H. Peter Anvin" <[EMAIL PROTECTED]>
    Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]>
    Signed-off-by: Thomas Gleixner <[EMAIL PROTECTED]>
 arch/x86/kernel/Makefile |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

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
-obj-$(CONFIG_SCx200)           += scx200_32.o
+obj-$(CONFIG_SCx200)           += scx200.o
+scx200-y                       += scx200_32.o
 # 64 bit specific files
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

Reply via email to