From 44b63ba91f6e63e37c57d6f404823cee49e17dc9 Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven.eckelmann@gmx.de>
Date: Sat, 22 May 2010 17:48:45 +0200
Subject: [PATCH] --- yaml --- r: 199871 b: refs/heads/master c:
 20c8a44b7cd5e56b62898a87f620b3a7269eb898 h: refs/heads/master i:   199869:
 fe22f45b2a402ec4d1b7fc2a129715533ba111dd   199867:
 8f698dd289c8444c4214bfaa6bf38aef9eeac989   199863:
 091af99d4d5184b2304f81162b839c41c45b080d   199855:
 9bad21412ffb55aa287833f0a65e6131885f5f1b   199839:
 bbe6799e8af627eafb7f0ddbf48ab2b9f2b3533f   199807:
 9646fd7a5f590fc9f4ac1b7253520636bc9c62cf v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/staging/batman-adv/main.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3844cdc54ddf..09792f840b16 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f411a90ee163801434775264b4f9932f1de9e4c
+refs/heads/master: 20c8a44b7cd5e56b62898a87f620b3a7269eb898
diff --git a/trunk/drivers/staging/batman-adv/main.c b/trunk/drivers/staging/batman-adv/main.c
index 9d13979c2d8e..50a66b42d476 100644
--- a/trunk/drivers/staging/batman-adv/main.c
+++ b/trunk/drivers/staging/batman-adv/main.c
@@ -127,7 +127,7 @@ int init_module(void)
 	return 0;
 
 unreg_soft_device:
-	unregister_netdevice(soft_device);
+	unregister_netdev(soft_device);
 free_soft_device:
 	free_netdev(soft_device);
 	soft_device = NULL;