diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-09 11:52:28 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-09 11:52:28 -0500 |
| commit | ff7473300d429118aa97368ba5a16bc63aecfc75 (patch) | |
| tree | 42c2b4714e048a0613468ced95e20c8081ee7797 /drivers/video | |
| parent | d7c41b616518457e3bfece12e3f59f15d7450eeb (diff) | |
| parent | d2f59357700487a8b944f4f7777d1e97cf5ea2ed (diff) | |
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm/i915: select framebuffer support automatically
drm/i915: add get_vblank_counter function for GM45
drm/i915: capture last_vblank count at IRQ uninstall time too
drm/i915: Unlock mutex on i915_gem_fault() error path
drm/i915: Quiet the message on get/setparam ioctl with an unknown value.
drm/i915: skip LVDS initialization on Apple Mac Mini
drm/i915: sync SDVO code with stable userland modesetting driver
drm/i915: Unref the object after failing to set tiling mode.
drm/i915: add fence register management to execbuf
drm/i915: Return error from i915_gem_object_get_fence_reg() when failing.
drm/i915: Set up an MTRR covering the GTT at driver load.
drm/i915: Skip SDVO/HDMI init when the chipset tells us it's not present.
drm/i915: Suppress GEM teardown on X Server exit in KMS mode.
drm/radeon: fix ioremap conflict with AGP mappings
i915: fix unneeded locking in i915 LVDS get modes code.
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/Kconfig | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index f0267706cb45..bf0af660df8a 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig | |||
| @@ -1054,9 +1054,10 @@ config FB_RIVA_BACKLIGHT | |||
| 1054 | 1054 | ||
| 1055 | config FB_I810 | 1055 | config FB_I810 |
| 1056 | tristate "Intel 810/815 support (EXPERIMENTAL)" | 1056 | tristate "Intel 810/815 support (EXPERIMENTAL)" |
| 1057 | depends on FB && EXPERIMENTAL && PCI && X86_32 | 1057 | depends on EXPERIMENTAL && PCI && X86_32 |
| 1058 | select AGP | 1058 | select AGP |
| 1059 | select AGP_INTEL | 1059 | select AGP_INTEL |
| 1060 | select FB | ||
| 1060 | select FB_MODE_HELPERS | 1061 | select FB_MODE_HELPERS |
| 1061 | select FB_CFB_FILLRECT | 1062 | select FB_CFB_FILLRECT |
| 1062 | select FB_CFB_COPYAREA | 1063 | select FB_CFB_COPYAREA |
| @@ -1119,7 +1120,8 @@ config FB_CARILLO_RANCH | |||
| 1119 | 1120 | ||
| 1120 | config FB_INTEL | 1121 | config FB_INTEL |
| 1121 | tristate "Intel 830M/845G/852GM/855GM/865G/915G/945G/945GM/965G/965GM support (EXPERIMENTAL)" | 1122 | tristate "Intel 830M/845G/852GM/855GM/865G/915G/945G/945GM/965G/965GM support (EXPERIMENTAL)" |
| 1122 | depends on FB && EXPERIMENTAL && PCI && X86 | 1123 | depends on EXPERIMENTAL && PCI && X86 |
| 1124 | select FB | ||
| 1123 | select AGP | 1125 | select AGP |
| 1124 | select AGP_INTEL | 1126 | select AGP_INTEL |
| 1125 | select FB_MODE_HELPERS | 1127 | select FB_MODE_HELPERS |