From: David S. Miller <davem@davemloft.net>
Date: Mon, 5 May 2008 07:33:58 +0000 (-0700)
Subject: sbus: Fix bpp driver build.
X-Git-Tag: v2.6.26-rc2~53^2~4
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a6db7dc49b91875ff015934df3e85b8785f2294;p=linux-2.6

sbus: Fix bpp driver build.

Using the variable name 'dev_name' in the top-level namespace is a bad
idea.

This conflicts with linux/device.h's inline function of the same name.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/sbus/char/bpp.c b/drivers/sbus/char/bpp.c
index 4fab0c2381..b87037ec98 100644
--- a/drivers/sbus/char/bpp.c
+++ b/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. */