ath6kl: Bringing in the upstream version

chromeos/drivers/ath6kl/miscdrv/ar3kps/ar3kpsparser.h

Index: chromeos/drivers/ath6kl/miscdrv/ar3kps/ar3kpsparser.h
diff --git a/chromeos/drivers/ath6kl/miscdrv/ar3kps/ar3kpsparser.h b/chromeos/drivers/ath6kl/miscdrv/ar3kps/ar3kpsparser.h
index 2aaadbb50469b2a925b67a591e7db6dc4082c691..007b0eb950d2f3f82b90e5b548c70a1bd2862e31 100644
--- a/chromeos/drivers/ath6kl/miscdrv/ar3kps/ar3kpsparser.h
+++ b/chromeos/drivers/ath6kl/miscdrv/ar3kps/ar3kpsparser.h
@@ -1,56 +1,27 @@
-/*
- * Copyright (c) 2004-2008 Atheros Communications Inc.
- * All rights reserved.
- *
- * This file is the include file for Atheros PS and patch parser.
- * It implements APIs to parse data buffer with patch and PS information and convert it to HCI commands.
- *
- *
- *
- * ar3kpsparser.h
- *
- *
- *
- * The software source and binaries included in this development package are
- * licensed, not sold. You, or your company, received the package under one
- * or more license agreements. The rights granted to you are specifically
- * listed in these license agreement(s). All other rights remain with Atheros
- * Communications, Inc., its subsidiaries, or the respective owner including
- * those listed on the included copyright notices..  Distribution of any
- * portion of this package must be in strict compliance with the license
- * agreement(s) terms.
- *
- *
- *
- */
-
-/*------------------------------------------------------------------------------
- *
- * <copyright file="File name" company="Atheros">
- * Copyright (c) 2004-2008 Atheros Corporation.  All rights reserved.
- * 
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License version 2 as
-// published by the Free Software Foundation;
+//------------------------------------------------------------------------------
 //
-// Software distributed under the License is distributed on an "AS
-// IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-// implied. See the License for the specific language governing
-// rights and limitations under the License.
+// Copyright (c) 2004-2010 Atheros Corporation.  All rights reserved.
+// 
 //
+// Permission to use, copy, modify, and/or distribute this software for any
+// purpose with or without fee is hereby granted, provided that the above
+// copyright notice and this permission notice appear in all copies.
 //
- *------------------------------------------------------------------------------
- *
- *
- *
- * This file is the include file for Atheros PS and patch parser.
- * It implements APIs to parse data buffer with patch and PS information and convert it to HCI commands.
- *
- *
- *
- *
- *
- */
+// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+//
+//
+//------------------------------------------------------------------------------
+//
+// This file is the include file for Atheros PS and patch parser.
+// It implements APIs to parse data buffer with patch and PS information and convert it to HCI commands.
+//
+
 #ifndef __AR3KPSPARSER_H
 #define __AR3KPSPARSER_H