git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull asus into release branch
[pandora-kernel.git]
/
include
/
linux
/
device.h
diff --git
a/include/linux/device.h
b/include/linux/device.h
index
d5b1b7b
..
5cf30e9
100644
(file)
--- a/
include/linux/device.h
+++ b/
include/linux/device.h
@@
-102,7
+102,7
@@
extern int bus_unregister_notifier(struct bus_type *bus,
#define BUS_NOTIFY_UNBIND_DRIVER 0x00000004 /* driver about to be
unbound */
#define BUS_NOTIFY_UNBIND_DRIVER 0x00000004 /* driver about to be
unbound */
-/*
driver
fs interface for exporting bus attributes */
+/*
sys
fs interface for exporting bus attributes */
struct bus_attribute {
struct attribute attr;
struct bus_attribute {
struct attribute attr;
@@
-128,6
+128,7
@@
struct device_driver {
struct module * owner;
const char * mod_name; /* used for built-in modules */
struct module * owner;
const char * mod_name; /* used for built-in modules */
+ struct module_kobject * mkobj;
int (*probe) (struct device * dev);
int (*remove) (struct device * dev);
int (*probe) (struct device * dev);
int (*remove) (struct device * dev);
@@
-147,7
+148,7
@@
extern void put_driver(struct device_driver * drv);
extern struct device_driver *driver_find(const char *name, struct bus_type *bus);
extern int driver_probe_done(void);
extern struct device_driver *driver_find(const char *name, struct bus_type *bus);
extern int driver_probe_done(void);
-/*
driver
fs interface for exporting driver attributes */
+/*
sys
fs interface for exporting driver attributes */
struct driver_attribute {
struct attribute attr;
struct driver_attribute {
struct attribute attr;
@@
-294,8
+295,6
@@
extern void class_device_initialize(struct class_device *);
extern int __must_check class_device_add(struct class_device *);
extern void class_device_del(struct class_device *);
extern int __must_check class_device_add(struct class_device *);
extern void class_device_del(struct class_device *);
-extern int class_device_rename(struct class_device *, char *);
-
extern struct class_device * class_device_get(struct class_device *);
extern void class_device_put(struct class_device *);
extern struct class_device * class_device_get(struct class_device *);
extern void class_device_put(struct class_device *);
@@
-355,6
+354,8
@@
extern int __must_check device_create_bin_file(struct device *dev,
struct bin_attribute *attr);
extern void device_remove_bin_file(struct device *dev,
struct bin_attribute *attr);
struct bin_attribute *attr);
extern void device_remove_bin_file(struct device *dev,
struct bin_attribute *attr);
+extern int device_schedule_callback(struct device *dev,
+ void (*func)(struct device *));
/* device resource management */
typedef void (*dr_release_t)(struct device *dev, void *res);
/* device resource management */
typedef void (*dr_release_t)(struct device *dev, void *res);