From: Dave Airlie <airlied@linux.ie>
To: torvalds@osdl.org, Andrew Morton <akpm@osdl.org>
Cc: linux-kernel@vger.kernel.org
Subject: [bk tree] drm minor fix for i810/i830
Date: Sat, 1 Jan 2005 12:26:48 +0000 (GMT) [thread overview]
Message-ID: <Pine.LNX.4.58.0501011226090.31145@skynet> (raw)
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,
},
reply other threads:[~2005-01-01 12:26 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Pine.LNX.4.58.0501011226090.31145@skynet \
--to=airlied@linux.ie \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@osdl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®