From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Wed, 20 Oct 2010 00:41:49 +0000 (+0000)
Subject: Merged revisions 292376 via svnmerge from
X-Git-Tag: 11.0.0-beta1~2182
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=41260a6f20dc2a5974e80d2fc3be614ca9c5e8c8;p=thirdparty%2Fasterisk.git

Merged revisions 292376 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r292376 | tilghman | 2010-10-19 19:40:29 -0500 (Tue, 19 Oct 2010) | 5 lines

  Oops.  This module uses the generic timer and no longer uses DAHDI.

  This causes a problem with the Solaris and other system builds that have gcc
  4.1 (where optional_api is non-optional).
........


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

diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index f0ef9b88c6..bce86a8e73 100644
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -1,7 +1,7 @@
 /*
  * Asterisk -- An open source telephony toolkit.
  *
- * Copyright (C) 1999 - 2006, Digium, Inc.
+ * Copyright (C) 1999 - 2010, Digium, Inc.
  *
  * Mark Spencer <markster@digium.com>
  *
@@ -27,7 +27,6 @@
 
 /*** MODULEINFO
 	<conflict>win32</conflict>
-	<use>dahdi</use>
  ***/
 
 #include "asterisk.h"