ChangeSet 1.2183, 2005/03/14 10:09:43-08:00, [EMAIL PROTECTED]
Fixup 2.6.11.3 merge by hand.
Makefile | 2 +-
drivers/char/drm/drm_ioctl.c | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff -Nru a/Makefile b/Makefile
--- a/Makefile 2005-03-14 23:10:22 -08:00
+++ b/Makefile 2005-03-14 23:10:22 -08:00
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 11
-EXTRAVERSION = .3
+EXTRAVERSION =
NAME=Woozy Numbat
# *DOCUMENTATION*
diff -Nru a/drivers/char/drm/drm_ioctl.c b/drivers/char/drm/drm_ioctl.c
--- a/drivers/char/drm/drm_ioctl.c 2005-03-14 23:10:22 -08:00
+++ b/drivers/char/drm/drm_ioctl.c 2005-03-14 23:10:22 -08:00
@@ -328,8 +328,6 @@
memset(&version, 0, sizeof(version));
- memset(&version, 0, sizeof(version));
-
dev->driver->version(&version);
retv.drm_di_major = DRM_IF_MAJOR;
retv.drm_di_minor = DRM_IF_MINOR;
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
