diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /include/drm/drm_mode.h | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'include/drm/drm_mode.h')
| -rw-r--r-- | include/drm/drm_mode.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h index ae6b7a3dbec..c4961ea50a4 100644 --- a/include/drm/drm_mode.h +++ b/include/drm/drm_mode.h | |||
| @@ -277,7 +277,7 @@ struct drm_mode_mode_cmd { | |||
| 277 | #define DRM_MODE_CURSOR_MOVE (1<<1) | 277 | #define DRM_MODE_CURSOR_MOVE (1<<1) |
| 278 | 278 | ||
| 279 | /* | 279 | /* |
| 280 | * depending on the value in flags diffrent members are used. | 280 | * depending on the value in flags different members are used. |
| 281 | * | 281 | * |
| 282 | * CURSOR_BO uses | 282 | * CURSOR_BO uses |
| 283 | * crtc | 283 | * crtc |