diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-03 22:06:19 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-03 22:06:19 -0400 |
| commit | 3c8c7b2f32c52b259daa7564fefd582146799b23 (patch) | |
| tree | 59ff1ad0d6b7821d474d8fccafd884703684b6d7 /drivers/net/irda | |
| parent | 7cb3cd090c2725b80561958a362c2ba15a7a8c86 (diff) | |
| parent | 9123e0d78990246304fe681167b8d8097f1e02d7 (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'drivers/net/irda')
| -rw-r--r-- | drivers/net/irda/vlsi_ir.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/irda/vlsi_ir.c b/drivers/net/irda/vlsi_ir.c index 6d9de626c967..651c5a6578fd 100644 --- a/drivers/net/irda/vlsi_ir.c +++ b/drivers/net/irda/vlsi_ir.c | |||
| @@ -1875,11 +1875,11 @@ static int __init vlsi_mod_init(void) | |||
| 1875 | 1875 | ||
| 1876 | sirpulse = !!sirpulse; | 1876 | sirpulse = !!sirpulse; |
| 1877 | 1877 | ||
| 1878 | /* create_proc_entry returns NULL if !CONFIG_PROC_FS. | 1878 | /* proc_mkdir returns NULL if !CONFIG_PROC_FS. |
| 1879 | * Failure to create the procfs entry is handled like running | 1879 | * Failure to create the procfs entry is handled like running |
| 1880 | * without procfs - it's not required for the driver to work. | 1880 | * without procfs - it's not required for the driver to work. |
| 1881 | */ | 1881 | */ |
| 1882 | vlsi_proc_root = create_proc_entry(PROC_DIR, S_IFDIR, NULL); | 1882 | vlsi_proc_root = proc_mkdir(PROC_DIR, NULL); |
| 1883 | if (vlsi_proc_root) { | 1883 | if (vlsi_proc_root) { |
| 1884 | /* protect registered procdir against module removal. | 1884 | /* protect registered procdir against module removal. |
| 1885 | * Because we are in the module init path there's no race | 1885 | * Because we are in the module init path there's no race |