diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-12-20 16:40:51 +0100 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-12-20 16:40:51 +0100 |
| commit | 8bcee1832d23869c2cdb6886ae5210b0143256f0 (patch) | |
| tree | 9fac190248ed9ed10fe4e6f7b1b4cda8eaef7ddd /net/atm/atm_sysfs.c | |
| parent | ARM: mach-shmobile: Bump up NR_IRQS to 1024 (diff) | |
| parent | ARM: mach-shmobile: INTC interrupt priority level demux fix (diff) | |
| download | linux-8bcee1832d23869c2cdb6886ae5210b0143256f0.tar.xz linux-8bcee1832d23869c2cdb6886ae5210b0143256f0.zip | |
Merge branch 'rmobile/urgent' into rmobile-latest
Conflicts:
arch/arm/mach-shmobile/include/mach/entry-macro.S
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
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 799c631f0fed..f7fa67c78766 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); |