diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:11:43 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:11:43 -0500 |
| commit | f630fe2817601314b2eb7ca5ddc23c7834646731 (patch) | |
| tree | 3bfb4939b7bbc3859575ca8b58fa3f929b015941 /arch/i386/Kconfig.cpu | |
| parent | 48c871c1f6a7c7044dd76774fb469e65c7e2e4e8 (diff) | |
| parent | 8a03d9a498eaf02c8a118752050a5154852c13bf (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'arch/i386/Kconfig.cpu')
| -rw-r--r-- | arch/i386/Kconfig.cpu | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/i386/Kconfig.cpu b/arch/i386/Kconfig.cpu index 2aecfba4ac4f..b99c0e2a4e63 100644 --- a/arch/i386/Kconfig.cpu +++ b/arch/i386/Kconfig.cpu | |||
| @@ -226,11 +226,6 @@ config X86_CMPXCHG | |||
| 226 | depends on !M386 | 226 | depends on !M386 |
| 227 | default y | 227 | default y |
| 228 | 228 | ||
| 229 | config X86_XADD | ||
| 230 | bool | ||
| 231 | depends on !M386 | ||
| 232 | default y | ||
| 233 | |||
| 234 | config X86_L1_CACHE_SHIFT | 229 | config X86_L1_CACHE_SHIFT |
| 235 | int | 230 | int |
| 236 | default "7" if MPENTIUM4 || X86_GENERIC | 231 | default "7" if MPENTIUM4 || X86_GENERIC |