diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2012-05-08 08:07:48 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2012-05-08 08:07:48 -0400 |
commit | 67ba5293f705eb1d1b98710e5ccb0f615936a6fc (patch) | |
tree | cdb4cfd94033b5c0f42eeb4de368802049880a12 /drivers/net/ethernet/ti/tlan.c | |
parent | 86627c93b35082f7a0e4d3111546943984b932c7 (diff) | |
parent | d909a81b198a397593495508c4a5755fe95552fb (diff) |
Merge branch 'smp/threadalloc' into smp/hotplug
Reason: Pull in the separate branch which was created so arch/tile can
base further work on it.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/net/ethernet/ti/tlan.c')
-rw-r--r-- | drivers/net/ethernet/ti/tlan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/ti/tlan.c b/drivers/net/ethernet/ti/tlan.c index 817ad3bc4957..efd36691ce54 100644 --- a/drivers/net/ethernet/ti/tlan.c +++ b/drivers/net/ethernet/ti/tlan.c | |||
@@ -228,7 +228,7 @@ tlan_get_skb(const struct tlan_list *tag) | |||
228 | unsigned long addr; | 228 | unsigned long addr; |
229 | 229 | ||
230 | addr = tag->buffer[9].address; | 230 | addr = tag->buffer[9].address; |
231 | addr |= (tag->buffer[8].address << 16) << 16; | 231 | addr |= ((unsigned long) tag->buffer[8].address << 16) << 16; |
232 | return (struct sk_buff *) addr; | 232 | return (struct sk_buff *) addr; |
233 | } | 233 | } |
234 | 234 | ||