diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-01 00:24:54 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-01 00:24:54 -0400 |
| commit | bc95f3669f5e6f63cf0b84fe4922c3c6dd4aa775 (patch) | |
| tree | 427fcf2a7287c16d4b5aa6cbf494d59579a6a8b1 /include/asm-powerpc/of_device.h | |
| parent | 3d29cdff999c37b3876082278a8134a0642a02cd (diff) | |
| parent | dc87c3985e9b442c60994308a96f887579addc39 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/usb/input/Makefile
drivers/usb/input/gtco.c
Diffstat (limited to 'include/asm-powerpc/of_device.h')
| -rw-r--r-- | include/asm-powerpc/of_device.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-powerpc/of_device.h b/include/asm-powerpc/of_device.h index a889b2005bf5..4f1aabe0ce73 100644 --- a/include/asm-powerpc/of_device.h +++ b/include/asm-powerpc/of_device.h | |||
| @@ -32,5 +32,8 @@ extern int of_device_register(struct of_device *ofdev); | |||
| 32 | extern void of_device_unregister(struct of_device *ofdev); | 32 | extern void of_device_unregister(struct of_device *ofdev); |
| 33 | extern void of_release_dev(struct device *dev); | 33 | extern void of_release_dev(struct device *dev); |
| 34 | 34 | ||
| 35 | extern int of_device_uevent(struct device *dev, | ||
| 36 | char **envp, int num_envp, char *buffer, int buffer_size); | ||
| 37 | |||
| 35 | #endif /* __KERNEL__ */ | 38 | #endif /* __KERNEL__ */ |
| 36 | #endif /* _ASM_POWERPC_OF_DEVICE_H */ | 39 | #endif /* _ASM_POWERPC_OF_DEVICE_H */ |