diff --git a/[refs] b/[refs] index 9da1ac3df49e..2ae68be36035 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f6d15e09b19d3841e2608306e1b85e2ffc1f7a6b +refs/heads/master: 4b644dccfd204f8a89717776f065c441bf9c8cc1 diff --git a/trunk/drivers/media/radio/radio-isa.c b/trunk/drivers/media/radio/radio-isa.c index 3c0067de4324..84b7b9f4385e 100644 --- a/trunk/drivers/media/radio/radio-isa.c +++ b/trunk/drivers/media/radio/radio-isa.c @@ -191,7 +191,7 @@ static bool radio_isa_valid_io(const struct radio_isa_driver *drv, int io) return false; } -struct radio_isa_card *radio_isa_alloc(struct radio_isa_driver *drv, +static struct radio_isa_card *radio_isa_alloc(struct radio_isa_driver *drv, struct device *pdev) { struct v4l2_device *v4l2_dev; @@ -207,8 +207,9 @@ struct radio_isa_card *radio_isa_alloc(struct radio_isa_driver *drv, return isa; } -int radio_isa_common_probe(struct radio_isa_card *isa, struct device *pdev, - int radio_nr, unsigned region_size) +static int radio_isa_common_probe(struct radio_isa_card *isa, + struct device *pdev, + int radio_nr, unsigned region_size) { const struct radio_isa_driver *drv = isa->drv; const struct radio_isa_ops *ops = drv->ops; @@ -287,7 +288,8 @@ int radio_isa_common_probe(struct radio_isa_card *isa, struct device *pdev, return res; } -int radio_isa_common_remove(struct radio_isa_card *isa, unsigned region_size) +static int radio_isa_common_remove(struct radio_isa_card *isa, + unsigned region_size) { const struct radio_isa_ops *ops = isa->drv->ops;