summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2004-03-18 15:03:58 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-03-18 15:03:58 -0800
commit705e71d4f784bcb731782856ded3b8254f1ad663 (patch)
treeebbe7ea63527106ae2ee6bb161a07566bd10d235
parent2860cb8620251ba8814305ecbcf4a58336831292 (diff)
[PATCH] meye driver update
From: Stelian Pop <stelian@popies.net> This patchlet is just a resync with my tree, it only increments the meye driver version number and makes some small comment changes as suggested by Randy Dunlap.
-rw-r--r--drivers/media/video/meye.c8
-rw-r--r--drivers/media/video/meye.h2
2 files changed, 6 insertions, 4 deletions
diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c
index 53d5722ac2a8..bb6e40dcb4b0 100644
--- a/drivers/media/video/meye.c
+++ b/drivers/media/video/meye.c
@@ -160,13 +160,15 @@ static void rvfree(void * mem, unsigned long size) {
}
}
-/* return a page table pointing to N pages of locked memory
+/*
+ * return a page table pointing to N pages of locked memory
*
* NOTE: The meye device expects dma_addr_t size to be 32 bits
* (the toc must be exactly 1024 entries each of them being 4 bytes
* in size, the whole result being 4096 bytes). We're using here
- * dma_addr_t for corectness but the compilation of this driver is
- * disabled for HIGHMEM64G=y, where sizeof(dma_addr_t) != 4 */
+ * dma_addr_t for correctness but the compilation of this driver is
+ * disabled for HIGHMEM64G=y, where sizeof(dma_addr_t) != 4
+ */
static int ptable_alloc(void) {
dma_addr_t *pt;
int i;
diff --git a/drivers/media/video/meye.h b/drivers/media/video/meye.h
index 9ac39190882f..2a2f79ed41ab 100644
--- a/drivers/media/video/meye.h
+++ b/drivers/media/video/meye.h
@@ -31,7 +31,7 @@
#define _MEYE_PRIV_H_
#define MEYE_DRIVER_MAJORVERSION 1
-#define MEYE_DRIVER_MINORVERSION 8
+#define MEYE_DRIVER_MINORVERSION 9
#include <linux/config.h>
#include <linux/types.h>