diff options
| author | Igor Mammedov <niallain@gmail.com> | 2008-04-28 19:08:21 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-04-28 19:08:21 -0400 |
| commit | e9f20d6f03e8df393b001dab6dc5226c2a5daf57 (patch) | |
| tree | 73e94fa5e4f83576c97e36187b809c5aad2ade30 /drivers/video/matrox/matroxfb_crtc2.c | |
| parent | bf62fd887cab230f5952b611bde25e8e15acb454 (diff) | |
| parent | e31a94ed371c70855eb30b77c490d6d85dd4da26 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/video/matrox/matroxfb_crtc2.c')
| -rw-r--r-- | drivers/video/matrox/matroxfb_crtc2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/matrox/matroxfb_crtc2.c b/drivers/video/matrox/matroxfb_crtc2.c index a6ab5b6a58d0..7ac4c5f6145d 100644 --- a/drivers/video/matrox/matroxfb_crtc2.c +++ b/drivers/video/matrox/matroxfb_crtc2.c | |||
| @@ -420,7 +420,7 @@ static int matroxfb_dh_ioctl(struct fb_info *info, | |||
| 420 | #define m2info (container_of(info, struct matroxfb_dh_fb_info, fbcon)) | 420 | #define m2info (container_of(info, struct matroxfb_dh_fb_info, fbcon)) |
| 421 | MINFO_FROM(m2info->primary_dev); | 421 | MINFO_FROM(m2info->primary_dev); |
| 422 | 422 | ||
| 423 | DBG(__FUNCTION__) | 423 | DBG(__func__) |
| 424 | 424 | ||
| 425 | switch (cmd) { | 425 | switch (cmd) { |
| 426 | case FBIOGET_VBLANK: | 426 | case FBIOGET_VBLANK: |