]> git.baikalelectronics.ru Git - kernel.git/commit
staging: ramster: build ramster properly when CONFIG_OCFS2=m|y
authorDan Magenheimer <dan.magenheimer@oracle.com>
Mon, 20 Feb 2012 16:29:30 +0000 (08:29 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 24 Feb 2012 19:59:58 +0000 (11:59 -0800)
commit19d7a5138b2742b5973a75aa9db016fcab5ef985
treee8bfa3d2373760dbec9e92f8b9022cfa1dd8a134
parentd69f2823bcb19f8d3074bcfeb0fff4e2875607d0
staging: ramster: build ramster properly when CONFIG_OCFS2=m|y

Due to some conflicting debug vars, kernel build will warn when
CONFIG_RAMSTER=y and CONFIG_OCFS2=m and will fail when
CONFIG_RAMSTER=y and CONFIG_OCFS2=y (rare).

Rename ramster mlog vars to avoid the name conflict.

Signed-off-by: Dan Magenheimer <dan.magenheimer@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/ramster/cluster/masklog.c
drivers/staging/ramster/cluster/masklog.h