diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-12-22 04:56:10 +0100 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-12-22 04:56:10 +0100 |
commit | 7ccbefe07ea0a3570e44d1ec13a307552ee4dadd (patch) | |
tree | ba0299694a9f3940f289b6a29cadab853906e3d2 /include/video | |
parent | fbdev: Modify vsync timing calculation in wm8505fb (diff) | |
parent | Linux 2.6.37-rc7 (diff) | |
download | linux-7ccbefe07ea0a3570e44d1ec13a307552ee4dadd.tar.xz linux-7ccbefe07ea0a3570e44d1ec13a307552ee4dadd.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/video')
-rw-r--r-- | include/video/da8xx-fb.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/video/da8xx-fb.h b/include/video/da8xx-fb.h index 6316cdabf73f..89d43b3d4cb9 100644 --- a/include/video/da8xx-fb.h +++ b/include/video/da8xx-fb.h @@ -99,7 +99,6 @@ struct lcd_sync_arg { #define FBIPUT_COLOR _IOW('F', 6, int) #define FBIPUT_HSYNC _IOW('F', 9, int) #define FBIPUT_VSYNC _IOW('F', 10, int) -#define FBIO_WAITFORVSYNC _IOW('F', 0x20, u_int32_t) #endif /* ifndef DA8XX_FB_H */ |