diff --git a/drivers/ddk/stdio/vsprintf.c b/drivers/ddk/stdio/vsprintf.c
index 3e8ee0ca06..459b12dcd9 100644
--- a/drivers/ddk/stdio/vsprintf.c
+++ b/drivers/ddk/stdio/vsprintf.c
@@ -549,7 +549,7 @@ char *string(char *buf, char *end, const char *s, struct printf_spec spec)
 {
 	int len, i;
 
-	if ((unsigned long)s < PAGE_SIZE)
+    if (s == NULL)
 		s = "(null)";
 
 	len = strnlen(s, spec.precision);
diff --git a/drivers/include/drm/drmP.h b/drivers/include/drm/drmP.h
index 2b96eb739a..951c322217 100644
--- a/drivers/include/drm/drmP.h
+++ b/drivers/include/drm/drmP.h
@@ -185,7 +185,7 @@ int drm_err(const char *func, const char *format, ...);
 /** \name Begin the DRM... */
 /*@{*/
 
-#define DRM_DEBUG_CODE 0     /**< Include debugging code if > 1, then
+#define DRM_DEBUG_CODE 2     /**< Include debugging code if > 1, then
 				     also include looping detection. */
 
 #define DRM_MAGIC_HASH_ORDER  4  /**< Size of key hash table. Must be power of 2. */
@@ -1358,7 +1358,8 @@ extern int drm_freebufs(struct drm_device *dev, void *data,
 			struct drm_file *file_priv);
 extern int drm_mapbufs(struct drm_device *dev, void *data,
 		       struct drm_file *file_priv);
-extern int drm_order(unsigned long size);
+extern int drm_dma_ioctl(struct drm_device *dev, void *data,
+			 struct drm_file *file_priv);
 
 				/* DMA support (drm_dma.h) */
 extern int drm_legacy_dma_setup(struct drm_device *dev);
diff --git a/drivers/include/linux/fb.h b/drivers/include/linux/fb.h
index 7c9000ca42..c65daffd48 100644
--- a/drivers/include/linux/fb.h
+++ b/drivers/include/linux/fb.h
@@ -887,6 +887,8 @@ struct fb_info {
 			resource_size_t size;
 		} ranges[0];
 	} *apertures;
+
+	bool skip_vt_switch; /* no VT switch on suspend/resume required */
 };
 
 static inline struct apertures_struct *alloc_apertures(unsigned int max_num) {
@@ -1095,6 +1097,12 @@ extern void fb_destroy_modedb(struct fb_videomode *modedb);
 extern int fb_find_mode_cvt(struct fb_videomode *mode, int margins, int rb);
 extern unsigned char *fb_ddc_read(struct i2c_adapter *adapter);
 
+extern int of_get_fb_videomode(struct device_node *np,
+			       struct fb_videomode *fb,
+			       int index);
+extern int fb_videomode_from_videomode(const struct videomode *vm,
+				       struct fb_videomode *fbmode);
+
 /* drivers/video/modedb.c */
 #define VESA_MODEDB_SIZE 34
 extern void fb_var_to_videomode(struct fb_videomode *mode,
diff --git a/drivers/include/linux/mod_devicetable.h b/drivers/include/linux/mod_devicetable.h
index c5e5065e4d..96b2e3404e 100644
--- a/drivers/include/linux/mod_devicetable.h
+++ b/drivers/include/linux/mod_devicetable.h
@@ -121,7 +121,8 @@ struct usb_device_id {
 	__u8		bInterfaceNumber;
 
 	/* not matched against */
-	kernel_ulong_t	driver_info;
+	kernel_ulong_t	driver_info
+		__attribute__((aligned(sizeof(kernel_ulong_t))));
 };
 
 /* Some useful macros to use to create struct usb_device_id */