summaryrefslogtreecommitdiffstats
path: root/extra
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2005-10-29 22:36:31 +0000
committerMarcel Holtmann <marcel@holtmann.org>2005-10-29 22:36:31 +0000
commit632a9432774ff3a0c6e556e8f32a565b38890767 (patch)
tree8b1af8cdef2fe7c84d5c2f5fbe8e3c23d8320bec /extra
parentb5b9479c9afc42666245261d5864f410c59a9ef2 (diff)
Big cleanup of CVS relics
Diffstat (limited to 'extra')
-rw-r--r--extra/Makefile.am3
-rw-r--r--extra/bcm203x.c27
2 files changed, 11 insertions, 19 deletions
diff --git a/extra/Makefile.am b/extra/Makefile.am
index 7ce141c0..c5e53d9a 100644
--- a/extra/Makefile.am
+++ b/extra/Makefile.am
@@ -1,6 +1,3 @@
-#
-# $Id$
-#
datafiles = bcm203x.usermap
diff --git a/extra/bcm203x.c b/extra/bcm203x.c
index 5990ae8c..135d003f 100644
--- a/extra/bcm203x.c
+++ b/extra/bcm203x.c
@@ -3,28 +3,23 @@
* BlueZ - Bluetooth protocol stack for Linux
*
* Copyright (C) 2001-2002 Maxim Krasnyansky <maxk@qualcomm.com>
- * Copyright (C) 2003-2004 Marcel Holtmann <marcel@holtmann.org>
+ * Copyright (C) 2003-2005 Marcel Holtmann <marcel@holtmann.org>
*
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation;
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY
- * CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS,
- * COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS
- * SOFTWARE IS DISCLAIMED.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
- *
- * $Id$
*/
#ifdef HAVE_CONFIG_H