diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-10 13:30:08 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-10 13:30:08 -0400 |
| commit | 3dd392a407d15250a501fa109cc1f93fee95ef85 (patch) | |
| tree | c1faca3fa8bd0f7c8790b3e0887229b4a5a90e8b /drivers/media/common/tuners/tuner-xc2028.h | |
| parent | b27a43c1e90582facad44de67d02bc9e9f900289 (diff) | |
| parent | d403a6484f0341bf0624d17ece46f24f741b6a92 (diff) | |
Merge branch 'linus' into x86/pat2
Conflicts:
arch/x86/mm/init_64.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 */ |