]>
Commit | Line | Data |
---|---|---|
fa577fdb GKH |
1 | From stable-bounces@linux.kernel.org Sun Feb 3 04:20:14 2008 |
2 | From: Sam Ravnborg <sam@ravnborg.org> | |
3 | Date: Sun, 3 Feb 2008 13:19:38 +0100 | |
4 | Subject: x86: restore correct module name for apm | |
5 | To: Greg Kroah-Hartman <gregkh@suse.de>, Chris Wright <chrisw@sous-sol.org> | |
6 | Cc: stable@kernel.org | |
7 | Message-ID: <20080203121938.GA15811@elte.hu> | |
8 | Content-Disposition: inline | |
9 | ||
10 | From: Sam Ravnborg <sam@ravnborg.org> | |
11 | ||
12 | patch 3a900d89db35c133bc0874e71d9156b22db362b4 in mainline | |
13 | ||
14 | The apm module were renamed to apm_32 during the merge of 32 and 64 bit | |
15 | x86 which is unfortunate. As apm is 32 bit specific we like to keep the | |
16 | _32 in the filename but the module should be named apm. | |
17 | ||
18 | Fix this in the Makefile. | |
19 | ||
20 | Reported-by: "A.E.Lawrence" <lawrence_a_e@ntlworld.com> | |
21 | Signed-off-by: Sam Ravnborg <sam@ravnborg.org> | |
22 | Cc: Cc: Ingo Molnar <mingo@elte.hu> | |
23 | Cc: "H. Peter Anvin" <hpa@zytor.com> | |
24 | Cc: "A.E.Lawrence" <lawrence_a_e@ntlworld.com> | |
25 | Signed-off-by: Ingo Molnar <mingo@elte.hu> | |
26 | Signed-off-by: Thomas Gleixner <tglx@linutronix.de> | |
27 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | |
28 | ||
29 | --- | |
30 | arch/x86/kernel/Makefile_32 | 3 ++- | |
31 | 1 file changed, 2 insertions(+), 1 deletion(-) | |
32 | ||
33 | --- a/arch/x86/kernel/Makefile_32 | |
34 | +++ b/arch/x86/kernel/Makefile_32 | |
35 | @@ -19,7 +19,8 @@ obj-$(CONFIG_X86_MSR) += msr.o | |
36 | obj-$(CONFIG_X86_CPUID) += cpuid.o | |
37 | obj-$(CONFIG_MICROCODE) += microcode.o | |
38 | obj-$(CONFIG_PCI) += early-quirks.o | |
39 | -obj-$(CONFIG_APM) += apm_32.o | |
40 | +apm-y := apm_32.o | |
41 | +obj-$(CONFIG_APM) += apm.o | |
42 | obj-$(CONFIG_X86_SMP) += smp_32.o smpboot_32.o tsc_sync.o | |
43 | obj-$(CONFIG_SMP) += smpcommon_32.o | |
44 | obj-$(CONFIG_X86_TRAMPOLINE) += trampoline_32.o |