git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-radeon-lockup' into drm-core-next
[pandora-kernel.git]
/
drivers
/
gpu
/
drm
/
radeon
/
rv770.c
diff --git
a/drivers/gpu/drm/radeon/rv770.c
b/drivers/gpu/drm/radeon/rv770.c
index
97958a6
..
72bc57a
100644
(file)
--- a/
drivers/gpu/drm/radeon/rv770.c
+++ b/
drivers/gpu/drm/radeon/rv770.c
@@
-917,12
+917,6
@@
int rv770_mc_init(struct radeon_device *rdev)
return 0;
}
-int rv770_gpu_reset(struct radeon_device *rdev)
-{
- /* FIXME: implement any rv770 specific bits */
- return r600_gpu_reset(rdev);
-}
-
static int rv770_startup(struct radeon_device *rdev)
{
int r;