Fixup 2.6.11.3 merge by hand.

8c736c01 · Greg Kroah-Hartman · 9de0077f · 8c736c01 · 8c736c01
Commit 8c736c01 authored Mar 13, 2005 by Greg Kroah-Hartman
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

Makefile Makefile +1 -1

drivers/char/drm/drm_ioctl.c drivers/char/drm/drm_ioctl.c +0 -2

No files found.
--- a/Makefile
+++ b/Makefile
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 11
-EXTRAVERSION = .3
+EXTRAVERSION =
 NAME=Woozy Numbat

 # *DOCUMENTATION*

--- a/drivers/char/drm/drm_ioctl.c
+++ b/drivers/char/drm/drm_ioctl.c
@@ -328,8 +328,6 @@ int drm_setversion(DRM_IOCTL_ARGS)

 	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;