diff options
author | Xiong Zhou <jencce.kernel@gmail.com> | 2013-04-10 08:37:52 -0400 |
---|---|---|
committer | Patrik Jakobsson <patrik.r.jakobsson@gmail.com> | 2013-04-10 11:34:43 -0400 |
commit | 0c1a14c2c17f13c1869e82783bd49774bba67254 (patch) | |
tree | 85046e5496083ad8cd3bd65f452aab63fe9690e4 | |
parent | 749387dc8d8270b279f27a0a794cdf4f4a4aa774 (diff) |
gma500:fix build failure for 3.9-rc5
Last version of this patch is not clear enough and X86 duplicated.
This patch fixes build failure of v3.9-rc5 and rc6.
When config ACPI_VIDEO as m, DRM_GMA500 as y, here comes the failure.
GMA5/600 needs acpi_video just like nouveau.
And some tab type fix by the way.
Failure message:
drivers/built-in.o: In function `psb_driver_load':
kernel-3.9-rc5/drivers/gpu/drm/gma500/psb_drv.c:340: \
undefined reference to `acpi_video_register'
make: *** [vmlinux] Error 1
Signed-off-by: Xiong Zhou <jencce.kernel@gmail.com>
Signed-off-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
-rw-r--r-- | drivers/gpu/drm/gma500/Kconfig | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/drivers/gpu/drm/gma500/Kconfig b/drivers/gpu/drm/gma500/Kconfig index 42e665c7e90a..92760ffad2e8 100644 --- a/drivers/gpu/drm/gma500/Kconfig +++ b/drivers/gpu/drm/gma500/Kconfig | |||
@@ -2,10 +2,15 @@ config DRM_GMA500 | |||
2 | tristate "Intel GMA5/600 KMS Framebuffer" | 2 | tristate "Intel GMA5/600 KMS Framebuffer" |
3 | depends on DRM && PCI && X86 && EXPERIMENTAL | 3 | depends on DRM && PCI && X86 && EXPERIMENTAL |
4 | select FB_CFB_COPYAREA | 4 | select FB_CFB_COPYAREA |
5 | select FB_CFB_FILLRECT | 5 | select FB_CFB_FILLRECT |
6 | select FB_CFB_IMAGEBLIT | 6 | select FB_CFB_IMAGEBLIT |
7 | select DRM_KMS_HELPER | 7 | select DRM_KMS_HELPER |
8 | select DRM_TTM | 8 | select DRM_TTM |
9 | # GMA500 depends on ACPI_VIDEO when ACPI is enabled, just like i915 | ||
10 | select ACPI_VIDEO if ACPI | ||
11 | select BACKLIGHT_CLASS_DEVICE if ACPI | ||
12 | select VIDEO_OUTPUT_CONTROL if ACPI | ||
13 | select INPUT if ACPI | ||
9 | help | 14 | help |
10 | Say yes for an experimental 2D KMS framebuffer driver for the | 15 | Say yes for an experimental 2D KMS framebuffer driver for the |
11 | Intel GMA500 ('Poulsbo') and other Intel IMG based graphics | 16 | Intel GMA500 ('Poulsbo') and other Intel IMG based graphics |