Merge remote-tracking branch 'clk/clk-next'

[karo-tx-linux.git] / net / Kconfig

diff --git a/net/Kconfig b/net/Kconfig
index 2b406608a1a4a42606e6ca3eb583f5f1b136176a..b50dacc072f0026416490e534f7f6c14fa624724 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -228,7 +228,7 @@ config RPS
 
 config RFS_ACCEL
        boolean
-       depends on RPS && GENERIC_HARDIRQS
+       depends on RPS
        select CPU_RMAP
        default y
 
@@ -281,7 +281,7 @@ menu "Network testing"
 
 config NET_PKTGEN
        tristate "Packet Generator (USE WITH CAUTION)"
-       depends on PROC_FS
+       depends on INET && PROC_FS
        ---help---
          This module will inject preconfigured packets, at a configurable
          rate, out of a given interface.  It is used for network interface