From: Eduardo Valentin Date: Thu, 13 Sep 2007 13:38:41 +0000 (-0400) Subject: Changes init_timer to setup_timer X-Git-Tag: v2.6.23-omap1~60 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=41283eed64c3279f62fede457ed56aced5ac2f89;p=linux-2.6-omap-h63xx.git Changes init_timer to setup_timer This simple patch changes init_timer call to setup_timer. Signed-off-by: Eduardo Valentin --- diff --git a/drivers/media/video/omap24xxcam-dma.c b/drivers/media/video/omap24xxcam-dma.c index a995b47cf52..5de0b6b2ec6 100644 --- a/drivers/media/video/omap24xxcam-dma.c +++ b/drivers/media/video/omap24xxcam-dma.c @@ -597,7 +597,5 @@ void omap24xxcam_sgdma_init(struct omap24xxcam_sgdma *sgdma, } omap24xxcam_dma_init(&sgdma->dma, base); - init_timer(&sgdma->reset_timer); - sgdma->reset_timer.function = reset_callback; - sgdma->reset_timer.data = reset_callback_data; + setup_timer(&sgdma->reset_timer, reset_callback, reset_callback_data); }