diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-05-17 14:51:24 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-05-17 14:51:24 -0400 |
| commit | 5dd8816aeb1f068ade0349a22009ff7a66f25413 (patch) | |
| tree | c56ff327b1dfa8868b4208aea9ac4158e3bfe308 /drivers/isdn/capi/capi.c | |
| parent | f03cc4fd927357bd4b3cea1a053b9f9d8f1731cc (diff) | |
| parent | 0c056c50a6218e0e577817c16ba8851af593d742 (diff) | |
| download | op-kernel-dev-5dd8816aeb1f068ade0349a22009ff7a66f25413.zip op-kernel-dev-5dd8816aeb1f068ade0349a22009ff7a66f25413.tar.gz | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'drivers/isdn/capi/capi.c')
| -rw-r--r-- | drivers/isdn/capi/capi.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c index 9b493f0..173c899 100644 --- a/drivers/isdn/capi/capi.c +++ b/drivers/isdn/capi/capi.c @@ -1499,7 +1499,6 @@ static int __init capi_init(void) printk(KERN_ERR "capi20: unable to get major %d\n", capi_major); return major_ret; } - capi_major = major_ret; capi_class = class_create(THIS_MODULE, "capi"); if (IS_ERR(capi_class)) { unregister_chrdev(capi_major, "capi20"); |
