Merge git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs

[karo-tx-linux.git] / drivers / video / nvidia / nv_setup.c

diff --git a/drivers/video/nvidia/nv_setup.c b/drivers/video/nvidia/nv_setup.c
index 135ae18bfce84e7bdd0e307d7d470e8370919ca6..2f2e162134fabe193add5d945cfc69a725aa6f03 100644 (file)
--- a/drivers/video/nvidia/nv_setup.c
+++ b/drivers/video/nvidia/nv_setup.c
@@ -50,6 +50,7 @@
 #include <video/vga.h>
 #include <linux/delay.h>
 #include <linux/pci.h>
+#include <linux/slab.h>
 #include "nv_type.h"
 #include "nv_local.h"
 #include "nv_proto.h"
@@ -543,8 +544,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;