diff options
| author | James Simmons <jsimmons@maxwell.earthlink.net> | 2003-03-04 17:23:02 -0800 |
|---|---|---|
| committer | James Simmons <jsimmons@maxwell.earthlink.net> | 2003-03-04 17:23:02 -0800 |
| commit | 08c8d74317da1dcf38995964114a492b5fed29dc (patch) | |
| tree | 49680af15fff749e4676cb2bf77f4d80ee5530d6 /include/linux/fb.h | |
| parent | fdd82b90462618249c39e1b2b8f9e967339208fb (diff) | |
[FBDEV] Updates for the SIS fbdev driver to the new api. Removed poll. We wil use signals in the future instead.
Diffstat (limited to 'include/linux/fb.h')
| -rw-r--r-- | include/linux/fb.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/fb.h b/include/linux/fb.h index f6d5c02c493f..0e0fbfb1922f 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -98,6 +98,8 @@ #define FB_ACCEL_3DLABS_PERMEDIA3 37 /* 3Dlabs Permedia 3 */ #define FB_ACCEL_ATI_RADEON 38 /* ATI Radeon family */ #define FB_ACCEL_I810 39 /* Intel 810/815 */ +#define FB_ACCEL_SIS_GLAMOUR_2 40 /* SiS 315, 650, 740 */ +#define FB_ACCEL_SIS_XABRE 41 /* SiS 330 ("Xabre") */ #define FB_ACCEL_NEOMAGIC_NM2070 90 /* NeoMagic NM2070 */ #define FB_ACCEL_NEOMAGIC_NM2090 91 /* NeoMagic NM2090 */ @@ -345,7 +347,6 @@ struct fb_pixmap { #ifdef __KERNEL__ #include <linux/fs.h> -#include <linux/poll.h> #include <linux/init.h> #include <linux/devfs_fs_kernel.h> @@ -386,8 +387,6 @@ struct fb_ops { int (*fb_cursor)(struct fb_info *info, struct fb_cursor *cursor); /* Rotates the display */ void (*fb_rotate)(struct fb_info *info, int angle); - /* perform polling on fb device */ - int (*fb_poll)(struct fb_info *info, poll_table *wait); /* wait for blit idle, optional */ int (*fb_sync)(struct fb_info *info); /* perform fb specific ioctl (optional) */ |