summaryrefslogtreecommitdiff
path: root/drivers/sbus
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-05-05 11:33:58 +0400
committerDavid S. Miller <davem@davemloft.net>2008-05-05 11:33:58 +0400
commit0a6db7dc49b91875ff015934df3e85b8785f2294 (patch)
treedb88b59b2918cc9a25d0a6a0c2b71e41a673659f /drivers/sbus
parent59f7137a1369c25308672def38f3b126d0c7575a (diff)
downloadlinux-0a6db7dc49b91875ff015934df3e85b8785f2294.tar.xz
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>
Diffstat (limited to 'drivers/sbus')
-rw-r--r--drivers/sbus/char/bpp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/sbus/char/bpp.c b/drivers/sbus/char/bpp.c
index 4fab0c23814c..b87037ec9805 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. */