diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2014-02-07 14:27:30 -0500 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2014-02-07 14:27:30 -0500 |
| commit | a3b072cd180c12e8fe0ece9487b9065808327640 (patch) | |
| tree | 62b982041be84748852d77cdf6ca5639ef40858f /include/linux/platform_data/video-msm_fb.h | |
| parent | 75a1ba5b2c529db60ca49626bcaf0bddf4548438 (diff) | |
| parent | 081cd62a010f97b5bc1d2b0cd123c5abc692b68a (diff) | |
Merge tag 'efi-urgent' into x86/urgent
* Avoid WARN_ON() when mapping BGRT on Baytrail (EFI 32-bit).
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'include/linux/platform_data/video-msm_fb.h')
| -rw-r--r-- | include/linux/platform_data/video-msm_fb.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/platform_data/video-msm_fb.h b/include/linux/platform_data/video-msm_fb.h index 1f4fc81b3d8f..31449be3eadb 100644 --- a/include/linux/platform_data/video-msm_fb.h +++ b/include/linux/platform_data/video-msm_fb.h | |||
| @@ -1,5 +1,4 @@ | |||
| 1 | /* arch/arm/mach-msm/include/mach/msm_fb.h | 1 | /* |
| 2 | * | ||
| 3 | * Internal shared definitions for various MSM framebuffer parts. | 2 | * Internal shared definitions for various MSM framebuffer parts. |
| 4 | * | 3 | * |
| 5 | * Copyright (C) 2007 Google Incorporated | 4 | * Copyright (C) 2007 Google Incorporated |