summaryrefslogtreecommitdiffstats
path: root/drivers/char/drm/r128_irq.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-12 22:53:40 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-12 22:53:40 +0100
commit37ef4399a6bb265d3035e6d6e45f7677b132a3ba (patch)
tree31adbac36ea310a44562a335f501d69d5ce2c78c /drivers/char/drm/r128_irq.c
parentMerge master.kernel.org:/home/rmk/linux-2.6-arm (diff)
parentdrm: fix issues with systems with no MTRR (diff)
downloadlinux-37ef4399a6bb265d3035e6d6e45f7677b132a3ba.tar.xz
linux-37ef4399a6bb265d3035e6d6e45f7677b132a3ba.zip
Merge branch 'drm-forlinus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
Diffstat (limited to 'drivers/char/drm/r128_irq.c')
-rw-r--r--drivers/char/drm/r128_irq.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/drm/r128_irq.c b/drivers/char/drm/r128_irq.c
index 27eb0e31bd3b..87f8ca2b0685 100644
--- a/drivers/char/drm/r128_irq.c
+++ b/drivers/char/drm/r128_irq.c
@@ -1,5 +1,5 @@
-/* r128_irq.c -- IRQ handling for radeon -*- linux-c -*-
- *
+/* r128_irq.c -- IRQ handling for radeon -*- linux-c -*- */
+/*
* Copyright (C) The Weather Channel, Inc. 2002. All Rights Reserved.
*
* The Weather Channel (TM) funded Tungsten Graphics to develop the