diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2006-01-03 07:51:07 -0500 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2006-01-03 07:51:07 -0500 |
| commit | d087e4bdd24ebe3ae3d0b265b6573ec901af4b4b (patch) | |
| tree | c2db1b4958bbf617a25398b7ef93d82006b26a17 /drivers/atm/adummy.c | |
| parent | 292d4ed32e35df4755052b5002e533348d1648fd (diff) | |
| parent | 88026842b0a760145aa71d69e74fbc9ec118ca44 (diff) | |
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'drivers/atm/adummy.c')
| -rw-r--r-- | drivers/atm/adummy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c index d15c194be44a..d1387cfe2d30 100644 --- a/drivers/atm/adummy.c +++ b/drivers/atm/adummy.c | |||
| @@ -123,7 +123,7 @@ static int __init adummy_init(void) | |||
| 123 | } | 123 | } |
| 124 | memset(adummy_dev, 0, sizeof(struct adummy_dev)); | 124 | memset(adummy_dev, 0, sizeof(struct adummy_dev)); |
| 125 | 125 | ||
| 126 | atm_dev = atm_dev_register(DEV_LABEL, &adummy_ops, -1, 0); | 126 | atm_dev = atm_dev_register(DEV_LABEL, &adummy_ops, -1, NULL); |
| 127 | if (!atm_dev) { | 127 | if (!atm_dev) { |
| 128 | printk(KERN_ERR DEV_LABEL ": atm_dev_register() failed\n"); | 128 | printk(KERN_ERR DEV_LABEL ": atm_dev_register() failed\n"); |
| 129 | err = -ENODEV; | 129 | err = -ENODEV; |