diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-09 12:09:04 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-09 12:09:04 -0400 |
| commit | fd98a5d78062289552fff19afb9aa6918eaee63f (patch) | |
| tree | 7c27dbb0c531b99609c1b0c86145397e6b47231c /include | |
| parent | 7f4238a0ef8858e1f9b02a874b5818f6e9846673 (diff) | |
| parent | 4f87af46107499415afd238be104587b5a9d7ac3 (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/radeon/kms: add pci id to acer travelmate quirk for 5730
drm/radeon: fix order of doing things in radeon_crtc_cursor_set
drm: mm: fix debug output
drm/radeon/kms: ATPX switcheroo fixes
drm/nouveau: Fix a crash at card takedown for NV40 and older cards
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/drm_mm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/drm/drm_mm.h b/include/drm/drm_mm.h index c2f93a8ae2e1..564b14aa7e16 100644 --- a/include/drm/drm_mm.h +++ b/include/drm/drm_mm.h | |||
| @@ -86,7 +86,7 @@ static inline bool drm_mm_initialized(struct drm_mm *mm) | |||
| 86 | } | 86 | } |
| 87 | #define drm_mm_for_each_node(entry, mm) list_for_each_entry(entry, \ | 87 | #define drm_mm_for_each_node(entry, mm) list_for_each_entry(entry, \ |
| 88 | &(mm)->head_node.node_list, \ | 88 | &(mm)->head_node.node_list, \ |
| 89 | node_list); | 89 | node_list) |
| 90 | #define drm_mm_for_each_scanned_node_reverse(entry, n, mm) \ | 90 | #define drm_mm_for_each_scanned_node_reverse(entry, n, mm) \ |
| 91 | for (entry = (mm)->prev_scanned_node, \ | 91 | for (entry = (mm)->prev_scanned_node, \ |
| 92 | next = entry ? list_entry(entry->node_list.next, \ | 92 | next = entry ? list_entry(entry->node_list.next, \ |