diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-03-31 12:16:31 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-03-31 12:16:31 +0200 |
| commit | 9ddd84f872898373c51469f9c931d5aa89fdc807 (patch) | |
| tree | d81f9e396801f04d55924c0d3bbd903fe60ebcda /arch/x86/Kconfig.cpu | |
| parent | 749d32237bf39e6576dd95bfdf24e4378e51716c (diff) | |
| parent | a4b7f21d7b42b33609df3f86992a8deff80abfaf (diff) | |
| download | linux-9ddd84f872898373c51469f9c931d5aa89fdc807.tar.bz2 | |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'arch/x86/Kconfig.cpu')
| -rw-r--r-- | arch/x86/Kconfig.cpu | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu index c026cca5602c..f3aaf231b4e5 100644 --- a/arch/x86/Kconfig.cpu +++ b/arch/x86/Kconfig.cpu @@ -341,10 +341,6 @@ config X86_USE_3DNOW def_bool y depends on (MCYRIXIII || MK7 || MGEODE_LX) && !UML -config X86_OOSTORE - def_bool y - depends on (MWINCHIP3D || MWINCHIPC6) && MTRR - # # P6_NOPs are a relatively minor optimization that require a family >= # 6 processor, except that it is broken on certain VIA chips. |