summaryrefslogtreecommitdiff
path: root/include/linux/device.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.osdl.org>2006-12-21 11:02:03 +0300
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-21 11:02:03 +0300
commit28cb5ccd306e6cffd4498ba350bc7c82f5fbee44 (patch)
treedc64b074f3fcd51430f5161d6074fc3a6e85dc09 /include/linux/device.h
parentde9b2fccb6a1efdf1665ebbcb28cad61467b308a (diff)
parent1f21782e63da81f56401a813a52091ef2703838f (diff)
downloadlinux-28cb5ccd306e6cffd4498ba350bc7c82f5fbee44.tar.xz
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6: Driver core: proper prototype for drivers/base/init.c:driver_init() kobject: kobject_uevent() returns manageable value kref refcnt and false positives
Diffstat (limited to 'include/linux/device.h')
-rw-r--r--include/linux/device.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/device.h b/include/linux/device.h
index 49ab53ce92dc..f44247fe8135 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -433,6 +433,8 @@ static inline int device_is_registered(struct device *dev)
return dev->is_registered;
}
+void driver_init(void);
+
/*
* High level routines for use by the bus drivers
*/