diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-07-07 18:37:35 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-07-07 18:37:35 +1000 |
| commit | db8cc27b804f89e8fd5f9d5385161956a777c471 (patch) | |
| tree | 4d84e12dbf9b4bd75fa6150f4aedf54a41d722db /drivers/gpu/drm/Kconfig | |
| parent | 6dbe7465713f0e45f0e867105ca944978d57346e (diff) | |
| parent | 05269a3a5a78bb074413de495105d7a2686c4529 (diff) | |
| download | op-kernel-dev-db8cc27b804f89e8fd5f9d5385161956a777c471.zip op-kernel-dev-db8cc27b804f89e8fd5f9d5385161956a777c471.tar.gz | |
Merge branch 'drm-platform' into drm-testing
* drm-platform:
drm: Make sure the DRM offset matches the CPU
drm: Add __arm defines to DRM
drm: Add support for platform devices to register as DRM devices
drm: Remove drm_resource wrappers
Diffstat (limited to 'drivers/gpu/drm/Kconfig')
| -rw-r--r-- | drivers/gpu/drm/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index 88910e5..520ab23 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -6,7 +6,7 @@ # menuconfig DRM tristate "Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)" - depends on (AGP || AGP=n) && PCI && !EMULATED_CMPXCHG && MMU + depends on (AGP || AGP=n) && !EMULATED_CMPXCHG && MMU select I2C select I2C_ALGOBIT select SLOW_WORK @@ -17,7 +17,7 @@ menuconfig DRM These modules provide support for synchronization, security, and DMA transfers. Please see <http://dri.sourceforge.net/> for more details. You should also select and configure AGP - (/dev/agpgart) support. + (/dev/agpgart) support if it is available for your platform. config DRM_KMS_HELPER tristate |
