diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-07-01 09:56:10 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-07-01 09:56:26 +0200 |
| commit | 087021ba41e9481202103d51d3dd0c4706899a2b (patch) | |
| tree | bf5d67420fd176682a1f8f1e9342ad397c23937a /drivers/video/nvidia/nv_setup.c | |
| parent | fb9c818873a788c5c01c9868cc6050df96e2c7df (diff) | |
| parent | e83c2b0ff325f52dda1aff3572d0e1516216c54b (diff) | |
Merge branch 'linus' into perfcounters/urgent
Merge reason: this branch was on a .30-ish base before, update
it to an almost-.31-rc2 upstream base to pick up fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/video/nvidia/nv_setup.c')
| -rw-r--r-- | drivers/video/nvidia/nv_setup.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/video/nvidia/nv_setup.c b/drivers/video/nvidia/nv_setup.c index 135ae18bfce..eef2bb298d9 100644 --- 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; |