diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 21:44:12 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 21:44:12 -0500 |
| commit | db9edfd7e339ca4113153d887e782dd05be5a9eb (patch) | |
| tree | 0a4ba12447a0cabc800adc7e9667d284777b0181 /include/linux/platform_device.h | |
| parent | 631b034724364b413e8a52e7c2e03a9d77e4c2b4 (diff) | |
| parent | fd586bacf439f36dea9b9bf6e6133ac87df2730c (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
Trivial manual merge fixup for usb_find_interface clashes.
Diffstat (limited to 'include/linux/platform_device.h')
| -rw-r--r-- | include/linux/platform_device.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h index 17e336f40b47..782090c68932 100644 --- a/include/linux/platform_device.h +++ b/include/linux/platform_device.h | |||
| @@ -41,6 +41,7 @@ extern struct platform_device *platform_device_alloc(const char *name, unsigned | |||
| 41 | extern int platform_device_add_resources(struct platform_device *pdev, struct resource *res, unsigned int num); | 41 | extern int platform_device_add_resources(struct platform_device *pdev, struct resource *res, unsigned int num); |
| 42 | extern int platform_device_add_data(struct platform_device *pdev, void *data, size_t size); | 42 | extern int platform_device_add_data(struct platform_device *pdev, void *data, size_t size); |
| 43 | extern int platform_device_add(struct platform_device *pdev); | 43 | extern int platform_device_add(struct platform_device *pdev); |
| 44 | extern void platform_device_del(struct platform_device *pdev); | ||
| 44 | extern void platform_device_put(struct platform_device *pdev); | 45 | extern void platform_device_put(struct platform_device *pdev); |
| 45 | 46 | ||
| 46 | struct platform_driver { | 47 | struct platform_driver { |