diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-09-14 19:02:28 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-09-14 19:02:28 -0400 |
| commit | 1db3706b05b11abcf2673ffbed5ad43b4c90ed11 (patch) | |
| tree | 09fa867d9d9db6ed475eaa889da143603441e1a6 /drivers/base/platform.c | |
| parent | ad30a2bbdc20cf0111156e2aa6d2cc3e3c0d1893 (diff) | |
| parent | 63d15148b6058ab0037343390e8918503ed81968 (diff) | |
Merge branch 'zImage_DTB_append' of git://git.linaro.org/people/nico/linux into devel-stable
Diffstat (limited to 'drivers/base/platform.c')
| -rw-r--r-- | drivers/base/platform.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/platform.c b/drivers/base/platform.c index 0cad9c7f6bb5..99a5272d7c2f 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c | |||
| @@ -33,7 +33,7 @@ EXPORT_SYMBOL_GPL(platform_bus); | |||
| 33 | 33 | ||
| 34 | /** | 34 | /** |
| 35 | * arch_setup_pdev_archdata - Allow manipulation of archdata before its used | 35 | * arch_setup_pdev_archdata - Allow manipulation of archdata before its used |
| 36 | * @dev: platform device | 36 | * @pdev: platform device |
| 37 | * | 37 | * |
| 38 | * This is called before platform_device_add() such that any pdev_archdata may | 38 | * This is called before platform_device_add() such that any pdev_archdata may |
| 39 | * be setup before the platform_notifier is called. So if a user needs to | 39 | * be setup before the platform_notifier is called. So if a user needs to |