Commit 06476f19 authored by David S. Miller's avatar David S. Miller

Merge davem@nuts.ninka.net:/home/davem/src/BK/sparc-2.5

into kernel.bkbits.net:/home/davem/sparc-2.5
parents d189d057 806d4343
......@@ -545,9 +545,7 @@ static int __init drm_init( void )
drm_device_t *dev;
int i;
#if __HAVE_CTX_BITMAP
int retcode;
#endif
DRM_DEBUG( "\n" );
#ifdef MODULE
......@@ -626,9 +624,11 @@ static int __init drm_init( void )
return 0;
#if (__REALLY_HAVE_AGP && __MUST_HAVE_AGP) || __HAVE_CTX_BITMAP
fail:
DRM(stub_unregister)(DRM(minor)[i]);
DRM(takedown)( dev );
#endif
fail_reg:
kfree (DRM(device));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment