diff --git a/[refs] b/[refs] index c895c9d04c1d..371ac8570fc0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 52b3694157e3aa6df871e283115652ec6f2d31e0 +refs/heads/master: e12a95f40ac78f223deab743a5228f9eb3df8ed1 diff --git a/trunk/lib/Kconfig.debug b/trunk/lib/Kconfig.debug index 770a422a42e8..566cf2bc08ea 100644 --- a/trunk/lib/Kconfig.debug +++ b/trunk/lib/Kconfig.debug @@ -1192,7 +1192,7 @@ config MEMORY_NOTIFIER_ERROR_INJECT bash: echo: write error: Cannot allocate memory To compile this code as a module, choose M here: the module will - be called pSeries-reconfig-notifier-error-inject. + be called memory-notifier-error-inject. If unsure, say N. @@ -1209,7 +1209,7 @@ config OF_RECONFIG_NOTIFIER_ERROR_INJECT notified, write the error code to "actions//error". To compile this code as a module, choose M here: the module will - be called memory-notifier-error-inject. + be called of-reconfig-notifier-error-inject. If unsure, say N.