Commit bea14a1c authored by Theodore Y. Ts'o's avatar Theodore Y. Ts'o Committed by Linus Torvalds

[PATCH] Licencing of drivers/char/rocket.c

On Tue, Nov 09, 2004 at 01:38:11PM -0600, Jason.Jorgensen@comtrol.com wrote:
     On Tuesday, November 09, 2004 10:58 AM, Theodore Ts'o <tytso@mit.edu> wrote:
    > I developed the Rocketport device driver under contract of Comtrol,
    > with the understanding that the resulting device driver would be
    > released under the GPL.  So I believe the correct way of resolving the
    > conflicting copyright statements is to delete the following lines.
    > 
    > It would be good to get positive confirmation from Comtrol as well
    > that this is their understanding as well. 
   
     You are absolutely correct. That notice slipped by us and should not be in
     there. 
   
     If someone with access to the mainline source could remove that for us we
     would appreciate it.

Cc: Keith.Hammerbeck@comtrol.com, Steve.Erler@comtrol.com
Acked-by: Jason.Jorgensen@comtrol.com
Signed-off-by: default avatar"Theodore Ts'o" <tytso@thunk.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 607acf00
...@@ -2453,30 +2453,6 @@ static void rp_cleanup_module(void) ...@@ -2453,30 +2453,6 @@ static void rp_cleanup_module(void)
} }
#endif #endif
/***********************************************************************
Copyright 1994 Comtrol Corporation.
All Rights Reserved.
The following source code is subject to Comtrol Corporation's
Developer's License Agreement.
This source code is protected by United States copyright law and
international copyright treaties.
This source code may only be used to develop software products that
will operate with Comtrol brand hardware.
You may not reproduce nor distribute this source code in its original
form but must produce a derivative work which includes portions of
this source code only.
The portions of this source code which you use in your derivative
work must bear Comtrol's copyright notice:
Copyright 1994 Comtrol Corporation.
***********************************************************************/
#ifndef TRUE #ifndef TRUE
#define TRUE 1 #define TRUE 1
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment