ath6kl: Bringing in the upstream version

chromeos/drivers/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h

Index: chromeos/drivers/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h
diff --git a/chromeos/drivers/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h b/chromeos/drivers/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h
index 0f92f20ed2d948f2c0eff7648820bea01619ace5..857f35f36ca2347dc282d977c787f8183fadb4bd 100644
--- a/chromeos/drivers/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h
+++ b/chromeos/drivers/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h
@@ -1,15 +1,19 @@
 //------------------------------------------------------------------------------
 // <copyright file="hif_internal.h" company="Atheros">
-//    Copyright (c) 2004-2007 Atheros Corporation.  All rights reserved.
+//    Copyright (c) 2004-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.
 //
 //
 //------------------------------------------------------------------------------
@@ -27,10 +31,8 @@
 #include "a_osapi.h"
 #include "hif.h"
 #include "../../../common/hif_sdio_common.h"
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)   
 #include <linux/scatterlist.h>
 #define HIF_LINUX_MMC_SCATTER_SUPPORT
-#endif
 
 #define BUS_REQUEST_MAX_NUM                64
 
@@ -78,7 +80,10 @@ struct hif_device {
     DL_LIST      ScatterReqHead;                /* scatter request list head */
     A_BOOL       scatter_enabled;               /* scatter enabled flag */
     A_BOOL   is_suspend;
+    A_BOOL   is_disabled;
     atomic_t   irqHandling;
+    HIF_DEVICE_POWER_CHANGE_TYPE powerConfig;
+    const struct sdio_device_id *id;
 };
 
 #define HIF_DMA_BUFFER_SIZE (32 * 1024)