diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-10-20 13:41:44 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-10-20 13:41:44 -0400 |
| commit | 9cec58dc138d6fcad9f447a19c8ff69f6540e667 (patch) | |
| tree | 4fe1cca94fdba8b705c87615bee06d3346f687ce /arch/ia64/Kconfig | |
| parent | 17e5ad6c0ce5a970e2830d0de8bdd60a2f077d38 (diff) | |
| parent | ac9b9c667c2e1194e22ebe0a441ae1c37aaa9b90 (diff) | |
Update from upstream with manual merge of Yasunori Goto's
changes to swiotlb.c made in commit 281dd25cdc0d6903929b79183816d151ea626341
since this file has been moved from arch/ia64/lib/swiotlb.c to
lib/swiotlb.c
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/Kconfig')
| -rw-r--r-- | arch/ia64/Kconfig | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index ea4a889d8196..8f699a2e7981 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig | |||
| @@ -302,11 +302,6 @@ config PREEMPT | |||
| 302 | 302 | ||
| 303 | source "mm/Kconfig" | 303 | source "mm/Kconfig" |
| 304 | 304 | ||
| 305 | config HAVE_DEC_LOCK | ||
| 306 | bool | ||
| 307 | depends on (SMP || PREEMPT) | ||
| 308 | default y | ||
| 309 | |||
| 310 | config IA32_SUPPORT | 305 | config IA32_SUPPORT |
| 311 | bool "Support for Linux/x86 binaries" | 306 | bool "Support for Linux/x86 binaries" |
| 312 | help | 307 | help |