diff --git a/[refs] b/[refs] index 6b1ffb930adb..f7126c2f1239 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: af3043c64a4a87bc0a4596f4952dc194ebc5af72 +refs/heads/master: 12cb12ef23bfe90f4e6c003a88b4500c6ff2b71b diff --git a/trunk/drivers/staging/hv/storvsc_api.h b/trunk/drivers/staging/hv/storvsc_api.h index d46b4de255dc..5f41ef6bcc54 100644 --- a/trunk/drivers/staging/hv/storvsc_api.h +++ b/trunk/drivers/staging/hv/storvsc_api.h @@ -163,7 +163,6 @@ static inline void put_stor_device(struct hv_device *device) } /* Interface */ -int stor_vsc_on_host_reset(struct hv_device *device); int stor_vsc_on_device_add(struct hv_device *device, void *additional_info); diff --git a/trunk/drivers/staging/hv/storvsc_drv.c b/trunk/drivers/staging/hv/storvsc_drv.c index e0a11958141c..127d12250dd5 100644 --- a/trunk/drivers/staging/hv/storvsc_drv.c +++ b/trunk/drivers/staging/hv/storvsc_drv.c @@ -233,7 +233,7 @@ static int storvsc_drv_init(void) } -int stor_vsc_on_host_reset(struct hv_device *device) +static int stor_vsc_on_host_reset(struct hv_device *device) { struct storvsc_device *stor_device; struct storvsc_request_extension *request;