aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/sbus/char
diff options
context:
space:
mode:
authorJonathan Corbet <corbet@lwn.net>2008-07-14 17:29:34 -0400
committerJonathan Corbet <corbet@lwn.net>2008-07-14 17:29:34 -0400
commit2fceef397f9880b212a74c418290ce69e7ac00eb (patch)
treed9cc09ab992825ef7fede4a688103503e3caf655 /drivers/sbus/char
parentfeae1ef116ed381625d3731c5ae4f4ebcb3fa302 (diff)
parentbce7f793daec3e65ec5c5705d2457b81fe7b5725 (diff)
Merge commit 'v2.6.26' into bkl-removal
Diffstat (limited to 'drivers/sbus/char')
-rw-r--r--drivers/sbus/char/bpp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/sbus/char/bpp.c b/drivers/sbus/char/bpp.c
index c1c091a00575..bba21e053a1b 100644
--- a/drivers/sbus/char/bpp.c
+++ b/drivers/sbus/char/bpp.c
@@ -872,7 +872,7 @@ static void probeLptPort(unsigned idx)
872 instances[idx].mode = COMPATIBILITY; 872 instances[idx].mode = COMPATIBILITY;
873 instances[idx].run_length = 0; 873 instances[idx].run_length = 0;
874 instances[idx].run_flag = 0; 874 instances[idx].run_flag = 0;
875 if (!request_region(lpAddr,3, dev_name)) return; 875 if (!request_region(lpAddr,3, bpp_dev_name)) return;
876 876
877 /* 877 /*
878 * First, make sure the instance exists. Do this by writing to 878 * First, make sure the instance exists. Do this by writing to
@@ -1024,7 +1024,7 @@ static int __init bpp_init(void)
1024 if (rc == 0) 1024 if (rc == 0)
1025 return -ENODEV; 1025 return -ENODEV;
1026 1026
1027 rc = register_chrdev(BPP_MAJOR, dev_name, &bpp_fops); 1027 rc = register_chrdev(BPP_MAJOR, bpp_dev_name, &bpp_fops);
1028 if (rc < 0) 1028 if (rc < 0)
1029 return rc; 1029 return rc;
1030 1030
@@ -1040,7 +1040,7 @@ static void __exit bpp_cleanup(void)
1040{ 1040{
1041 unsigned idx; 1041 unsigned idx;
1042 1042
1043 unregister_chrdev(BPP_MAJOR, dev_name); 1043 unregister_chrdev(BPP_MAJOR, bpp_dev_name);
1044 1044
1045 for (idx = 0; idx < BPP_NO; idx++) { 1045 for (idx = 0; idx < BPP_NO; idx++) {
1046 if (instances[idx].present) 1046 if (instances[idx].present)