X-Git-Url: https://jxself.org/git/?p=open-ath9k-htc-firmware.git;a=blobdiff_plain;f=NOTICE.TXT;h=7ab5e318267a41dc39d1877fbdcbad0774a08968;hp=0e7408348b272db27ec6f3850175984e8e13d56c;hb=HEAD;hpb=8804cc94e3b66550797279f540b960d18a78421f diff --git a/NOTICE.TXT b/NOTICE.TXT index 0e74083..a8bf00e 100644 --- a/NOTICE.TXT +++ b/NOTICE.TXT @@ -12,7 +12,7 @@ property. Copyright (c) 2013 QUALCOMM ATHEROS Incorporated. All rights reserved. -QUALCOMM ATHEROS® is a registered trademark and registered service mark of +QUALCOMM ATHEROS® is a registered trademark and registered service mark of QUALCOMM ATHEROS Incorporated. All other trademarks and service marks are the property of their respective owners. @@ -39,19 +39,18 @@ NOTICES: * Copyright (c) 2002-2005 Atheros Communications, Inc. * Copyright (c) 2008-2010, Atheros Communications Inc. * - * Redistribution and use in source and binary forms are permitted - * provided that the following conditions are met: - * 1. The materials contained herein are unmodified and are used - * unmodified. - * 2. Redistributions of source code must retain the above copyright + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following NO * ''WARRANTY'' disclaimer below (''Disclaimer''), without * modification. - * 3. Redistributions in binary form must reproduce at minimum a + * 2. Redistributions in binary form must reproduce at minimum a * disclaimer similar to the Disclaimer below and any redistribution * must be conditioned upon including a substantially similar * Disclaimer requirement for further binary redistribution. - * 4. Neither the names of the above-listed copyright holders nor the + * 3. Neither the names of the above-listed copyright holders nor the * names of any contributors may be used to endorse or promote * product derived from this software without specific prior written * permission. @@ -76,7 +75,7 @@ NOTICES: The following files are from ECoS with a GPLv2 licence with modification and linking caveats. Please see the licence below for more information: -target_firmware/magpie_fw_dev/build/magpie_1_1/sboot/cmnos/printf/src/cmnos_printf.c +sboot/magpie_1_1/sboot/cmnos/printf/src/cmnos_printf.c target_firmware/magpie_fw_dev/target/cmnos/cmnos_printf.c target_firmware/magpie_fw_dev/target/cmnos/k2_fw_cmnos_printf.c @@ -95,9 +94,8 @@ target_firmware/magpie_fw_dev/target/cmnos/k2_fw_cmnos_printf.c // FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License // for more details. // -// You should have received a copy of the GNU General Public License along -// with eCos; if not, write to the Free Software Foundation, Inc., -// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . // // As a special exception, if other files instantiate templates or use macros // or inline functions from this file, or you compile this file and link it