From 15546e0df776dfa37139682774e58bd40109f280 Mon Sep 17 00:00:00 2001 From: Cong Wang Date: Tue, 3 Apr 2012 14:13:36 +0800 Subject: [PATCH] --- yaml --- r: 309354 b: refs/heads/master c: bc4854bc91c9a7f117437215cd8b16a0a5671d93 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_main.c | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index ad811e48419a..87bcc6afcc9a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f6d0a8dbfdce4b4f28fcb0f689c373874646f87c +refs/heads/master: bc4854bc91c9a7f117437215cd8b16a0a5671d93 diff --git a/trunk/drivers/block/drbd/drbd_main.c b/trunk/drivers/block/drbd/drbd_main.c index bd380b94fd08..920ede2829d6 100644 --- a/trunk/drivers/block/drbd/drbd_main.c +++ b/trunk/drivers/block/drbd/drbd_main.c @@ -4365,12 +4365,11 @@ const char *drbd_buildtag(void) static char buildtag[38] = "\0uilt-in"; if (buildtag[0] == 0) { -#ifdef CONFIG_MODULES - if (THIS_MODULE != NULL) - sprintf(buildtag, "srcversion: %-24s", THIS_MODULE->srcversion); - else +#ifdef MODULE + sprintf(buildtag, "srcversion: %-24s", THIS_MODULE->srcversion); +#else + buildtag[0] = 'b'; #endif - buildtag[0] = 'b'; } return buildtag;