diff --git a/[refs] b/[refs]
index ba1bab287f33..8a1edc1c0098 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 74415edb042ef9f3b1291f978763687f35aadbb3
+refs/heads/master: 4c7f0bc266ccccfb0ca397405af13ee3d9e0f6b2
diff --git a/trunk/drivers/net/wireless/ath9k/regd.c b/trunk/drivers/net/wireless/ath9k/regd.c
index 42ce1d9abad0..64043e99facf 100644
--- a/trunk/drivers/net/wireless/ath9k/regd.c
+++ b/trunk/drivers/net/wireless/ath9k/regd.c
@@ -42,7 +42,7 @@ ath9k_regd_sort(void *a, u32 n, u32 size, ath_hal_cmp_t *cmp)
 			u8 *u = t - size;
 			if (cmp(u, t) <= 0)
 				break;
-			swap(u, t, size);
+			swap_array(u, t, size);
 		}
 }
 
diff --git a/trunk/drivers/net/wireless/ath9k/regd.h b/trunk/drivers/net/wireless/ath9k/regd.h
index 0ecd344fbd98..512d990aa7ea 100644
--- a/trunk/drivers/net/wireless/ath9k/regd.h
+++ b/trunk/drivers/net/wireless/ath9k/regd.h
@@ -125,7 +125,7 @@
 
 #define CHAN_FLAGS      (CHANNEL_ALL|CHANNEL_HALF|CHANNEL_QUARTER)
 
-#define swap(_a, _b, _size) {                   \
+#define swap_array(_a, _b, _size) {                   \
 	u8 *s = _b;                       \
 	int i = _size;                          \
 	do {                                    \