diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-01-05 08:31:08 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-01-05 08:31:08 +1000 |
| commit | 4f125010d2d02c481a0fdf5aee23a9f937bc5de1 (patch) | |
| tree | dcdcd2ba1d0bb980b57ced9a1b2b5b17c84c8f57 /net/atm/resources.c | |
| parent | 204663c48711ddceee09df46269cd34d49d1f7be (diff) | |
| parent | 989d873fc5b6a96695b97738dea8d9f02a60f8ab (diff) | |
Merge branch 'master' of /home/airlied/kernel/linux-2.6 into drm-core-next
Diffstat (limited to 'net/atm/resources.c')
| -rw-r--r-- | net/atm/resources.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/atm/resources.c b/net/atm/resources.c index d29e5826151..23f45ce6f35 100644 --- a/net/atm/resources.c +++ b/net/atm/resources.c @@ -74,8 +74,9 @@ struct atm_dev *atm_dev_lookup(int number) } EXPORT_SYMBOL(atm_dev_lookup); -struct atm_dev *atm_dev_register(const char *type, const struct atmdev_ops *ops, - int number, unsigned long *flags) +struct atm_dev *atm_dev_register(const char *type, struct device *parent, + const struct atmdev_ops *ops, int number, + unsigned long *flags) { struct atm_dev *dev, *inuse; @@ -115,7 +116,7 @@ struct atm_dev *atm_dev_register(const char *type, const struct atmdev_ops *ops, goto out_fail; } - if (atm_register_sysfs(dev) < 0) { + if (atm_register_sysfs(dev, parent) < 0) { pr_err("atm_register_sysfs failed for dev %s\n", type); atm_proc_dev_deregister(dev); goto out_fail; |