aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-30 09:04:36 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-30 09:04:36 -0700
commitbd53d1270f51c6cfb53b06c8f93fd42327871d6b (patch)
treede4e91f8ef4702d96ee98ee62357caa4f17ea687 /include
parent12829dcb10efc576c3739131a5d57fe7213632d9 (diff)
parentbf164c790deb79b18faf304b0763e44a02c79f90 (diff)
downloadkernel_samsung_aries-bd53d1270f51c6cfb53b06c8f93fd42327871d6b.zip
kernel_samsung_aries-bd53d1270f51c6cfb53b06c8f93fd42327871d6b.tar.gz
kernel_samsung_aries-bd53d1270f51c6cfb53b06c8f93fd42327871d6b.tar.bz2
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
Diffstat (limited to 'include')
-rw-r--r--include/linux/device.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/include/linux/device.h b/include/linux/device.h
index 7b781a7..f378c84 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -69,7 +69,7 @@ struct bus_type {
extern int bus_register(struct bus_type * bus);
extern void bus_unregister(struct bus_type * bus);
-extern int bus_rescan_devices(struct bus_type * bus);
+extern void bus_rescan_devices(struct bus_type * bus);
extern struct bus_type * get_bus(struct bus_type * bus);
extern void put_bus(struct bus_type * bus);
@@ -80,6 +80,8 @@ extern struct bus_type * find_bus(char * name);
int bus_for_each_dev(struct bus_type * bus, struct device * start, void * data,
int (*fn)(struct device *, void *));
+struct device * bus_find_device(struct bus_type *bus, struct device *start,
+ void *data, int (*match)(struct device *, void *));
int bus_for_each_drv(struct bus_type * bus, struct device_driver * start,
void * data, int (*fn)(struct device_driver *, void *));
@@ -142,6 +144,9 @@ extern void driver_remove_file(struct device_driver *, struct driver_attribute *
extern int driver_for_each_device(struct device_driver * drv, struct device * start,
void * data, int (*fn)(struct device *, void *));
+struct device * driver_find_device(struct device_driver *drv,
+ struct device *start, void *data,
+ int (*match)(struct device *, void *));
/*