diff options
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88-blackbird.c')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-blackbird.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-blackbird.c b/linux/drivers/media/video/cx88/cx88-blackbird.c index a642d3dc8..83638557d 100644 --- a/linux/drivers/media/video/cx88/cx88-blackbird.c +++ b/linux/drivers/media/video/cx88/cx88-blackbird.c @@ -30,9 +30,7 @@ #include <linux/init.h> #include <linux/fs.h> #include <linux/delay.h> -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) #include <linux/device.h> -#endif #include <linux/firmware.h> #include <media/v4l2-common.h> #include <media/cx2341x.h> @@ -444,13 +442,8 @@ static int blackbird_load_firmware(struct cx8802_dev *dev) if (retval < 0) dprintk(0, "Error with register_write\n"); -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) retval = request_firmware(&firmware, CX2341X_FIRM_ENC_FILENAME, &dev->pci->dev); -#else - retval = request_firmware(&firmware, CX2341X_FIRM_ENC_FILENAME, - pci_name(dev->pci)); -#endif if (retval != 0) { |