diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-14 17:24:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-14 17:24:51 -0400 |
| commit | 7e69a8c4d06b7ecb874f571e82b715a9f79bc3c4 (patch) | |
| tree | 0248fb8f7a3e445cc3c744252abeecabb9205c05 /drivers/media/common/tuners/tuner-xc2028.h | |
| parent | b6825d2df55aa7d7341c715b577b73a6a03dc944 (diff) | |
| parent | d5120ae72a066b18f98e0c45ce73262f58030851 (diff) | |
Merge branch 's3c-move' into devel
Conflicts:
arch/arm/mach-versatile/core.c
Diffstat (limited to 'drivers/media/common/tuners/tuner-xc2028.h')
| -rw-r--r-- | drivers/media/common/tuners/tuner-xc2028.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/common/tuners/tuner-xc2028.h b/drivers/media/common/tuners/tuner-xc2028.h index 216025cf5d4b..2c5b6282b569 100644 --- a/drivers/media/common/tuners/tuner-xc2028.h +++ b/drivers/media/common/tuners/tuner-xc2028.h | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | #include "dvb_frontend.h" | 10 | #include "dvb_frontend.h" |
| 11 | 11 | ||
| 12 | #define XC2028_DEFAULT_FIRMWARE "xc3028-v27.fw" | 12 | #define XC2028_DEFAULT_FIRMWARE "xc3028-v27.fw" |
| 13 | #define XC3028L_DEFAULT_FIRMWARE "xc3028L-v36.fw" | ||
| 13 | 14 | ||
| 14 | /* Dmoduler IF (kHz) */ | 15 | /* Dmoduler IF (kHz) */ |
| 15 | #define XC3028_FE_DEFAULT 0 /* Don't load SCODE */ | 16 | #define XC3028_FE_DEFAULT 0 /* Don't load SCODE */ |