diff options
author | James Morris <james.l.morris@oracle.com> | 2014-04-14 05:23:14 +0400 |
---|---|---|
committer | James Morris <james.l.morris@oracle.com> | 2014-04-14 05:23:14 +0400 |
commit | ecd740c6f2f092b90b95fa35f757973589eaaca2 (patch) | |
tree | ce02b1e18c4fc5729699251460cd8be7604d8401 /include/linux/platform_data/vsp1.h | |
parent | f64410ec665479d7b4b77b7519e814253ed0f686 (diff) | |
parent | 455c6fdbd219161bd09b1165f11699d6d73de11c (diff) | |
download | linux-ecd740c6f2f092b90b95fa35f757973589eaaca2.tar.xz |
Merge commit 'v3.14' into next
Diffstat (limited to 'include/linux/platform_data/vsp1.h')
-rw-r--r-- | include/linux/platform_data/vsp1.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/platform_data/vsp1.h b/include/linux/platform_data/vsp1.h index a73a456d7f11..63170e2614b3 100644 --- a/include/linux/platform_data/vsp1.h +++ b/include/linux/platform_data/vsp1.h @@ -14,6 +14,8 @@ #define __PLATFORM_VSP1_H__ #define VSP1_HAS_LIF (1 << 0) +#define VSP1_HAS_LUT (1 << 1) +#define VSP1_HAS_SRU (1 << 2) struct vsp1_platform_data { unsigned int features; |