diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 13:50:59 (GMT) |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 14:01:23 (GMT) |
| commit | 835f9c38bbb4498c3d43b7466964bdadbb1fd244 (patch) | |
| tree | ade5aec66bc7ddb97048c4f141932de0f93369b9 /include/linux/res_counter.h | |
| parent | f5f29151588744ea2e283971cb0ad403ee04e3e2 (diff) | |
| parent | a937536b868b8369b98967929045f1df54234323 (diff) | |
| download | linux-fsl-qoriq-835f9c38bbb4498c3d43b7466964bdadbb1fd244.tar.xz | |
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 'include/linux/res_counter.h')
| -rw-r--r-- | include/linux/res_counter.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/res_counter.h b/include/linux/res_counter.h index 5ae8456..c230994 100644 --- a/include/linux/res_counter.h +++ b/include/linux/res_counter.h @@ -14,6 +14,7 @@ */ #include <linux/cgroup.h> +#include <linux/errno.h> /* * The core object. the cgroup that wishes to account for some |