diff options
| author | Ingo Molnar | 2008-06-16 11:17:19 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2008-06-16 11:17:19 +0200 |
| commit | ed9e4996d9a123b7550e63713d563f524fa9d9f0 (patch) | |
| tree | a9be05d357b407aac80118b86f25d21a5dbdfc88 /include/linux/device.h | |
| parent | sysprof: make it depend on X86 (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 (diff) | |
| download | kernel-qcow2-linux-ed9e4996d9a123b7550e63713d563f524fa9d9f0.tar.gz kernel-qcow2-linux-ed9e4996d9a123b7550e63713d563f524fa9d9f0.tar.xz kernel-qcow2-linux-ed9e4996d9a123b7550e63713d563f524fa9d9f0.zip | |
Merge branch 'linus' into tracing/sysprof
Diffstat (limited to 'include/linux/device.h')
| -rw-r--r-- | include/linux/device.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index 14616e80213c..6a2d04c011bc 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -385,6 +385,9 @@ static inline const char *dev_name(struct device *dev) return dev->bus_id; } +extern int dev_set_name(struct device *dev, const char *name, ...) + __attribute__((format(printf, 2, 3))); + #ifdef CONFIG_NUMA static inline int dev_to_node(struct device *dev) { |