diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/media/dvb/siano/sms-cards.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/media/dvb/siano/sms-cards.c')
| -rw-r--r-- | drivers/media/dvb/siano/sms-cards.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/siano/sms-cards.c b/drivers/media/dvb/siano/sms-cards.c index 25b43e587fa6..af121db88ea0 100644 --- a/drivers/media/dvb/siano/sms-cards.c +++ b/drivers/media/dvb/siano/sms-cards.c | |||
| @@ -64,7 +64,7 @@ static struct sms_board sms_boards[] = { | |||
| 64 | .type = SMS_NOVA_B0, | 64 | .type = SMS_NOVA_B0, |
| 65 | .fw[DEVICE_MODE_ISDBT_BDA] = "sms1xxx-hcw-55xxx-isdbt-02.fw", | 65 | .fw[DEVICE_MODE_ISDBT_BDA] = "sms1xxx-hcw-55xxx-isdbt-02.fw", |
| 66 | .fw[DEVICE_MODE_DVBT_BDA] = "sms1xxx-hcw-55xxx-dvbt-02.fw", | 66 | .fw[DEVICE_MODE_DVBT_BDA] = "sms1xxx-hcw-55xxx-dvbt-02.fw", |
| 67 | .rc_codes = RC_MAP_RC5_HAUPPAUGE_NEW, | 67 | .rc_codes = RC_MAP_HAUPPAUGE, |
| 68 | .board_cfg.leds_power = 26, | 68 | .board_cfg.leds_power = 26, |
| 69 | .board_cfg.led0 = 27, | 69 | .board_cfg.led0 = 27, |
| 70 | .board_cfg.led1 = 28, | 70 | .board_cfg.led1 = 28, |