diff options
| author | Tejun Heo <tj@kernel.org> | 2012-11-06 15:26:23 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2012-11-06 15:26:23 -0500 |
| commit | 5b805f2a7675634fbdf9ac1c9b2256905ab2ea68 (patch) | |
| tree | ee00d1e3d757458d66209b926d274491c6c3f61c /arch/tile/include/uapi | |
| parent | 1db1e31b1ee3ae126ef98f39083b5f213c7b41bf (diff) | |
| parent | 201e72acb2d3821e2de9ce6091e98859c316b29a (diff) | |
Merge branch 'cgroup/for-3.7-fixes' into cgroup/for-3.8
This is to receive device_cgroup fixes so that further device_cgroup
changes can be made in cgroup/for-3.8.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'arch/tile/include/uapi')
| -rw-r--r-- | arch/tile/include/uapi/asm/Kbuild | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/tile/include/uapi/asm/Kbuild b/arch/tile/include/uapi/asm/Kbuild index 5c6915fd30b5..c20db8e428bf 100644 --- a/arch/tile/include/uapi/asm/Kbuild +++ b/arch/tile/include/uapi/asm/Kbuild | |||
| @@ -15,4 +15,7 @@ header-y += siginfo.h | |||
| 15 | header-y += signal.h | 15 | header-y += signal.h |
| 16 | header-y += stat.h | 16 | header-y += stat.h |
| 17 | header-y += swab.h | 17 | header-y += swab.h |
| 18 | header-y += ucontext.h | ||
| 18 | header-y += unistd.h | 19 | header-y += unistd.h |
| 20 | |||
| 21 | generic-y += ucontext.h | ||