diff options
| author | Dave Jones <davej@redhat.com> | 2006-06-29 22:01:54 +0200 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-06-29 22:01:54 +0200 |
| commit | 55b4d6a52195a8f277ffddf755ddaff359878f41 (patch) | |
| tree | 06a3183a562f8da4688f65023f7a18dcad702956 /arch/xtensa/Kconfig | |
| parent | [AGPGART] Make AGP depend on PCI (diff) | |
| parent | [PATCH] KConfig: Spellchecking 'similarity' and 'independent' (diff) | |
| download | linux-55b4d6a52195a8f277ffddf755ddaff359878f41.tar.xz linux-55b4d6a52195a8f277ffddf755ddaff359878f41.zip | |
Merge ../linus
Conflicts:
drivers/char/agp/Kconfig
Diffstat (limited to 'arch/xtensa/Kconfig')
| -rw-r--r-- | arch/xtensa/Kconfig | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig index dbeb3504c3c8..848f173db257 100644 --- a/arch/xtensa/Kconfig +++ b/arch/xtensa/Kconfig @@ -34,10 +34,6 @@ config GENERIC_HARDIRQS bool default y -config RWSEM_GENERIC_SPINLOCK - bool - default y - source "init/Kconfig" menu "Processor type and features" |