Merge branch 'master' into 83xx

[linux-2.6] / drivers / char / drm / tdfx_drv.h

diff --git a/drivers/char/drm/tdfx_drv.h b/drivers/char/drm/tdfx_drv.h
index 857be434379fd9d49fc295f845d8d8f66dc8a49a..84204ec1b046b9723225aeab9568c26ca52a9295 100644 (file)
--- a/drivers/char/drm/tdfx_drv.h
+++ b/drivers/char/drm/tdfx_drv.h
@@ -1,6 +1,7 @@
 /* tdfx.h -- 3dfx DRM template customization -*- linux-c -*-
  * Created: Wed Feb 14 12:32:32 2001 by gareth@valinux.com
- *
+ */
+/*
  * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All Rights Reserved.
  *