ath6kl: Bringing in the upstream version

chromeos/drivers/ath6kl/os/linux/include/osapi_linux.h

Index: chromeos/drivers/ath6kl/os/linux/include/osapi_linux.h
diff --git a/chromeos/drivers/ath6kl/os/linux/include/osapi_linux.h b/chromeos/drivers/ath6kl/os/linux/include/osapi_linux.h
index 69dfdd5194d35e49ca26a3442106f95497196fe2..fce6ceb73fa4bff1dfc88b59458b5244bb72c93a 100644
--- a/chromeos/drivers/ath6kl/os/linux/include/osapi_linux.h
+++ b/chromeos/drivers/ath6kl/os/linux/include/osapi_linux.h
@@ -1,23 +1,28 @@
-/*
- * This file contains the definitions of the basic atheros data types.
- * It is used to map the data types in atheros files to a platform specific
- * type.
- *
- * Copyright 2003-2005 Atheros Communications, Inc.,  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;
+//------------------------------------------------------------------------------
+// This file contains the definitions of the basic atheros data types.
+// It is used to map the data types in atheros files to a platform specific
+// type.
+// Copyright (c) 2004-2010 Atheros Communications Inc.
+// All rights reserved.
 //
-// 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.
+//
+//
+//
+// Author(s): ="Atheros"
+//------------------------------------------------------------------------------
 
 #ifndef _OSAPI_LINUX_H_
 #define _OSAPI_LINUX_H_
@@ -30,17 +35,11 @@
 #include <linux/string.h>
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 #include <linux/jiffies.h>
-#endif
 #include <linux/timer.h>
 #include <linux/delay.h>
 #include <linux/wait.h>
-#ifdef KERNEL_2_4
-#include <asm/arch/irq.h>
-#include <asm/irq.h>
-#endif
-
+#include <linux/semaphore.h>
 #include <linux/cache.h>
 
 #ifdef __GNUC__
@@ -341,7 +340,7 @@ A_UINT32 a_copy_from_user(void *to, const void *from, A_UINT32 n);
 #define A_CACHE_LINE_PAD            128
 
 static inline void *A_ALIGN_TO_CACHE_LINE(void *ptr) {   
-    return (void *)L1_CACHE_ALIGN((A_UINT32)ptr);
+    return (void *)L1_CACHE_ALIGN((unsigned long)ptr);
 }
    
 #else /* __KERNEL__ */