From 39b5caa7a7fb3e9423c06f67cd75641ecedbcb3a Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Mon, 5 May 2008 00:33:58 -0700
Subject: [PATCH] --- yaml --- r: 96118 b: refs/heads/master c:
 0a6db7dc49b91875ff015934df3e85b8785f2294 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/sbus/char/bpp.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b5257bb45013..1b4f53b2e26d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 59f7137a1369c25308672def38f3b126d0c7575a
+refs/heads/master: 0a6db7dc49b91875ff015934df3e85b8785f2294
diff --git a/trunk/drivers/sbus/char/bpp.c b/trunk/drivers/sbus/char/bpp.c
index 4fab0c23814c..b87037ec9805 100644
--- a/trunk/drivers/sbus/char/bpp.c
+++ b/trunk/drivers/sbus/char/bpp.c
@@ -41,7 +41,7 @@
 #define BPP_DELAY 100
 
 static const unsigned  BPP_MAJOR = LP_MAJOR;
-static const char* dev_name = "bpp";
+static const char *bpp_dev_name = "bpp";
 
 /* When switching from compatibility to a mode where I can read, try
    the following mode first. */