diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-07 02:54:53 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-07 02:54:53 (GMT) |
commit | 02ebbbd481635fd3ce7018e5bb19c18c0f1e4561 (patch) | |
tree | f07caea3ac9cb50492977a2f7b1d29bbce6e6a3a /drivers/pcmcia | |
parent | addd8c92cf55bba578b8a56e0f717a0a74b31008 (diff) | |
parent | 536ec4f8d13433126f948d6e90821f811a4ebdf8 (diff) | |
download | linux-fsl-qoriq-02ebbbd481635fd3ce7018e5bb19c18c0f1e4561.tar.xz |
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 'drivers/pcmcia')
0 files changed, 0 insertions, 0 deletions