diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 09:50:59 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 10:01:23 -0400 |
| commit | 835f9c38bbb4498c3d43b7466964bdadbb1fd244 (patch) | |
| tree | ade5aec66bc7ddb97048c4f141932de0f93369b9 /arch/um/os-Linux/start_up.c | |
| parent | f5f29151588744ea2e283971cb0ad403ee04e3e2 (diff) | |
| parent | a937536b868b8369b98967929045f1df54234323 (diff) | |
Merge tag 'v3.9-rc3' into next/multiplatform
Linux 3.9-rc3
Conflicts:
arch/arm/Kconfig
arch/arm/mach-spear/spear3xx.c
arch/arm/plat-spear/Kconfig
This is a dependency for ux500/multiplatform
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/um/os-Linux/start_up.c')
| -rw-r--r-- | arch/um/os-Linux/start_up.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/um/os-Linux/start_up.c b/arch/um/os-Linux/start_up.c index da4b9e9999fd..337518c5042a 100644 --- a/arch/um/os-Linux/start_up.c +++ b/arch/um/os-Linux/start_up.c | |||
| @@ -15,6 +15,8 @@ | |||
| 15 | #include <sys/mman.h> | 15 | #include <sys/mman.h> |
| 16 | #include <sys/stat.h> | 16 | #include <sys/stat.h> |
| 17 | #include <sys/wait.h> | 17 | #include <sys/wait.h> |
| 18 | #include <sys/time.h> | ||
| 19 | #include <sys/resource.h> | ||
| 18 | #include <asm/unistd.h> | 20 | #include <asm/unistd.h> |
| 19 | #include <init.h> | 21 | #include <init.h> |
| 20 | #include <os.h> | 22 | #include <os.h> |