diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 17:29:07 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 17:29:07 -0700 |
commit | db400b3c4ee89d384d9163836a55577abdae772d (patch) | |
tree | 95d2d031089bcc7d26a7e4b3616c90e821a9c904 /drivers/char/drm/drm_context.c | |
parent | 0dd7f883a9e21c5f2ff5e8f1cbb0e78cdc044d8a (diff) | |
parent | 908f9c485042e516bb3749f4361129a94772fe26 (diff) |
Merge branch 'drm-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6
Diffstat (limited to 'drivers/char/drm/drm_context.c')
-rw-r--r-- | drivers/char/drm/drm_context.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/drm/drm_context.c b/drivers/char/drm/drm_context.c index f515567e5b6..502892794c1 100644 --- a/drivers/char/drm/drm_context.c +++ b/drivers/char/drm/drm_context.c @@ -308,7 +308,7 @@ found: * * Attempt to set drm_device::context_flag. */ -int drm_context_switch( drm_device_t *dev, int old, int new ) +static int drm_context_switch( drm_device_t *dev, int old, int new ) { if ( test_and_set_bit( 0, &dev->context_flag ) ) { DRM_ERROR( "Reentering -- FIXME\n" ); |