diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-12 13:53:40 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-12 13:53:40 -0800 |
| commit | 37ef4399a6bb265d3035e6d6e45f7677b132a3ba (patch) | |
| tree | 31adbac36ea310a44562a335f501d69d5ce2c78c /drivers/char/drm/i915_mem.c | |
| parent | bf785ee0aeea7a3e717cb1e11df4135b6cbde7da (diff) | |
| parent | 9c7d462eda13ca211b7b4a62f191f4cfda135e2d (diff) | |
Merge branch 'drm-forlinus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
Diffstat (limited to 'drivers/char/drm/i915_mem.c')
| -rw-r--r-- | drivers/char/drm/i915_mem.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/char/drm/i915_mem.c b/drivers/char/drm/i915_mem.c index 13176d136a9..ba87ff17ff6 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" |