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 'imx-for-2.6.38' of git://git.pengutronix.de/git/ukl/linux-2.6 into...
[pandora-kernel.git]
/
drivers
/
gpu
/
drm
/
radeon
/
rs600.c
diff --git
a/drivers/gpu/drm/radeon/rs600.c
b/drivers/gpu/drm/radeon/rs600.c
index
b091a1f
..
f1c6e02
100644
(file)
--- a/
drivers/gpu/drm/radeon/rs600.c
+++ b/
drivers/gpu/drm/radeon/rs600.c
@@
-375,7
+375,7
@@
int rs600_gart_init(struct radeon_device *rdev)
int r;
if (rdev->gart.table.vram.robj) {
int r;
if (rdev->gart.table.vram.robj) {
- WARN(1, "RS600 GART already initialized
.
\n");
+ WARN(1, "RS600 GART already initialized\n");
return 0;
}
/* Initialize common gart structure */
return 0;
}
/* Initialize common gart structure */
@@
-505,7
+505,7
@@
int rs600_irq_set(struct radeon_device *rdev)
~S_007D18_DC_HOT_PLUG_DETECT2_INT_EN(1);
if (!rdev->irq.installed) {
~S_007D18_DC_HOT_PLUG_DETECT2_INT_EN(1);
if (!rdev->irq.installed) {
- WARN(1, "Can't enable IRQ/MSI because no handler is installed
.
\n");
+ WARN(1, "Can't enable IRQ/MSI because no handler is installed\n");
WREG32(R_000040_GEN_INT_CNTL, 0);
return -EINVAL;
}
WREG32(R_000040_GEN_INT_CNTL, 0);
return -EINVAL;
}