diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-08 17:43:58 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-08 17:43:58 -0700 |
commit | c71d9caf6cfdee56da2924a054cc84cbe91d82b6 (patch) | |
tree | db742d26d10bc309596035fb4e912a0c6b3bd206 /net/netfilter/Kconfig | |
parent | a219ee88b679c275863b882a0bb7b3330763e609 (diff) | |
parent | 2a3abf6d17b6026a59e5cf7452d70ec1ad6a69fa (diff) | |
download | linux-3.10-c71d9caf6cfdee56da2924a054cc84cbe91d82b6.tar.gz linux-3.10-c71d9caf6cfdee56da2924a054cc84cbe91d82b6.tar.bz2 linux-3.10-c71d9caf6cfdee56da2924a054cc84cbe91d82b6.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
igb: remove sysfs entry that was used to set the number of vfs
igbvf: add new driver to support 82576 virtual functions
drivers/net/eql.c: Fix a dev leakage.
niu: Fix unused variable warning.
r6040: set MODULE_VERSION
bnx2: Don't use reserved names
FEC driver: add missing #endif
niu: Fix error handling
mv643xx_eth: don't reset the rx coal timer on interface up
smsc911x: correct debugging message on mii read timeout
ethoc: fix library build errors
netfilter: ctnetlink: fix regression in expectation handling
netfilter: fix selection of "LED" target in netfilter
netfilter: ip6tables regression fix
Diffstat (limited to 'net/netfilter/Kconfig')
-rw-r--r-- | net/netfilter/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig index bb279bf59a1..2329c5f5055 100644 --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig @@ -374,7 +374,7 @@ config NETFILTER_XT_TARGET_HL config NETFILTER_XT_TARGET_LED tristate '"LED" target support' - depends on LEDS_CLASS && LED_TRIGGERS + depends on LEDS_CLASS && LEDS_TRIGGERS depends on NETFILTER_ADVANCED help This option adds a `LED' target, which allows you to blink LEDs in |