Merge remote-tracking branch 'asoc/topic/tlv320aic26' into asoc-next

[deliverable/linux.git] / drivers / block / mg_disk.c

diff --git a/drivers/block/mg_disk.c b/drivers/block/mg_disk.c
index a56cfcd5d648c928401a56052243b61805ca7f4c..77a60bedd7a3216d1a10c7b8e37ca2d35ff22bf8 100644 (file)
--- a/drivers/block/mg_disk.c
+++ b/drivers/block/mg_disk.c
@@ -636,7 +636,7 @@ ok_to_write:
                mg_request(host->breq);
 }
 
-void mg_times_out(unsigned long data)
+static void mg_times_out(unsigned long data)
 {
        struct mg_host *host = (struct mg_host *)data;
        char *name;