diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-02-20 14:13:30 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-02-20 14:13:30 -0500 |
| commit | 5a84d159061d914c8dd4aa372ac6e9529c2be453 (patch) | |
| tree | 9b08af78085334af44414adafe0096276f8fe0ff /arch/i386/Kconfig.cpu | |
| parent | e80a0e6e7ccdf64575d4384cb4172860422f5b81 (diff) | |
| parent | 7d477a04a619e90ee08724e8f2d8803c6bdfcef8 (diff) | |
Merge ARM fixes
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 |