Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1

[linux-2.6.git] / drivers / char / drm / drm_core.h

diff --git a/drivers/char/drm/drm_core.h b/drivers/char/drm/drm_core.h
index 8ebab5a..3167390 100644 (file)
--- a/drivers/char/drm/drm_core.h
+++ b/drivers/char/drm/drm_core.h
@@ -20,21 +20,15 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+#define CORE_AUTHOR            "Gareth Hughes, Leif Delgass, José Fonseca, Jon Smirl"
 
-#include "drm_auth.h"
-#include "drm_agpsupport.h"
-#include "drm_bufs.h"
-#include "drm_context.h"
-#include "drm_dma.h"
-#include "drm_irq.h"
-#include "drm_drawable.h"
-#include "drm_drv.h"
-#include "drm_fops.h"
-#include "drm_init.h"
-#include "drm_ioctl.h"
-#include "drm_lock.h"
-#include "drm_memory.h"
-#include "drm_proc.h"
-#include "drm_vm.h"
-#include "drm_stub.h"
-#include "drm_scatter.h"
+#define CORE_NAME              "drm"
+#define CORE_DESC              "DRM shared core routines"
+#define CORE_DATE              "20060810"
+
+#define DRM_IF_MAJOR   1
+#define DRM_IF_MINOR   3
+
+#define CORE_MAJOR     1
+#define CORE_MINOR     1
+#define CORE_PATCHLEVEL 0