diff --git a/[refs] b/[refs] index 0399dc69e4d2..1c6e87340275 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: efa762f597cb6ec094a9e62acd4f1167b3199d34 +refs/heads/master: 3273961fe19116f0b94346bf3f82d23a956c3db4 diff --git a/trunk/drivers/media/video/cx23885/cx23885-core.c b/trunk/drivers/media/video/cx23885/cx23885-core.c index d8dfa40b4af9..a50b5cf2b6be 100644 --- a/trunk/drivers/media/video/cx23885/cx23885-core.c +++ b/trunk/drivers/media/video/cx23885/cx23885-core.c @@ -155,7 +155,6 @@ static struct sram_channel cx23885_sram_channels[] = { .cnt2_reg = DMA5_CNT2, }, [SRAM_CH07] = { - .name = "ch7", .name = "TV Audio", .cmds_start = 0x10190, .ctrl_start = 0x10480,