![]() | |||||||||||||
Messages in this thread Patch in this message |
Please do a bk pull bk://drm.bkbits.net/drm-linus This will include the latest DRM changes and will update the following files: drivers/char/drm/i810_drv.c | 2 +- drivers/char/drm/i830_drv.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) through these ChangeSets: <airlied@starflyer.(none)> (05/01/01 1.2090) drm: core changes broke i810/830 Reported by Joseph Fannin during -mm, revert incorrect change. Signed-off-by: Dave Airlie <airlied@linux.ie> diff -Nru a/drivers/char/drm/i810_drv.c b/drivers/char/drm/i810_drv.c --- a/drivers/char/drm/i810_drv.c 2005-01-01 23:25:09 +11:00 +++ b/drivers/char/drm/i810_drv.c 2005-01-01 23:25:09 +11:00 @@ -112,7 +112,7 @@ .open = drm_open, .release = drm_release, .ioctl = drm_ioctl, - .mmap = i810_mmap_buffers, + .mmap = drm_mmap, .poll = drm_poll, .fasync = drm_fasync, }, diff -Nru a/drivers/char/drm/i830_drv.c b/drivers/char/drm/i830_drv.c --- a/drivers/char/drm/i830_drv.c 2005-01-01 23:25:09 +11:00 +++ b/drivers/char/drm/i830_drv.c 2005-01-01 23:25:09 +11:00 @@ -121,7 +121,7 @@ .open = drm_open, .release = drm_release, .ioctl = drm_ioctl, - .mmap = i830_mmap_buffers, + .mmap = drm_mmap, .poll = drm_poll, .fasync = drm_fasync, }, - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ | ||||||||||||
| Last update: 2005-03-22 13:09 [from the cache] ©2003-2008 | |||||||||||||