From b17cbc76a788792207c9bed3ac10fda49f69ece1 Mon Sep 17 00:00:00 2001
From: Larry Finger <Larry.Finger@lwfinger.net>
Date: Tue, 26 Jan 2010 16:42:02 -0600
Subject: [PATCH] --- yaml --- r: 183919 b: refs/heads/master c:
 da8604757b1cdf79f24e118b156349543eb1b722 h: refs/heads/master i:   183917:
 9618b5c6ec9cd1b1f2de4109816c29d22dfddee3   183915:
 bb8e3ca2c08e0aaa2ab5eaffa3a496e42eddb7fb   183911:
 bad090742a2fc884a5708ad0cfa8e3c2da6c826a   183903:
 c864ec11067d1baa75eb6d9044764557d028786b v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/net/wireless/b43/phy_n.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 3145139b8970..6e83df022a05 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d2bb8e02810cc5844fe2bd5a81d4058b8afe6de9
+refs/heads/master: da8604757b1cdf79f24e118b156349543eb1b722
diff --git a/trunk/drivers/net/wireless/b43/phy_n.c b/trunk/drivers/net/wireless/b43/phy_n.c
index df4bf435e218..8c39fb126d4f 100644
--- a/trunk/drivers/net/wireless/b43/phy_n.c
+++ b/trunk/drivers/net/wireless/b43/phy_n.c
@@ -822,7 +822,7 @@ static u16 b43_nphy_gen_load_samples(struct b43_wldev *dev, u32 freq, u16 max,
 {
 	int i;
 	u16 bw, len, rot, angle;
-	b43_c32 *samples;
+	struct b43_c32 *samples;
 
 
 	bw = (dev->phy.is_40mhz) ? 40 : 20;
@@ -840,7 +840,7 @@ static u16 b43_nphy_gen_load_samples(struct b43_wldev *dev, u32 freq, u16 max,
 		len = bw << 1;
 	}
 
-	samples = kzalloc(len * sizeof(b43_c32), GFP_KERNEL);
+	samples = kzalloc(len * sizeof(struct b43_c32), GFP_KERNEL);
 	rot = (((freq * 36) / bw) << 16) / 100;
 	angle = 0;