From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Wed, 28 Apr 2010 21:23:15 +0000 (-0700)
Subject: wireless: Fix merge.
X-Git-Tag: v2.6.35-rc1~473^2~306
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=28b4c3bf1c4aa306fc5189fc7d556aa780c68e98;p=pandora-kernel.git

wireless: Fix merge.

in your merge in 5c01d5669356e13f0fb468944c1dd4c6a7e978ad you added "int
i;" into wl1271_main.c which is unused in that function.

This patch fixes the merge problem:

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

Reading git-diff-tree failed