ath6kl: Bringing in the upstream version

chromeos/drivers/ath6kl/hif/common/hif_sdio_common.h

Index: chromeos/drivers/ath6kl/hif/common/hif_sdio_common.h
diff --git a/chromeos/drivers/ath6kl/hif/common/hif_sdio_common.h b/chromeos/drivers/ath6kl/hif/common/hif_sdio_common.h
index 78d29ca14dc2bca6f9dd036a535694703c357e98..0f4e913cb13b7111a909504b3c143014ff503787 100644
--- a/chromeos/drivers/ath6kl/hif/common/hif_sdio_common.h
+++ b/chromeos/drivers/ath6kl/hif/common/hif_sdio_common.h
@@ -1,15 +1,18 @@
 //------------------------------------------------------------------------------
-// <copyright file="hif_sdio_common.h" company="Atheros">
-//    Copyright (c) 2009 Atheros Corporation.  All rights reserved.
+// Copyright (c) 2009-2010 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.
+// 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.
+//
+// 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.
 //
 //
 //------------------------------------------------------------------------------
@@ -23,7 +26,6 @@
 #define HIF_SDIO_COMMON_H_
 
     /* SDIO manufacturer ID and Codes */
-#define MANUFACTURER_ID_AR6001_BASE        0x100
 #define MANUFACTURER_ID_AR6002_BASE        0x200
 #define MANUFACTURER_ID_AR6003_BASE        0x300
 #define MANUFACTURER_ID_AR6K_BASE_MASK     0xFF00
@@ -59,9 +61,6 @@
 static INLINE void SetExtendedMboxWindowInfo(A_UINT16 Manfid, HIF_DEVICE_MBOX_INFO *pInfo)
 {
     switch (Manfid & MANUFACTURER_ID_AR6K_BASE_MASK) {                   
-        case MANUFACTURER_ID_AR6001_BASE :
-            /* no extended MBOX */
-            break;
         case MANUFACTURER_ID_AR6002_BASE :
                 /* MBOX 0 has an extended range */
             pInfo->MboxProp[0].ExtendedAddress = HIF_MBOX0_EXTENDED_BASE_ADDR;