From 0a6db7dc49b91875ff015934df3e85b8785f2294 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] 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>
---
drivers/sbus/char/bpp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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. */