Module Name: src
Committed By: pgoyette
Date: Tue Nov 1 22:30:32 UTC 2011
Modified Files:
src/usr.sbin/i2cscan: i2cscan.c
Log Message:
Update license to reflect actual source of this code which was extracted
from a larger work.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/i2cscan/i2cscan.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/i2cscan/i2cscan.c
diff -u src/usr.sbin/i2cscan/i2cscan.c:1.2 src/usr.sbin/i2cscan/i2cscan.c:1.3
--- src/usr.sbin/i2cscan/i2cscan.c:1.2 Fri Oct 7 10:30:21 2011
+++ src/usr.sbin/i2cscan/i2cscan.c Tue Nov 1 22:30:32 2011
@@ -1,11 +1,11 @@
-/* $NetBSD: i2cscan.c,v 1.2 2011/10/07 10:30:21 joerg Exp $ */
+/* $NetBSD: i2cscan.c,v 1.3 2011/11/01 22:30:32 pgoyette Exp $ */
-/*
- * Copyright (c) 2003 Wasabi Systems, Inc.
- * Copyright (c) 2011 Jared D. McNeill <[email protected]>
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
* All rights reserved.
*
- * Written by Jason R. Thorpe for Wasabi Systems, Inc.
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Paul Goyette and Jared McNeill
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -15,18 +15,11 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed for the NetBSD Project by
- * Wasabi Systems, Inc.
- * 4. The name of Wasabi Systems, Inc. may not be used to endorse
- * or promote products derived from this software without specific prior
- * written permission.
*
- * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL WASABI SYSTEMS, INC
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
@@ -37,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: i2cscan.c,v 1.2 2011/10/07 10:30:21 joerg Exp $");
+__RCSID("$NetBSD: i2cscan.c,v 1.3 2011/11/01 22:30:32 pgoyette Exp $");
#include <sys/types.h>
#include <sys/ioctl.h>
