diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-15 16:20:18 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-15 16:20:18 -0500 |
| commit | 56012808f4d5606e401539f663d92009d964425b (patch) | |
| tree | f3736a97725647393a2db7c95462d857115197ca /drivers/gpu/drm/Kconfig | |
| parent | a814290e17ae314bd614476cffc6119846eca27e (diff) | |
| parent | b2a731aa5cbca7e0252da75e16de7ae5feb1313a (diff) | |
Merge branch 'for-rmk' of git://git.marvell.com/orion into devel-stable
Conflicts:
arch/arm/Makefile
Diffstat (limited to 'drivers/gpu/drm/Kconfig')
| -rw-r--r-- | drivers/gpu/drm/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index 96eddd17e050..305c59003963 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig | |||
| @@ -66,6 +66,8 @@ config DRM_RADEON | |||
| 66 | 66 | ||
| 67 | If M is selected, the module will be called radeon. | 67 | If M is selected, the module will be called radeon. |
| 68 | 68 | ||
| 69 | source "drivers/gpu/drm/radeon/Kconfig" | ||
| 70 | |||
| 69 | config DRM_I810 | 71 | config DRM_I810 |
| 70 | tristate "Intel I810" | 72 | tristate "Intel I810" |
| 71 | depends on DRM && AGP && AGP_INTEL | 73 | depends on DRM && AGP && AGP_INTEL |