git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
linux
/
atmdev.h
diff --git
a/include/linux/atmdev.h
b/include/linux/atmdev.h
index
b203ea8
..
2096e5c
100644
(file)
--- a/
include/linux/atmdev.h
+++ b/
include/linux/atmdev.h
@@
-209,7
+209,7
@@
struct atm_cirange {
#ifdef __KERNEL__
#ifdef __KERNEL__
-#include <linux/
config
.h>
+#include <linux/
device
.h>
#include <linux/wait.h> /* wait_queue_head_t */
#include <linux/time.h> /* struct timeval */
#include <linux/net.h>
#include <linux/wait.h> /* wait_queue_head_t */
#include <linux/time.h> /* struct timeval */
#include <linux/net.h>
@@
-359,6
+359,7
@@
struct atm_dev {
struct proc_dir_entry *proc_entry; /* proc entry */
char *proc_name; /* proc entry name */
#endif
struct proc_dir_entry *proc_entry; /* proc entry */
char *proc_name; /* proc entry name */
#endif
+ struct class_device class_dev; /* sysfs class device */
struct list_head dev_list; /* linkage */
};
struct list_head dev_list; /* linkage */
};
@@
-460,7
+461,7
@@
static inline void atm_dev_put(struct atm_dev *dev)
BUG_ON(!test_bit(ATM_DF_REMOVED, &dev->flags));
if (dev->ops->dev_close)
dev->ops->dev_close(dev);
BUG_ON(!test_bit(ATM_DF_REMOVED, &dev->flags));
if (dev->ops->dev_close)
dev->ops->dev_close(dev);
-
kfree(
dev);
+
class_device_put(&dev->class_
dev);
}
}
}
}