From: Adrian Chadd <adrian.chadd@gmail.com>
Date: Thu, 11 Aug 2016 20:32:34 +0000 (-0700)
Subject: Merge pull request #79 from kpengboy/master
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=f43f19cc17ed0f97b292d02274753a486e7088b4;hp=146bff1075a9f62c5d64c984bf6db502f8cd2671;p=open-ath9k-htc-firmware.git

Merge pull request #79 from kpengboy/master

Fix license missed during initial conversion
---

diff --git a/NOTICE.TXT b/NOTICE.TXT
index 0e74083..e8d2a5c 100644
--- a/NOTICE.TXT
+++ b/NOTICE.TXT
@@ -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.
diff --git a/target_firmware/wlan/ah_osdep.h b/target_firmware/wlan/ah_osdep.h
index 4d44fce..005753e 100755
--- a/target_firmware/wlan/ah_osdep.h
+++ b/target_firmware/wlan/ah_osdep.h
@@ -2,8 +2,9 @@
  * Copyright (c) 2002-2004 Sam Leffler, Errno Consulting, Atheros
  * Communications, Inc.  All rights reserved.
  *
- * Redistribution and use in source and binary forms are permitted
- * provided that the following conditions are met:
+ * 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