Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

[linux-2.6-omap-h63xx.git] / net / netfilter / Kconfig

diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
index 2562d05dbaf541eedd74365fb37a8f1c03722ce0..bb279bf59a1b9147b5951268ec70d48662eb50f2 100644 (file)
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -52,7 +52,7 @@ config NF_CT_ACCT
 
          Please note that currently this option only sets a default state.
          You may change it at boot time with nf_conntrack.acct=0/1 kernel
-         paramater or by loading the nf_conntrack module with acct=0/1.
+         parameter or by loading the nf_conntrack module with acct=0/1.
 
          You may also disable/enable it on a running system with:
           sysctl net.netfilter.nf_conntrack_acct=0/1
@@ -374,7 +374,7 @@ config NETFILTER_XT_TARGET_HL
 
 config NETFILTER_XT_TARGET_LED
        tristate '"LED" target support'
-       depends on LEDS_CLASS
+       depends on LEDS_CLASS && LED_TRIGGERS
        depends on NETFILTER_ADVANCED
        help
          This option adds a `LED' target, which allows you to blink LEDs in