diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-05-17 12:15:49 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-05-17 12:15:49 +0200 |
| commit | 9a652cc01e589e10e2aa341074ea240c9838102b (patch) | |
| tree | 48ec31db7a09a0e6b7cca66ea08b20cc78f218cb /arch/powerpc/include/uapi/asm/cputable.h | |
| parent | drm/i915: don't mix bitwise and logical operations for has_snoop (diff) | |
| parent | Merge tag 'topic/drm-misc-2016-05-13' of git://anongit.freedesktop.org/drm-in... (diff) | |
| download | linux-9a652cc01e589e10e2aa341074ea240c9838102b.tar.xz linux-9a652cc01e589e10e2aa341074ea240c9838102b.zip | |
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued
Backmerge request by Jani to get at
commit 249c4f538b1aae55d41699f8bafc6cb762a7f48f
Author: Deepak M <m.deepak@intel.com>
Date: Wed Mar 30 17:03:39 2016 +0300
drm: Add new DCS commands in the enum list
Some simple conflicts in intel_dp.c.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'arch/powerpc/include/uapi/asm/cputable.h')
| -rw-r--r-- | arch/powerpc/include/uapi/asm/cputable.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/include/uapi/asm/cputable.h b/arch/powerpc/include/uapi/asm/cputable.h index 8dde19962a5b..f63c96cd3608 100644 --- a/arch/powerpc/include/uapi/asm/cputable.h +++ b/arch/powerpc/include/uapi/asm/cputable.h @@ -31,6 +31,7 @@ #define PPC_FEATURE_PSERIES_PERFMON_COMPAT \ 0x00000040 +/* Reserved - do not use 0x00000004 */ #define PPC_FEATURE_TRUE_LE 0x00000002 #define PPC_FEATURE_PPC_LE 0x00000001 |