ChangeSet 1.1440, 2003/10/03 16:40:49-07:00, greg@kroah.com [PATCH] USB: fix up some non-GPL friendly license wording. Keyspan/InnoSys approved this change. drivers/usb/serial/keyspan_usa26msg.h | 8 ++------ drivers/usb/serial/keyspan_usa28msg.h | 8 ++------ drivers/usb/serial/keyspan_usa49msg.h | 8 ++------ 3 files changed, 6 insertions(+), 18 deletions(-) diff -Nru a/drivers/usb/serial/keyspan_usa26msg.h b/drivers/usb/serial/keyspan_usa26msg.h --- a/drivers/usb/serial/keyspan_usa26msg.h Fri Oct 3 16:43:49 2003 +++ b/drivers/usb/serial/keyspan_usa26msg.h Fri Oct 3 16:43:49 2003 @@ -4,7 +4,7 @@ Copyright (C) 1998-2000 InnoSys Incorporated. All Rights Reserved This file is available under a BSD-style copyright - Keyspan USB Async Firmware to run on Anchor EZ-USB + Keyspan USB Async Message Formats for the USA28X Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -19,11 +19,7 @@ This file is available under a BSD-style copyright - 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. The name of InnoSys Incorporated may not be used to endorse or promote + 2. The name of InnoSys Incorporated may not be used to endorse or promote products derived from this software without specific prior written permission. diff -Nru a/drivers/usb/serial/keyspan_usa28msg.h b/drivers/usb/serial/keyspan_usa28msg.h --- a/drivers/usb/serial/keyspan_usa28msg.h Fri Oct 3 16:43:49 2003 +++ b/drivers/usb/serial/keyspan_usa28msg.h Fri Oct 3 16:43:49 2003 @@ -4,7 +4,7 @@ Copyright (C) 1998-2000 InnoSys Incorporated. All Rights Reserved This file is available under a BSD-style copyright - Keyspan USB Async Firmware to run on Anchor EZ-USB + Keyspan USB Async Message Formats for the USA26X Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -19,11 +19,7 @@ This file is available under a BSD-style copyright - 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. The name of InnoSys Incorporated may not be used to endorse or promote + 2. The name of InnoSys Incorporated may not be used to endorse or promote products derived from this software without specific prior written permission. diff -Nru a/drivers/usb/serial/keyspan_usa49msg.h b/drivers/usb/serial/keyspan_usa49msg.h --- a/drivers/usb/serial/keyspan_usa49msg.h Fri Oct 3 16:43:49 2003 +++ b/drivers/usb/serial/keyspan_usa49msg.h Fri Oct 3 16:43:49 2003 @@ -4,7 +4,7 @@ Copyright (C) 1998-2000 InnoSys Incorporated. All Rights Reserved This file is available under a BSD-style copyright - Keyspan USB Async Firmware to run on Anchor EZ-USB + Keyspan USB Async Message Formats for the USA49W Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -19,11 +19,7 @@ This file is available under a BSD-style copyright - 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. The name of InnoSys Incorporated may not be used to endorse or promote + 2. The name of InnoSys Incorporated may not be used to endorse or promote products derived from this software without specific prior written permission.