diff options
| author | Gerd Knorr <devnull@localhost> | 2004-08-16 10:40:09 +0000 |
|---|---|---|
| committer | Gerd Knorr <devnull@localhost> | 2004-08-16 10:40:09 +0000 |
| commit | 6b88df37b59abcfe85a1e6b0df1dc31d4c43ce08 (patch) | |
| tree | 75e0987e6771a3f5cf2b45fec227e01071da6dbb /linux/drivers/media/video | |
| parent | 61488e82cd66f519766cff588d799e8682d9a936 (diff) | |
| download | mediapointer-dvb-s2-6b88df37b59abcfe85a1e6b0df1dc31d4c43ce08.tar.gz mediapointer-dvb-s2-6b88df37b59abcfe85a1e6b0df1dc31d4c43ce08.tar.bz2 | |
- bttv: firmware loader fix by Kenneth Aafløy
Diffstat (limited to 'linux/drivers/media/video')
| -rw-r--r-- | linux/drivers/media/video/bttv-cards.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/bttv-cards.c b/linux/drivers/media/video/bttv-cards.c index 7d4ec9e42..55edcd6e1 100644 --- a/linux/drivers/media/video/bttv-cards.c +++ b/linux/drivers/media/video/bttv-cards.c @@ -31,7 +31,7 @@ #include <linux/init.h> #include <linux/pci.h> #include <linux/vmalloc.h> -#ifdef CONFIG_FW_LOADER +#if defined(CONFIG_FW_LOADER) || defined(CONFIG_FW_LOADER_MODULE) # include <linux/firmware.h> #endif @@ -2876,7 +2876,7 @@ static int __devinit pvr_altera_load(struct bttv *btv, u8 *micro, u32 microlen) return 0; } -#ifndef CONFIG_FW_LOADER +#if !defined(CONFIG_FW_LOADER) && !defined(CONFIG_FW_LOADER_MODULE) /* old 2.4.x way -- via soundcore's mod_firmware_load */ static char *firm_altera = "/usr/lib/video4linux/hcwamc.rbf"; |