diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-12-21 22:56:10 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-12-21 22:56:10 -0500 |
| commit | 7ccbefe07ea0a3570e44d1ec13a307552ee4dadd (patch) | |
| tree | ba0299694a9f3940f289b6a29cadab853906e3d2 /net/atm/resources.h | |
| parent | 623eb15647fc35c5a8cd38985d5958240eb072c1 (diff) | |
| parent | 90a8a73c06cc32b609a880d48449d7083327e11a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'net/atm/resources.h')
| -rw-r--r-- | net/atm/resources.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/atm/resources.h b/net/atm/resources.h index 126fb1840dfb..521431e30507 100644 --- a/net/atm/resources.h +++ b/net/atm/resources.h | |||
| @@ -42,6 +42,6 @@ static inline void atm_proc_dev_deregister(struct atm_dev *dev) | |||
| 42 | 42 | ||
| 43 | #endif /* CONFIG_PROC_FS */ | 43 | #endif /* CONFIG_PROC_FS */ |
| 44 | 44 | ||
| 45 | int atm_register_sysfs(struct atm_dev *adev); | 45 | int atm_register_sysfs(struct atm_dev *adev, struct device *parent); |
| 46 | void atm_unregister_sysfs(struct atm_dev *adev); | 46 | void atm_unregister_sysfs(struct atm_dev *adev); |
| 47 | #endif | 47 | #endif |