diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2008-07-01 10:03:42 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-20 07:15:56 -0300 |
| commit | 956e42d28f300f5bb928fb5850b3e3c0a8982d23 (patch) | |
| tree | 473a9832d684d88d630bf8dadb0a0934ad5eff48 /drivers/media/video/gspca/gspca.c | |
| parent | 00528d9c2e9e15625883c161867cba61725ba335 (diff) | |
V4L/DVB (8180): Source cleanup - compile error with VIDEO_ADV_DEBUG.
main, etoms, mars, pac207, pac7311, sonixb, sonixj, spca500, spca505:
Cleanup source.
sunplus: Compilation error when VIDEO_ADV_DEBUG set.
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/gspca/gspca.c')
| -rw-r--r-- | drivers/media/video/gspca/gspca.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c index c84e0b352f4..13cd9968f1f 100644 --- a/drivers/media/video/gspca/gspca.c +++ b/drivers/media/video/gspca/gspca.c @@ -28,9 +28,9 @@ #include <linux/mm.h> #include <linux/string.h> #include <linux/pagemap.h> -#include <asm/io.h> +#include <linux/io.h> #include <asm/page.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <linux/jiffies.h> #include "gspca.h" @@ -45,8 +45,8 @@ MODULE_AUTHOR("Jean-Francois Moine <http://moinejf.free.fr>"); MODULE_DESCRIPTION("GSPCA USB Camera Driver"); MODULE_LICENSE("GPL"); -#define DRIVER_VERSION_NUMBER KERNEL_VERSION(2, 1, 0) -static const char version[] = "2.1.0"; +#define DRIVER_VERSION_NUMBER KERNEL_VERSION(2, 1, 1) +static const char version[] = "2.1.1"; static int video_nr = -1; |