X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=drivers%2Fchar%2Frocket.c;h=76357c855ce3b0324c5dd26873ec85cf3971cc78;hb=680a96710041c3c25464b5e093b80ca43cb94f52;hp=106f225e745fa72f07a8689f11eff4f1b0bdcb06;hpb=c827ba4cb49a30ce581201fd0ba2be77cde412c7;p=powerpc.git

diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c
index 106f225e74..76357c855c 100644
--- a/drivers/char/rocket.c
+++ b/drivers/char/rocket.c
@@ -106,6 +106,8 @@
 
 /****** RocketPort Local Variables ******/
 
+static void rp_do_poll(unsigned long dummy);
+
 static struct tty_driver *rocket_driver;
 
 static struct rocket_version driver_version = {	
@@ -116,7 +118,7 @@ static struct r_port *rp_table[MAX_RP_PORTS];	       /*  The main repository of
 static unsigned int xmit_flags[NUM_BOARDS];	       /*  Bit significant, indicates port had data to transmit. */
 						       /*  eg.  Bit 0 indicates port 0 has xmit data, ...        */
 static atomic_t rp_num_ports_open;	               /*  Number of serial ports open                           */
-static struct timer_list rocket_timer;
+static DEFINE_TIMER(rocket_timer, rp_do_poll, 0, 0);
 
 static unsigned long board1;	                       /* ISA addresses, retrieved from rocketport.conf          */
 static unsigned long board2;
@@ -2367,12 +2369,6 @@ static int __init rp_init(void)
 	if (!rocket_driver)
 		return -ENOMEM;
 
-	/*
-	 * Set up the timer channel.
-	 */
-	init_timer(&rocket_timer);
-	rocket_timer.function = rp_do_poll;
-
 	/*
 	 * Initialize the array of pointers to our own internal state
 	 * structures.