diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-15 18:25:33 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-15 18:25:33 -0500 |
| commit | b90be8662b1d7bd84637edb8f96e904f865a2fe2 (patch) | |
| tree | 814e9fcace371347ded09bce56726ef31a55da25 /Documentation | |
| parent | c612cc211d7f3ba4c4626d55166b3103d15efd76 (diff) | |
| parent | 5b40ddf888398ce4cccbf3b9d0a18d90149ed7ff (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: (27 commits)
drm/radeon/kms: hopefully fix pll issues for real (v3)
drm/radeon/kms: add bounds checking to avivo pll algo
drm: fix wrong usages of drm_device in DRM Developer's Guide
drm/radeon/kms: fix a few more atombios endian issues
drm/radeon/kms: improve 6xx/7xx CS error output
drm/radeon/kms: check AA resolve registers on r300
drm/radeon/kms: fix tracking of BLENDCNTL, COLOR_CHANNEL_MASK, and GB_Z on r300
drm/radeon/kms: use linear aligned for evergreen/ni bo blits
drm/radeon/kms: use linear aligned for 6xx/7xx bo blits
drm/radeon: fix race between GPU reset and TTM delayed delete thread.
drm/radeon/kms: evergreen/ni big endian fixes (v2)
drm/radeon/kms: 6xx/7xx big endian fixes
drm/radeon/kms: atombios big endian fixes
drm/radeon: 6xx/7xx non-kms endian fixes
drm/radeon/kms: optimize CS state checking for r100->r500
drm: do not leak kernel addresses via /proc/dri/*/vma
drm/radeon/kms: add connector table for mac g5 9600
radeon mkregtable: Add missing fclose() calls
drm/radeon/kms: fix interlaced modes on dce4+
drm/radeon: fix memory debugging since d961db75ce86a84f1f04e91ad1014653ed7d9f46
...
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/DocBook/drm.tmpl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/DocBook/drm.tmpl b/Documentation/DocBook/drm.tmpl index 2861055afd7a..c27915893974 100644 --- a/Documentation/DocBook/drm.tmpl +++ b/Documentation/DocBook/drm.tmpl | |||
| @@ -73,8 +73,8 @@ | |||
| 73 | services. | 73 | services. |
| 74 | </para> | 74 | </para> |
| 75 | <para> | 75 | <para> |
| 76 | The core of every DRM driver is struct drm_device. Drivers | 76 | The core of every DRM driver is struct drm_driver. Drivers |
| 77 | will typically statically initialize a drm_device structure, | 77 | will typically statically initialize a drm_driver structure, |
| 78 | then pass it to drm_init() at load time. | 78 | then pass it to drm_init() at load time. |
| 79 | </para> | 79 | </para> |
| 80 | 80 | ||
| @@ -84,7 +84,7 @@ | |||
| 84 | <title>Driver initialization</title> | 84 | <title>Driver initialization</title> |
| 85 | <para> | 85 | <para> |
| 86 | Before calling the DRM initialization routines, the driver must | 86 | Before calling the DRM initialization routines, the driver must |
| 87 | first create and fill out a struct drm_device structure. | 87 | first create and fill out a struct drm_driver structure. |
| 88 | </para> | 88 | </para> |
| 89 | <programlisting> | 89 | <programlisting> |
| 90 | static struct drm_driver driver = { | 90 | static struct drm_driver driver = { |