Merge branch 'akpm' (patches from Andrew)

[cascardo/linux.git] / drivers / media / pci / ngene / ngene-cards.c

diff --git a/drivers/media/pci/ngene/ngene-cards.c b/drivers/media/pci/ngene/ngene-cards.c
index 4e783a6..423e8c8 100644 (file)
--- a/drivers/media/pci/ngene/ngene-cards.c
+++ b/drivers/media/pci/ngene/ngene-cards.c
@@ -613,7 +613,7 @@ static struct stv6110x_config tuner_cineS2_1 = {
        .clk_div = 1,
 };
 
-static struct ngene_info ngene_info_cineS2 = {
+static const struct ngene_info ngene_info_cineS2 = {
        .type           = NGENE_SIDEWINDER,
        .name           = "Linux4Media cineS2 DVB-S2 Twin Tuner",
        .io_type        = {NGENE_IO_TSIN, NGENE_IO_TSIN},
@@ -627,7 +627,7 @@ static struct ngene_info ngene_info_cineS2 = {
        .msi_supported  = true,
 };
 
-static struct ngene_info ngene_info_satixS2 = {
+static const struct ngene_info ngene_info_satixS2 = {
        .type           = NGENE_SIDEWINDER,
        .name           = "Mystique SaTiX-S2 Dual",
        .io_type        = {NGENE_IO_TSIN, NGENE_IO_TSIN},
@@ -641,7 +641,7 @@ static struct ngene_info ngene_info_satixS2 = {
        .msi_supported  = true,
 };
 
-static struct ngene_info ngene_info_satixS2v2 = {
+static const struct ngene_info ngene_info_satixS2v2 = {
        .type           = NGENE_SIDEWINDER,
        .name           = "Mystique SaTiX-S2 Dual (v2)",
        .io_type        = {NGENE_IO_TSIN, NGENE_IO_TSIN, NGENE_IO_TSIN, NGENE_IO_TSIN,
@@ -656,7 +656,7 @@ static struct ngene_info ngene_info_satixS2v2 = {
        .msi_supported  = true,
 };
 
-static struct ngene_info ngene_info_cineS2v5 = {
+static const struct ngene_info ngene_info_cineS2v5 = {
        .type           = NGENE_SIDEWINDER,
        .name           = "Linux4Media cineS2 DVB-S2 Twin Tuner (v5)",
        .io_type        = {NGENE_IO_TSIN, NGENE_IO_TSIN, NGENE_IO_TSIN, NGENE_IO_TSIN,
@@ -672,7 +672,7 @@ static struct ngene_info ngene_info_cineS2v5 = {
 };
 
 
-static struct ngene_info ngene_info_duoFlex = {
+static const struct ngene_info ngene_info_duoFlex = {
        .type           = NGENE_SIDEWINDER,
        .name           = "Digital Devices DuoFlex PCIe or miniPCIe",
        .io_type        = {NGENE_IO_TSIN, NGENE_IO_TSIN, NGENE_IO_TSIN, NGENE_IO_TSIN,
@@ -687,7 +687,7 @@ static struct ngene_info ngene_info_duoFlex = {
        .msi_supported  = true,
 };
 
-static struct ngene_info ngene_info_m780 = {
+static const struct ngene_info ngene_info_m780 = {
        .type           = NGENE_APP,
        .name           = "Aver M780 ATSC/QAM-B",
 
@@ -727,7 +727,7 @@ static struct drxd_config fe_terratec_dvbt_1 = {
        .osc_deviation  = osc_deviation,
 };
 
-static struct ngene_info ngene_info_terratec = {
+static const struct ngene_info ngene_info_terratec = {
        .type           = NGENE_TERRATEC,
        .name           = "Terratec Integra/Cinergy2400i Dual DVB-T",
        .io_type        = {NGENE_IO_TSIN, NGENE_IO_TSIN},