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 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
drivers
/
video
/
nvidia
/
nv_setup.c
diff --git
a/drivers/video/nvidia/nv_setup.c
b/drivers/video/nvidia/nv_setup.c
index
135ae18
..
eef2bb2
100644
(file)
--- a/
drivers/video/nvidia/nv_setup.c
+++ b/
drivers/video/nvidia/nv_setup.c
@@
-543,8
+543,7
@@
int NVCommonSetup(struct fb_info *info)
} else if (analog_on_B) {
CRTCnumber = outputBfromCRTC;
FlatPanel = 0;
- printk("nvidiafb: CRTC %i"
- "appears to have a "
+ printk("nvidiafb: CRTC %i appears to have a "
"CRT attached\n", CRTCnumber);
} else if (slaved_on_A) {
CRTCnumber = 0;