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/sparc | |
| parent | addd8c92cf55bba578b8a56e0f717a0a74b31008 (diff) | |
| parent | 536ec4f8d13433126f948d6e90821f811a4ebdf8 (diff) | |
| download | linux-02ebbbd481635fd3ce7018e5bb19c18c0f1e4561.tar.bz2 | |
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/sparc')
| -rw-r--r-- | arch/sparc/Kconfig | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index 1a6f20d4e7e6..f92602e86607 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig @@ -560,12 +560,7 @@ config SUN_OPENPROMFS Only choose N if you know in advance that you will not need to modify OpenPROM settings on the running system. -# Makefile helpers -config SPARC32_PCI - bool - default y - depends on SPARC32 && PCI - +# Makefile helper config SPARC64_PCI bool default y |