diff --git a/[refs] b/[refs] index ca27f1820d37..4eab6870182c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cc54c1e66e4b90ab657464fec30e6970636ee23d +refs/heads/master: 70193af9188113c9b4ff3dde1aed9f9c8f7c4f93 diff --git a/trunk/arch/s390/Kconfig b/trunk/arch/s390/Kconfig index 6b0a3538dc63..3f470604a89a 100644 --- a/trunk/arch/s390/Kconfig +++ b/trunk/arch/s390/Kconfig @@ -521,7 +521,7 @@ config APPLDATA_OS config APPLDATA_NET_SUM tristate "Monitor overall network statistics" - depends on APPLDATA_BASE + depends on APPLDATA_BASE && NET help This provides network related data to the Linux - VM Monitor Stream, currently there is only a total sum of network I/O statistics, no