diff --git a/[refs] b/[refs] index 5939fa320fdc..468f1e143c54 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3b4709a6cd0578d129d032a5dec9dc2684b71b3a +refs/heads/master: 62fb2ba3d870305e246c6cb317609c1dc2c9dd0b diff --git a/trunk/arch/s390/Kconfig b/trunk/arch/s390/Kconfig index ff690564edbd..12272361c018 100644 --- a/trunk/arch/s390/Kconfig +++ b/trunk/arch/s390/Kconfig @@ -407,7 +407,7 @@ config APPLDATA_BASE config APPLDATA_MEM tristate "Monitor memory management statistics" - depends on APPLDATA_BASE + depends on APPLDATA_BASE && VM_EVENT_COUNTERS help This provides memory management related data to the Linux - VM Monitor Stream, like paging/swapping rate, memory utilisation, etc.