diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-06 18:54:53 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-06 18:54:53 -0800 |
| commit | 02ebbbd481635fd3ce7018e5bb19c18c0f1e4561 (patch) | |
| tree | f07caea3ac9cb50492977a2f7b1d29bbce6e6a3a /arch/x86/um | |
| parent | Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild (diff) | |
| parent | scsi: drop unused Kconfig symbol (diff) | |
| download | linux-dev-02ebbbd481635fd3ce7018e5bb19c18c0f1e4561.tar.xz linux-dev-02ebbbd481635fd3ce7018e5bb19c18c0f1e4561.zip | |
Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
* 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
scsi: drop unused Kconfig symbol
pci: drop unused Kconfig symbol
stmmac: drop unused Kconfig symbol
x86: drop unused Kconfig symbol
powerpc: drop unused Kconfig symbols
powerpc: 40x: drop unused Kconfig symbol
mips: drop unused Kconfig symbols
openrisc: drop unused Kconfig symbols
arm: at91: drop unused Kconfig symbol
samples: drop unused Kconfig symbol
m32r: drop unused Kconfig symbol
score: drop unused Kconfig symbols
sh: drop unused Kconfig symbol
um: drop unused Kconfig symbol
sparc: drop unused Kconfig symbol
alpha: drop unused Kconfig symbol
Fix up trivial conflict in drivers/net/ethernet/stmicro/stmmac/Kconfig
as per Michal: the STMMAC_DUAL_MAC config variable is still unused and
should be deleted.
Diffstat (limited to 'arch/x86/um')
| -rw-r--r-- | arch/x86/um/Kconfig | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86/um/Kconfig b/arch/x86/um/Kconfig index 21bebe63df66..1d97bd84b6fb 100644 --- a/arch/x86/um/Kconfig +++ b/arch/x86/um/Kconfig @@ -57,9 +57,6 @@ config ARCH_HAS_SC_SIGNALS config ARCH_REUSE_HOST_VSYSCALL_AREA def_bool !64BIT -config SMP_BROKEN - def_bool 64BIT - config GENERIC_HWEIGHT def_bool y |