diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2008-02-04 10:47:55 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-02-04 10:47:55 -0500 |
| commit | 3bc9a77e84096148d5ada29c986d6e71a20eaeda (patch) | |
| tree | 6c8d4d7a202f74a3188f574a850ff2fc80116644 /arch/x86 | |
| parent | 3a900d89db35c133bc0874e71d9156b22db362b4 (diff) | |
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 <sam@ravnborg.org>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | 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 f08063581804..21dc1a061bf1 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile | |||
| @@ -75,7 +75,8 @@ ifdef CONFIG_INPUT_PCSPKR | |||
| 75 | obj-y += pcspeaker.o | 75 | obj-y += pcspeaker.o |
| 76 | endif | 76 | endif |
| 77 | 77 | ||
| 78 | obj-$(CONFIG_SCx200) += scx200_32.o | 78 | obj-$(CONFIG_SCx200) += scx200.o |
| 79 | scx200-y += scx200_32.o | ||
| 79 | 80 | ||
| 80 | ### | 81 | ### |
| 81 | # 64 bit specific files | 82 | # 64 bit specific files |