diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-02 00:08:05 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-02 00:08:05 -0500 |
| commit | 95d465fd750897ab32462a6702fbfe1b122cbbc0 (patch) | |
| tree | 65c38b2f11c51bb6932e44dd6c92f15b0091abfe /arch/i386/Makefile.cpu | |
| parent | 642fde17dceceb56c7ba2762733ac688666ae657 (diff) | |
| parent | 683aa4012f53b2ada0f430487e05d37b0d94e90a (diff) | |
Manual merge with Linus.
Conflicts:
arch/powerpc/kernel/setup-common.c
drivers/input/keyboard/hil_kbd.c
drivers/input/mouse/hil_ptr.c
Diffstat (limited to 'arch/i386/Makefile.cpu')
| -rw-r--r-- | arch/i386/Makefile.cpu | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/i386/Makefile.cpu b/arch/i386/Makefile.cpu index dcd936ef45db..a11befba26d5 100644 --- a/arch/i386/Makefile.cpu +++ b/arch/i386/Makefile.cpu | |||
| @@ -39,3 +39,7 @@ cflags-$(CONFIG_X86_ELAN) += -march=i486 | |||
| 39 | # Geode GX1 support | 39 | # Geode GX1 support |
| 40 | cflags-$(CONFIG_MGEODEGX1) += -march=pentium-mmx | 40 | cflags-$(CONFIG_MGEODEGX1) += -march=pentium-mmx |
| 41 | 41 | ||
| 42 | # add at the end to overwrite eventual tuning options from earlier | ||
| 43 | # cpu entries | ||
| 44 | cflags-$(CONFIG_X86_GENERIC) += $(call tune,generic) | ||
| 45 | |||