diff options
| author | David S. Miller <davem@davemloft.net> | 2008-05-05 03:33:58 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-05 03:33:58 -0400 |
| commit | 0a6db7dc49b91875ff015934df3e85b8785f2294 (patch) | |
| tree | db88b59b2918cc9a25d0a6a0c2b71e41a673659f /drivers | |
| parent | 59f7137a1369c25308672def38f3b126d0c7575a (diff) | |
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')
| -rw-r--r-- | drivers/sbus/char/bpp.c | 2 |
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 @@ | |||
| 41 | #define BPP_DELAY 100 | 41 | #define BPP_DELAY 100 |
| 42 | 42 | ||
| 43 | static const unsigned BPP_MAJOR = LP_MAJOR; | 43 | static const unsigned BPP_MAJOR = LP_MAJOR; |
| 44 | static const char* dev_name = "bpp"; | 44 | static const char *bpp_dev_name = "bpp"; |
| 45 | 45 | ||
| 46 | /* When switching from compatibility to a mode where I can read, try | 46 | /* When switching from compatibility to a mode where I can read, try |
| 47 | the following mode first. */ | 47 | the following mode first. */ |