diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-24 17:07:33 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-24 17:07:33 -0300 |
| commit | e768886b19cdc2ba666bd52faa7797ff4151ced7 (patch) | |
| tree | 9b2b20fbb51059cbf4b75ecac89099aec219b590 /linux | |
| parent | e3271361d4e681b0327edf793bcd42dad41a9173 (diff) | |
| download | mediapointer-dvb-s2-e768886b19cdc2ba666bd52faa7797ff4151ced7.tar.gz mediapointer-dvb-s2-e768886b19cdc2ba666bd52faa7797ff4151ced7.tar.bz2 | |
This patch fixes some kernel version checks.
From: Reinhard Schwab <reinhard.schwab@aon.at>
Signed-off-by: Reinhard Schwab <reinhard.schwab@aon.at>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/video/cpia2/cpia2_core.c | 8 | ||||
| -rw-r--r-- | linux/drivers/media/video/dabusb.c | 10 | ||||
| -rw-r--r-- | linux/drivers/media/video/usbvideo/vicam.c | 6 |
3 files changed, 12 insertions, 12 deletions
diff --git a/linux/drivers/media/video/cpia2/cpia2_core.c b/linux/drivers/media/video/cpia2/cpia2_core.c index d6a1c1952..eab48dfd0 100644 --- a/linux/drivers/media/video/cpia2/cpia2_core.c +++ b/linux/drivers/media/video/cpia2/cpia2_core.c @@ -33,7 +33,7 @@ #include <linux/slab.h> #include <linux/vmalloc.h> -#if LINUX_VERSION_CODE => KERNEL_VERSION(2,6,27) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27) #include <linux/firmware.h> #endif @@ -898,7 +898,7 @@ int cpia2_set_low_power(struct camera_data *cam) * apply_vp_patch * *****************************************************************************/ -#if LINUX_VERSION_CODE => KERNEL_VERSION(2,6,27) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27) static int cpia2_send_onebyte_command(struct camera_data *cam, struct cpia2_command *cmd, u8 start, u8 datum) @@ -921,7 +921,7 @@ static int apply_vp_patch(struct camera_data *cam) #endif struct cpia2_command cmd; -#if LINUX_VERSION_CODE => KERNEL_VERSION(2,6,27) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27) ret = request_firmware(&fw, fw_name, &cam->dev->dev); if (ret) { printk(KERN_ERR "cpia2: failed to load VP patch \"%s\"\n", @@ -955,7 +955,7 @@ static int apply_vp_patch(struct camera_data *cam) cpia2_send_command(cam, &cmd); } -#if LINUX_VERSION_CODE => KERNEL_VERSION(2,6,27) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27) /* Next send the start address... */ cpia2_send_onebyte_command(cam, &cmd, 0x0A, fw->data[0]); /* hi */ cpia2_send_onebyte_command(cam, &cmd, 0x0B, fw->data[1]); /* lo */ diff --git a/linux/drivers/media/video/dabusb.c b/linux/drivers/media/video/dabusb.c index a73220716..f23e6b84d 100644 --- a/linux/drivers/media/video/dabusb.c +++ b/linux/drivers/media/video/dabusb.c @@ -39,7 +39,7 @@ #include <linux/usb.h> #include "compat.h" #include <linux/mutex.h> -#if LINUX_VERSION_CODE => KERNEL_VERSION(2,6,27) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27) #include <linux/firmware.h> #include <linux/ihex.h> #endif @@ -349,7 +349,7 @@ static int dabusb_loadmem (pdabusb_t s, const char *fname) dbg("Enter dabusb_loadmem (internal)"); -#if LINUX_VERSION_CODE => KERNEL_VERSION(2,6,27) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27) ret = request_ihex_firmware(&fw, "dabusb/firmware.fw", &s->usbdev->dev); if (ret) { err("Failed to load \"dabusb/firmware.fw\": %d\n", ret); @@ -431,7 +431,7 @@ static int dabusb_fpga_init (pdabusb_t s, pbulk_transfer_t b) static int dabusb_fpga_download (pdabusb_t s, const char *fname) { pbulk_transfer_t b = kmalloc (sizeof (bulk_transfer_t), GFP_KERNEL); -#if LINUX_VERSION_CODE => KERNEL_VERSION(2,6,27) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27) const struct firmware *fw; #endif unsigned int blen, n; @@ -447,7 +447,7 @@ static int dabusb_fpga_download (pdabusb_t s, const char *fname) return -ENOMEM; } -#if LINUX_VERSION_CODE => KERNEL_VERSION(2,6,27) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27) ret = request_firmware(&fw, "dabusb/bitstream.bin", &s->usbdev->dev); if (ret) { err("Failed to load \"dabusb/bitstream.bin\": %d\n", ret); @@ -489,7 +489,7 @@ static int dabusb_fpga_download (pdabusb_t s, const char *fname) ret = dabusb_fpga_init (s, b); kfree (b); -#if LINUX_VERSION_CODE => KERNEL_VERSION(2,6,27) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27) release_firmware(fw); #endif diff --git a/linux/drivers/media/video/usbvideo/vicam.c b/linux/drivers/media/video/usbvideo/vicam.c index 4558e083a..2aa05f7ca 100644 --- a/linux/drivers/media/video/usbvideo/vicam.c +++ b/linux/drivers/media/video/usbvideo/vicam.c @@ -43,7 +43,7 @@ #include <linux/vmalloc.h> #include <linux/slab.h> #include <linux/mutex.h> -#if LINUX_VERSION_CODE => KERNEL_VERSION(2,6,27) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27) #include <linux/firmware.h> #include <linux/ihex.h> #endif @@ -516,7 +516,7 @@ initialize_camera(struct vicam_camera *cam) #endif } -#if LINUX_VERSION_CODE => KERNEL_VERSION(2,6,27) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27) release_firmware(fw); #endif @@ -1260,6 +1260,6 @@ module_exit(usb_vicam_exit); MODULE_AUTHOR(DRIVER_AUTHOR); MODULE_DESCRIPTION(DRIVER_DESC); MODULE_LICENSE("GPL"); -#if LINUX_VERSION_CODE => KERNEL_VERSION(2,6,27) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27) MODULE_FIRMWARE("vicam/firmware.fw"); #endif |