From 1a9ac04045b8aadbde12a2c24e88ff5ea094ea98 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Thu, 16 Sep 2010 08:12:55 +0000
Subject: [PATCH] --- yaml --- r: 210818 b: refs/heads/master c:
 2507136f74f70a4869bd4f525d48715ae66db43d h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/net/llc/llc_station.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 815b21a61aff..ef09207cc09e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e443e383242839b0d72efce744b7ba31573b1f99
+refs/heads/master: 2507136f74f70a4869bd4f525d48715ae66db43d
diff --git a/trunk/net/llc/llc_station.c b/trunk/net/llc/llc_station.c
index e4dae0244d76..cf4aea3ba30f 100644
--- a/trunk/net/llc/llc_station.c
+++ b/trunk/net/llc/llc_station.c
@@ -689,7 +689,7 @@ static void llc_station_rcv(struct sk_buff *skb)
 
 int __init llc_station_init(void)
 {
-	u16 rc = -ENOBUFS;
+	int rc = -ENOBUFS;
 	struct sk_buff *skb;
 	struct llc_station_state_ev *ev;