diff options
| author | Simon Horman <horms@verge.net.au> | 2011-01-13 01:29:21 (GMT) |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2011-01-13 01:29:21 (GMT) |
| commit | fee1cc0895fd7bde875a86bbc3a1e82089e540b8 (patch) | |
| tree | df0a07a650229fd7aa775ca6c20a8d2939c96e72 /net/atm/atm_sysfs.c | |
| parent | ae90bdeaeac6b964b7a1e853a90a19f358a9ac20 (diff) | |
| parent | 0c21e3aaf6ae85bee804a325aa29c325209180fd (diff) | |
| download | linux-fsl-qoriq-fee1cc0895fd7bde875a86bbc3a1e82089e540b8.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 into HEAD
Diffstat (limited to 'net/atm/atm_sysfs.c')
| -rw-r--r-- | net/atm/atm_sysfs.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/atm/atm_sysfs.c b/net/atm/atm_sysfs.c index 799c631..f7fa67c 100644 --- a/net/atm/atm_sysfs.c +++ b/net/atm/atm_sysfs.c @@ -143,12 +143,13 @@ static struct class atm_class = { .dev_uevent = atm_uevent, }; -int atm_register_sysfs(struct atm_dev *adev) +int atm_register_sysfs(struct atm_dev *adev, struct device *parent) { struct device *cdev = &adev->class_dev; int i, j, err; cdev->class = &atm_class; + cdev->parent = parent; dev_set_drvdata(cdev, adev); dev_set_name(cdev, "%s%d", adev->type, adev->number); |