diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-02 07:49:43 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-02 07:49:43 -0800 |
| commit | cf41f8ac386e8d62122e7e394b4c6b3e3ab30ede (patch) | |
| tree | 57a286c05baa4356da2e90178c7d99122de61399 /drivers/char/drm/savage_bci.c | |
| parent | 0271fc2db6260dd46f196191e24281af2fddb879 (diff) | |
| parent | 30e2fb188194908e48d3f27a53ccea6740eb1e98 (diff) | |
| download | op-kernel-dev-cf41f8ac386e8d62122e7e394b4c6b3e3ab30ede.zip op-kernel-dev-cf41f8ac386e8d62122e7e394b4c6b3e3ab30ede.tar.gz | |
Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
Diffstat (limited to 'drivers/char/drm/savage_bci.c')
| -rw-r--r-- | drivers/char/drm/savage_bci.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/char/drm/savage_bci.c b/drivers/char/drm/savage_bci.c index 0d426de..59c7520 100644 --- a/drivers/char/drm/savage_bci.c +++ b/drivers/char/drm/savage_bci.c @@ -32,6 +32,8 @@ #define SAVAGE_EVENT_USEC_TIMEOUT 5000000 /* 5s */ #define SAVAGE_FREELIST_DEBUG 0 +static int savage_do_cleanup_bci(drm_device_t *dev); + static int savage_bci_wait_fifo_shadow(drm_savage_private_t * dev_priv, unsigned int n) { @@ -895,7 +897,7 @@ static int savage_do_init_bci(drm_device_t * dev, drm_savage_init_t * init) return 0; } -int savage_do_cleanup_bci(drm_device_t * dev) +static int savage_do_cleanup_bci(drm_device_t * dev) { drm_savage_private_t *dev_priv = dev->dev_private; |
