diff options
Diffstat (limited to 'linux/drivers/media/video/bt8xx/bttv-cards.c')
| -rw-r--r-- | linux/drivers/media/video/bt8xx/bttv-cards.c | 28 |
1 files changed, 3 insertions, 25 deletions
diff --git a/linux/drivers/media/video/bt8xx/bttv-cards.c b/linux/drivers/media/video/bt8xx/bttv-cards.c index 177b75ebc..4d283be22 100644 --- a/linux/drivers/media/video/bt8xx/bttv-cards.c +++ b/linux/drivers/media/video/bt8xx/bttv-cards.c @@ -35,6 +35,7 @@ #include <net/checksum.h> #include "compat.h" +#include <asm/unaligned.h> #include <asm/io.h> #include "bttvp.h" @@ -114,31 +115,12 @@ module_param(gpiomask, int, 0444); module_param(audioall, int, 0444); module_param(autoload, int, 0444); -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) -MODULE_PARM(card,"1-" __stringify(BTTV_MAX) "i"); -MODULE_PARM(pll,"1-" __stringify(BTTV_MAX) "i"); -MODULE_PARM(tuner,"1-" __stringify(BTTV_MAX) "i"); -MODULE_PARM(svhs,"1-" __stringify(BTTV_MAX) "i"); -MODULE_PARM(remote,"1-" __stringify(BTTV_MAX) "i"); -MODULE_PARM(audiomux,"1-" __stringify(BTTV_MAX) "i"); -#else -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10) -static int dummy; -module_param_array(card, int, dummy, 0444); -module_param_array(pll, int, dummy, 0444); -module_param_array(tuner, int, dummy, 0444); -module_param_array(svhs, int, dummy, 0444); -module_param_array(remote, int, dummy, 0444); -module_param_array(audiomux, int, dummy, 0444); -#else module_param_array(card, int, NULL, 0444); module_param_array(pll, int, NULL, 0444); module_param_array(tuner, int, NULL, 0444); module_param_array(svhs, int, NULL, 0444); module_param_array(remote, int, NULL, 0444); module_param_array(audiomux, int, NULL, 0444); -#endif -#endif MODULE_PARM_DESC(triton1,"set ETBF pci config bit " "[enable bug compatibility for triton1 + others]"); @@ -3869,11 +3851,7 @@ static int __devinit pvr_boot(struct bttv *btv) const struct firmware *fw_entry; int rc; -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) rc = request_firmware(&fw_entry, "hcwamc.rbf", &btv->c.pci->dev); -#else - rc = request_firmware(&fw_entry, "hcwamc.rbf", pci_name(btv->c.pci)); -#endif if (rc != 0) { printk(KERN_WARNING "bttv%d: no altera firmware [via hotplug]\n", btv->c.nr); @@ -3922,7 +3900,7 @@ static void __devinit osprey_eeprom(struct bttv *btv, const u8 ee[256]) ee += i; /* found a valid descriptor */ - type = be16_to_cpup((u16*)(ee+4)); + type = get_unaligned_be16((__be16 *)(ee+4)); switch(type) { /* 848 based */ @@ -3982,7 +3960,7 @@ static void __devinit osprey_eeprom(struct bttv *btv, const u8 ee[256]) btv->c.nr, type); break; } - serial = be32_to_cpup((u32*)(ee+6)); + serial = get_unaligned_be32((__be32 *)(ee+6)); } printk(KERN_INFO "bttv%d: osprey eeprom: card=%d '%s' serial=%u\n", |