The following commit has been merged in the linux branch: commit ff07eb897a97640b7ac0262cd50311ad403038f8 Author: Uwe Kleine-König u.kleine-koenig@pengutronix.de Date: Thu Oct 1 10:28:35 2009 +0200

move virtrng_remove to .devexit.text

The function virtrng_remove is used only wrapped by __devexit_p so define it using __devexit.

Signed-off-by: Uwe Kleine-König u.kleine-koenig@pengutronix.de Acked-by: Sam Ravnborg sam@ravnborg.org Cc: Rusty Russell rusty@rustcorp.com.au Cc: Michael S. Tsirkin mst@redhat.com Acked-by: Christian Borntraeger borntraeger@de.ibm.com Cc: linux-kernel@vger.kernel.org Signed-off-by: Rusty Russell rusty@rustcorp.com.au

diff --git a/drivers/char/hw_random/virtio-rng.c b/drivers/char/hw_random/virtio-rng.c index b6c24dc..915157f 100644 --- a/drivers/char/hw_random/virtio-rng.c +++ b/drivers/char/hw_random/virtio-rng.c @@ -116,7 +116,7 @@ static int virtrng_probe(struct virtio_device *vdev) return 0; }

-static void virtrng_remove(struct virtio_device *vdev) +static void __devexit virtrng_remove(struct virtio_device *vdev) { vdev->config->reset(vdev); hwrng_unregister(&virtio_hwrng);