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 /samples/Kconfig | |
parent | addd8c92cf55bba578b8a56e0f717a0a74b31008 (diff) | |
parent | 536ec4f8d13433126f948d6e90821f811a4ebdf8 (diff) |
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 'samples/Kconfig')
-rw-r--r-- | samples/Kconfig | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/samples/Kconfig b/samples/Kconfig index 96a7572853f7..41063e7592d2 100644 --- a/samples/Kconfig +++ b/samples/Kconfig @@ -61,10 +61,4 @@ config SAMPLE_KDB Build an example of how to dynamically add the hello command to the kdb shell. -config SAMPLE_HIDRAW - bool "Build simple hidraw example" - depends on HIDRAW && HEADERS_CHECK - help - Build an example of how to use hidraw from userspace. - endif # SAMPLES |