From 7cbc909108314abf0af7c5354b17b1b745e8e605 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Sat, 16 Apr 2011 13:25:15 +0200 Subject: [PATCH] --- yaml --- r: 255351 b: refs/heads/master c: 5613fff2dc315e5f44623031cb62a29942548427 h: refs/heads/master i: 255349: 0632e63051110dcc66ab861dd18344164e7049c6 255347: aef7552a003db7965cc0786f26c6f2836f33d330 255343: 64c5b372065a952227d0d1ec8bb6e5bdf5218eee v: v3 --- [refs] | 2 +- trunk/drivers/net/can/at91_can.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f977ce9d30dd..829fd2df9ba5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 44d856665789288859b7aa47ca25933c1c6ab57d +refs/heads/master: 5613fff2dc315e5f44623031cb62a29942548427 diff --git a/trunk/drivers/net/can/at91_can.c b/trunk/drivers/net/can/at91_can.c index 8f15ae4c719f..afd0f5d394b0 100644 --- a/trunk/drivers/net/can/at91_can.c +++ b/trunk/drivers/net/can/at91_can.c @@ -375,7 +375,7 @@ static void at91_chip_stop(struct net_device *dev, enum can_state state) * mailbox, but without the offset AT91_MB_TX_FIRST. The lower bits * encode the mailbox number, the upper 4 bits the mailbox priority: * - * priv->tx_next = (prio << AT91_NEXT_PRIO_SHIFT) || + * priv->tx_next = (prio << AT91_NEXT_PRIO_SHIFT) | * (mb - AT91_MB_TX_FIRST); * */