From 2682c9a5ad974ff4db4e3b00f11df8e7af467e8e Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Fri, 27 May 2011 20:46:43 +0000 Subject: [PATCH] Fix for very strange merge failure. git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/2.1.0.x@3487 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- iscsi-scst/kernel/iscsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iscsi-scst/kernel/iscsi.c b/iscsi-scst/kernel/iscsi.c index 2cbd14461..81632cd84 100644 --- a/iscsi-scst/kernel/iscsi.c +++ b/iscsi-scst/kernel/iscsi.c @@ -4119,9 +4119,9 @@ out_callb: out_destroy_mempool: mempool_destroy(iscsi_cmnd_abort_mempool); +#endif out_free_dummy: -#endif __free_pages(dummy_page, 0); goto out; }