Hi Dominik,
Today's linux-next merge of the pcmcia tree got a conflict in
drivers/net/wireless/ray_cs.c between commit
40cca2919c1994c01addfac2320ee77f4b9e12cf ("drivers/net/wireless: correct
check on CCS_START_NETWORK") from the wireless tree and commit
624dd66957e53e15cf40e937b50597c4d41f0e99 ("pcmcia: use dynamic debug
infrastructure, deprecate CS_CHECK (ray-cs.c)") from the pcmcia tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc drivers/net/wireless/ray_cs.c
index 5ee9d2a,28db791..0000000
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@@ -2074,8 -2065,8 +2065,8 @@@ static irqreturn_t ray_interrupt(int ir
del_timer(&local->timer);
local->timer.expires = jiffies + HZ * 5;
local->timer.data = (long)local;
- if (status == CCS_START_NETWORK) {
+ if (cmd == CCS_START_NETWORK) {
- DEBUG(0,
+ dev_dbg(&link->dev,
"ray_cs interrupt network \"%s\" start failed\n",
local->sparm.b4.a_current_ess_id);
local->timer.function = &start_net;
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
