diff --git a/[refs] b/[refs] index 642dc1df00ba..8eaeb6b7c5c9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fc5e286ff4ff6da3e76e6eb58c535e250ad2ff18 +refs/heads/master: 6cdd6400b244e6c130b8b418af28a0aec60ad5b5 diff --git a/trunk/drivers/ssb/main.c b/trunk/drivers/ssb/main.c index 58c7da29a37c..6e0daaa0e04b 100644 --- a/trunk/drivers/ssb/main.c +++ b/trunk/drivers/ssb/main.c @@ -1126,8 +1126,7 @@ static u32 ssb_tmslow_reject_bitmask(struct ssb_device *dev) case SSB_IDLOW_SSBREV_27: /* same here */ return SSB_TMSLOW_REJECT; /* this is a guess */ default: - printk(KERN_INFO "ssb: Backplane Revision 0x%.8X\n", rev); - WARN_ON(1); + WARN(1, KERN_INFO "ssb: Backplane Revision 0x%.8X\n", rev); } return (SSB_TMSLOW_REJECT | SSB_TMSLOW_REJECT_23); }