summaryrefslogtreecommitdiff
path: root/drivers/char/drm/i915_mem.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@starflyer.(none)>2006-01-02 20:14:23 +1100
committerDave Airlie <airlied@linux.ie>2006-01-02 20:14:23 +1100
commit0d6aa60b4ac9689b750e35cd66f5d7c053aff0f4 (patch)
treedfc0d9ddfb139df8612e1823f9af89a6ff000a31 /drivers/char/drm/i915_mem.c
parentf0c408b564ddefa0959ada4e2c2248f4a57f1842 (diff)
drm: update to i915 1.3.0
Add support for vblank ioctls to i915 driver From: Dave Airlie <airlied@linux.ie> Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm/i915_mem.c')
-rw-r--r--drivers/char/drm/i915_mem.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/char/drm/i915_mem.c b/drivers/char/drm/i915_mem.c
index 13176d136a99..ba87ff17ff64 100644
--- a/drivers/char/drm/i915_mem.c
+++ b/drivers/char/drm/i915_mem.c
@@ -1,7 +1,6 @@
/* i915_mem.c -- Simple agp/fb memory manager for i915 -*- linux-c -*-
*/
-/**************************************************************************
- *
+/*
* Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
* All Rights Reserved.
*
@@ -25,7 +24,7 @@
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
- **************************************************************************/
+ */
#include "drmP.h"
#include "drm.h"