1 files changed, 4 insertions, 5 deletions

diff --git a/drivers/media/video/omap24xxcam.c b/drivers/media/video/omap24xxcam.c
index 69b60ba5dd7a..eb97bff7116f 100644
--- a/drivers/media/video/omap24xxcam.c
+++ b/drivers/media/video/omap24xxcam.c
@@ -31,7 +31,6 @@
 #include <linux/interrupt.h>
 #include <linux/videodev2.h>
 #include <linux/pci.h>          /* needed for videobufs */
-#include <linux/version.h>
 #include <linux/platform_device.h>
 #include <linux/clk.h>
 #include <linux/io.h>
@@ -43,7 +42,7 @@
 
 #include "omap24xxcam.h"
 
-#define OMAP24XXCAM_VERSION KERNEL_VERSION(0, 0, 0)
+#define OMAP24XXCAM_VERSION "0.0.1"
 
 #define RESET_TIMEOUT_NS 10000
 
@@ -309,11 +308,11 @@ static int omap24xxcam_vbq_alloc_mmap_buffer(struct videobuf_buffer *vb)
                         order--;
 
                 /* try to allocate as many contiguous pages as possible */
-                page = alloc_pages(GFP_KERNEL | GFP_DMA, order);
+                page = alloc_pages(GFP_KERNEL, order);
                 /* if allocation fails, try to allocate smaller amount */
                 while (page == NULL) {
                         order--;
-                        page = alloc_pages(GFP_KERNEL | GFP_DMA, order);
+                        page = alloc_pages(GFP_KERNEL, order);
                         if (page == NULL && !order) {
                                 err = -ENOMEM;
                                 goto out;
@@ -993,7 +992,6 @@ static int vidioc_querycap(struct file *file, void *fh,
 
         strlcpy(cap->driver, CAM_NAME, sizeof(cap->driver));
         strlcpy(cap->card, cam->vfd->name, sizeof(cap->card));
-        cap->version = OMAP24XXCAM_VERSION;
         cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;
 
         return 0;
@@ -1888,6 +1886,7 @@ static void __exit omap24xxcam_cleanup(void)
 MODULE_AUTHOR("Sakari Ailus <sakari.ailus@nokia.com>");
 MODULE_DESCRIPTION("OMAP24xx Video for Linux camera driver");
 MODULE_LICENSE("GPL");
+MODULE_VERSION(OMAP24XXCAM_VERSION);
 module_param(video_nr, int, 0);
 MODULE_PARM_DESC(video_nr,
                  "Minor number for video device (-1 ==> auto assign)");