From cd441a26bb5c8ee417182a472b8bf55b678f6668 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Thu, 22 Nov 2007 18:43:46 +1000 Subject: [PATCH] --- yaml --- r: 84029 b: refs/heads/master c: 3260f9fdfee9d5b4135f40943dc0bd0733b7394e h: refs/heads/master i: 84027: bf5c70c8e2931d18daa3f07ae245a1c23fd4e0e0 v: v3 --- [refs] | 2 +- trunk/drivers/char/drm/drm_drv.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 62dc03a4c25e..41c62312cf73 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2716a02f607c964ccaa6fa7266abd3acd73d9033 +refs/heads/master: 3260f9fdfee9d5b4135f40943dc0bd0733b7394e diff --git a/trunk/drivers/char/drm/drm_drv.c b/trunk/drivers/char/drm/drm_drv.c index fc6e7646cd61..d29d7ed91bdd 100644 --- a/trunk/drivers/char/drm/drm_drv.c +++ b/trunk/drivers/char/drm/drm_drv.c @@ -255,8 +255,6 @@ int drm_init(struct drm_driver *driver) DRM_DEBUG("\n"); - drm_mem_init(); - for (i = 0; driver->pci_driver.id_table[i].vendor != 0; i++) { pid = (struct pci_device_id *)&driver->pci_driver.id_table[i]; @@ -383,6 +381,8 @@ static int __init drm_core_init(void) goto err_p3; } + drm_mem_init(); + DRM_INFO("Initialized %s %d.%d.%d %s\n", CORE_NAME, CORE_MAJOR, CORE_MINOR, CORE_PATCHLEVEL, CORE_DATE); return 0;