From 40a5d26d97d8e9afb3ffa1946cfec51dffc0a8b5 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Fri, 13 Apr 2012 15:02:35 -0400
Subject: [PATCH] --- yaml --- r: 300737 b: refs/heads/master c:
 64d683c5825003ffb3b127057a165e6bfc26691e h: refs/heads/master i:   300735:
 c0d512085906894a838e83bd4d17f7b8ca768575 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/net/bonding/bond_main.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ee33a9f03fee..0961db4e8b62 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: be3839520411df2806b188fff053c775a884cfce
+refs/heads/master: 64d683c5825003ffb3b127057a165e6bfc26691e
diff --git a/trunk/drivers/net/bonding/bond_main.c b/trunk/drivers/net/bonding/bond_main.c
index 53ee6a0a3681..bb928993db3a 100644
--- a/trunk/drivers/net/bonding/bond_main.c
+++ b/trunk/drivers/net/bonding/bond_main.c
@@ -4820,7 +4820,7 @@ static int bond_validate(struct nlattr *tb[], struct nlattr *data[])
 	return 0;
 }
 
-static int bond_get_tx_queues(struct net *net, const struct nlattr *tb[])
+static int bond_get_tx_queues(struct net *net, struct nlattr *tb[])
 {
 	return tx_queues;
 }