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/devtmpfs.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/devtmpfs.c')
| -rw-r--r-- | drivers/base/devtmpfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c index 33e1bed68fdd..a4760e095ff5 100644 --- a/drivers/base/devtmpfs.c +++ b/drivers/base/devtmpfs.c | |||
| @@ -376,7 +376,7 @@ int devtmpfs_mount(const char *mntdir) | |||
| 376 | return err; | 376 | return err; |
| 377 | } | 377 | } |
| 378 | 378 | ||
| 379 | static __initdata DECLARE_COMPLETION(setup_done); | 379 | static DECLARE_COMPLETION(setup_done); |
| 380 | 380 | ||
| 381 | static int handle(const char *name, mode_t mode, struct device *dev) | 381 | static int handle(const char *name, mode_t mode, struct device *dev) |
| 382 | { | 382 | { |