diff options
| -rw-r--r-- | linux/drivers/media/video/bttv-cards.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-core.c | 4 | ||||
| -rw-r--r-- | v4l/compat.h | 6 |
3 files changed, 10 insertions, 4 deletions
diff --git a/linux/drivers/media/video/bttv-cards.c b/linux/drivers/media/video/bttv-cards.c index a96b08bfe..48fd794e1 100644 --- a/linux/drivers/media/video/bttv-cards.c +++ b/linux/drivers/media/video/bttv-cards.c @@ -1,5 +1,5 @@ /* - $Id: bttv-cards.c,v 1.42 2005/01/13 17:22:33 kraxel Exp $ + $Id: bttv-cards.c,v 1.43 2005/01/31 11:32:47 kraxel Exp $ bttv-cards.c @@ -180,6 +180,8 @@ static struct CARD { // some cards ship with byteswapped IDs ... { 0x1200bd11, BTTV_PINNACLE, "Pinnacle PCTV [bswap]" }, { 0xff00bd11, BTTV_PINNACLE, "Pinnacle PCTV [bswap]" }, + // this seems to happen as well ... + { 0xff1211bd, BTTV_PINNACLE, "Pinnacle PCTV" }, { 0x3000121a, BTTV_VOODOOTV_FM, "3Dfx VoodooTV FM/ VoodooTV 200" }, { 0x263710b4, BTTV_VOODOOTV_FM, "3Dfx VoodooTV FM/ VoodooTV 200" }, diff --git a/linux/drivers/media/video/saa7134/saa7134-core.c b/linux/drivers/media/video/saa7134/saa7134-core.c index 80f33e987..cefb39d59 100644 --- a/linux/drivers/media/video/saa7134/saa7134-core.c +++ b/linux/drivers/media/video/saa7134/saa7134-core.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-core.c,v 1.24 2005/01/24 17:37:23 kraxel Exp $ + * $Id: saa7134-core.c,v 1.25 2005/01/31 11:32:47 kraxel Exp $ * * device driver for philips saa7134 based TV cards * driver core @@ -282,7 +282,7 @@ static void request_module_depend(char *name, int *flag) #else -static inline void request_module_depend(char *name, int *flag) {} +#define request_module_depend(name,flag) #endif /* CONFIG_MODULES */ diff --git a/v4l/compat.h b/v4l/compat.h index 36bdcb188..468053472 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -22,6 +22,11 @@ # define __iomem #endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,11) +# define pci_choose_state(pci_dev, state) (state) +# define PCI_D0 (0) +#endif + #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,7) static inline unsigned long msecs_to_jiffies(const unsigned int m) { @@ -64,7 +69,6 @@ static inline unsigned long msleep_interruptible(unsigned int msecs) return jiffies_to_msecs(timeout); } #endif - /* * Local variables: * c-basic-offset: 8 |