From: Olle Johansson <oej@edvina.net>
Date: Fri, 13 Nov 2009 10:53:14 +0000 (+0000)
Subject: Fixing trunk in a way so that it compiles again.
X-Git-Tag: 11.0.0-beta1~3858
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ebc3aff1c35a35815820ad59f324466d9a87e1cf;p=thirdparty%2Fasterisk.git

Fixing trunk in a way so that it compiles again.

Thanks, Philippe :-)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@229871 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/loader.c b/main/loader.c
index 198ebc9296..8c0067d92b 100644
--- a/main/loader.c
+++ b/main/loader.c
@@ -853,8 +853,7 @@ static struct load_order_entry *add_to_load_order(const char *resource, struct l
 		if (!resource_name_match(order->resource, resource)) {
 			/* Make sure we have the proper setting for the required field 
 			   (we might have both load= and required= lines in modules.conf) */
-				order->required |= required;
-			}
+			order->required |= required;
 			return NULL;
 		}
 	}