diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-11-23 03:04:05 -0500 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-11-23 03:04:05 -0500 |
| commit | 92907cbbef8625bb3998d1eb385fc88f23c97a3f (patch) | |
| tree | 15626ff9287e37c3cb81c7286d6db5a7fd77c854 /include/linux/pageblock-flags.h | |
| parent | 15fbfccfe92c62ae8d1ecc647c44157ed01ac02e (diff) | |
| parent | 1ec218373b8ebda821aec00bb156a9c94fad9cd4 (diff) | |
Merge tag 'v4.4-rc2' into drm-intel-next-queued
Linux 4.4-rc2
Backmerge to get at
commit 1b0e3a049efe471c399674fd954500ce97438d30
Author: Imre Deak <imre.deak@intel.com>
Date: Thu Nov 5 23:04:11 2015 +0200
drm/i915/skl: disable display side power well support for now
so that we can proplery re-eanble skl power wells in -next.
Conflicts are just adjacent lines changed, except for intel_fbdev.c
where we need to interleave the changs. Nothing nefarious.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'include/linux/pageblock-flags.h')
| -rw-r--r-- | include/linux/pageblock-flags.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/pageblock-flags.h b/include/linux/pageblock-flags.h index 2baeee12f48e..e942558b3585 100644 --- a/include/linux/pageblock-flags.h +++ b/include/linux/pageblock-flags.h | |||
| @@ -44,7 +44,7 @@ enum pageblock_bits { | |||
| 44 | #ifdef CONFIG_HUGETLB_PAGE_SIZE_VARIABLE | 44 | #ifdef CONFIG_HUGETLB_PAGE_SIZE_VARIABLE |
| 45 | 45 | ||
| 46 | /* Huge page sizes are variable */ | 46 | /* Huge page sizes are variable */ |
| 47 | extern int pageblock_order; | 47 | extern unsigned int pageblock_order; |
| 48 | 48 | ||
| 49 | #else /* CONFIG_HUGETLB_PAGE_SIZE_VARIABLE */ | 49 | #else /* CONFIG_HUGETLB_PAGE_SIZE_VARIABLE */ |
| 50 | 50 | ||