Index: ath5k_hw.c
===================================================================
--- ath5k_hw.c	(revision 2244)
+++ ath5k_hw.c	(revision 2284)
@@ -296,6 +296,26 @@
 	writel(val, hal->ah_sh + reg);
 }
 
+static inline __u16 ath5k_hw_unaligned_read_16(__le16 *p)
+{
+	return le16_to_cpu(get_unaligned(p));
+}
+
+static inline void ath5k_hw_unaligned_write_16(__u16 v, __le16* p)
+{
+	put_unaligned(cpu_to_le16(v), p);
+}
+
+static inline __u32 ath5k_hw_unaligned_read_32(__le32 *p)
+{
+	return le32_to_cpu(get_unaligned(p));
+}
+
+static inline void ath5k_hw_unaligned_write_32(__u32 v, __le32 *p)
+{
+	put_unaligned(cpu_to_le32(v), p);
+}
+
 /*
  * Check if a register write has been completed
  */
Index: ath5k_hw.h
===================================================================
--- ath5k_hw.h	(revision 2244)
+++ ath5k_hw.h	(revision 2284)
@@ -20,6 +20,7 @@
 /*
  * Gain settings
  */
+
 typedef enum {
 	AR5K_RFGAIN_INACTIVE = 0,
 	AR5K_RFGAIN_READ_REQUESTED,
@@ -265,21 +266,10 @@
 /*
  * Unaligned little endian access
  */
-#define AR5K_LE_READ_2(_p)						\
-	(((const u_int8_t *)(_p))[0] | (((const u_int8_t *)(_p))[1] << 8))
-#define AR5K_LE_READ_4(_p) \
-	(((const u_int8_t *)(_p))[0] |					\
-	(((const u_int8_t *)(_p))[1] << 8) |				\
-	(((const u_int8_t *)(_p))[2] << 16) |				\
-	(((const u_int8_t *)(_p))[3] << 24))
-#define AR5K_LE_WRITE_2(_p, _val) \
-	((((u_int8_t *)(_p))[0] = ((u_int32_t)(_val) & 0xff)),		\
-	(((u_int8_t *)(_p))[1] = (((u_int32_t)(_val) >> 8) & 0xff)))
-#define AR5K_LE_WRITE_4(_p, _val)					\
-	((((u_int8_t *)(_p))[0] = ((u_int32_t)(_val) & 0xff)),		\
-	(((u_int8_t *)(_p))[1] = (((u_int32_t)(_val) >> 8) & 0xff)),	\
-	(((u_int8_t *)(_p))[2] = (((u_int32_t)(_val) >> 16) & 0xff)),	\
-	(((u_int8_t *)(_p))[3] = (((u_int32_t)(_val) >> 24) & 0xff)))
+#define AR5K_LE_READ_2	ath5k_hw_read_unaligned_16
+#define AR5K_LE_READ_4	ath5k_hw_read_unaligned_32
+#define AR5K_LE_WRITE_2	ath5k_hw_write_unaligned_16
+#define AR5K_LE_WRITE_4	ath5k_hw_write_unaligned_32
 
 #define AR5K_LOW_ID(_a)(				\
 (_a)[0] | (_a)[1] << 8 | (_a)[2] << 16 | (_a)[3] << 24	\
Index: ah_osdep.h
===================================================================
--- ah_osdep.h	(revision 2244)
+++ ah_osdep.h	(revision 2284)
@@ -34,6 +34,7 @@
 //#include <linux/cpufreq.h>
 
 #include <asm/byteorder.h>
+#include <asm/unaligned.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>