diff options
author | Ingo Molnar <mingo@kernel.org> | 2014-09-08 08:11:07 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-09-08 08:11:34 +0200 |
commit | e2627dce268024aff962132057cb8acb219c9c40 (patch) | |
tree | 52711c41cf957b0fa37d08e627c6370c7aa637fa /include/linux/host1x.h | |
parent | 177ef2a6315ea7bf173653182324e1dcd08ffeaa (diff) | |
parent | 2ce7598c9a453e0acd0e07be7be3f5eb39608ebd (diff) | |
download | linux-stable-e2627dce268024aff962132057cb8acb219c9c40.tar.gz linux-stable-e2627dce268024aff962132057cb8acb219c9c40.tar.bz2 linux-stable-e2627dce268024aff962132057cb8acb219c9c40.zip |
Merge tag 'v3.17-rc4' into sched/core, to prevent conflicts with upcoming patches, and to refresh the tree
Linux 3.17-rc4
Diffstat (limited to 'include/linux/host1x.h')
-rw-r--r-- | include/linux/host1x.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/include/linux/host1x.h b/include/linux/host1x.h index d2b52999e771..bb9840fd1e18 100644 --- a/include/linux/host1x.h +++ b/include/linux/host1x.h @@ -164,12 +164,15 @@ int host1x_job_submit(struct host1x_job *job); */ struct host1x_reloc { - struct host1x_bo *cmdbuf; - u32 cmdbuf_offset; - struct host1x_bo *target; - u32 target_offset; - u32 shift; - u32 pad; + struct { + struct host1x_bo *bo; + unsigned long offset; + } cmdbuf; + struct { + struct host1x_bo *bo; + unsigned long offset; + } target; + unsigned long shift; }; struct host1x_job { |