diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-05-20 15:36:52 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-05-20 15:36:52 +1000 |
| commit | 880102e78547c1db158a17e36cf0cdd98e7ad710 (patch) | |
| tree | 3fff9cc54c44dafe275cfabefb96c589e08d971d /arch/x86/Makefile_32.cpu | |
| parent | 3d07f0e83d4323d2cd45cc583f7cf1957aca3cac (diff) | |
| parent | 39ab05c8e0b519ff0a04a869f065746e6e8c3d95 (diff) | |
Merge remote branch 'origin/master' into merge
Manual merge of arch/powerpc/kernel/smp.c and add missing scheduler_ipi()
call to arch/powerpc/platforms/cell/interrupt.c
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/x86/Makefile_32.cpu')
| -rw-r--r-- | arch/x86/Makefile_32.cpu | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/Makefile_32.cpu b/arch/x86/Makefile_32.cpu index f2ee1abb1df..86cee7b749e 100644 --- a/arch/x86/Makefile_32.cpu +++ b/arch/x86/Makefile_32.cpu @@ -37,7 +37,7 @@ cflags-$(CONFIG_MATOM) += $(call cc-option,-march=atom,$(call cc-option,-march= $(call cc-option,-mtune=atom,$(call cc-option,-mtune=generic)) # AMD Elan support -cflags-$(CONFIG_X86_ELAN) += -march=i486 +cflags-$(CONFIG_MELAN) += -march=i486 # Geode GX1 support cflags-$(CONFIG_MGEODEGX1) += -march=pentium-mmx |