Merge bk://kernel.bkbits.net/davem/irda-2.6

into home.osdl.org:/home/torvalds/v2.5/linux

drivers/net/irda/act200l-sir.c

@@ -93,12 +93,12 @@ static struct dongle_driver act200l = {
 	.set_speed	= act200l_change_speed,
 };
 
-int __init act200l_init(void)
+static int __init act200l_init(void)
 {
 	return irda_register_dongle(&act200l);
 }
 
-void __exit act200l_cleanup(void)
+static void __exit act200l_cleanup(void)
 {
 	irda_unregister_dongle(&act200l);
 }

drivers/net/irda/act200l.c

@@ -92,12 +92,12 @@ static struct dongle_reg dongle = {
 	.owner = THIS_MODULE,
 };
 
-int __init act200l_init(void)
+static int __init act200l_init(void)
 {
 	return irda_device_register_dongle(&dongle);
 }
 
-void __exit act200l_cleanup(void)
+static void __exit act200l_cleanup(void)
 {
 	irda_device_unregister_dongle(&dongle);
 }

drivers/net/irda/actisys-sir.c

@@ -89,7 +89,7 @@ static struct dongle_driver act220l_plus = {
 	.set_speed	= actisys_change_speed,
 };
 
-int __init actisys_sir_init(void)
+static int __init actisys_sir_init(void)
 {
 	int ret;
 
@@ -107,7 +107,7 @@ int __init actisys_sir_init(void)
 	return 0;
 }
 
-void __exit actisys_sir_cleanup(void)
+static void __exit actisys_sir_cleanup(void)
 {
 	/* We have to remove both dongles */
 	irda_unregister_dongle(&act220l_plus);

drivers/net/irda/actisys.c

@@ -91,7 +91,7 @@ static struct dongle_reg dongle_plus = {
  *	So, we register a dongle of each sort and let irattach
  * pick the right one...
  */
-int __init actisys_init(void)
+static int __init actisys_init(void)
 {
 	int ret;
 
@@ -108,7 +108,7 @@ int __init actisys_init(void)
 	return 0;
 }
 
-void __exit actisys_cleanup(void)
+static void __exit actisys_cleanup(void)
 {
 	/* We have to remove both dongles */
 	irda_device_unregister_dongle(&dongle);

drivers/net/irda/ali-ircc.c

@@ -133,7 +133,7 @@ static void SetCOMInterrupts(struct ali_ircc_cb *self , unsigned char enable);
  *    Initialize chip. Find out whay kinds of chips we are dealing with
  *    and their configuation registers address
  */
-int __init ali_ircc_init(void)
+static int __init ali_ircc_init(void)
 {
 	ali_chip_t *chip;
 	chipio_t info;

drivers/net/irda/ep7211_ir.c

@@ -97,7 +97,7 @@ static int ep7211_ir_reset(struct irda_task *task)
  *    Initialize EP7211 I/R module
  *
  */
-int __init ep7211_ir_init(void)
+static int __init ep7211_ir_init(void)
 {
 	return irda_device_register_dongle(&dongle);
 }

drivers/net/irda/esi.c

@@ -52,12 +52,12 @@ static struct dongle_reg dongle = {
 	.owner = THIS_MODULE,
 };
 
-int __init esi_init(void)
+static int __init esi_init(void)
 {
 	return irda_device_register_dongle(&dongle);
 }
 
-void __exit esi_cleanup(void)
+static void __exit esi_cleanup(void)
 {
 	irda_device_unregister_dongle(&dongle);
 }

drivers/net/irda/girbil-sir.c

@@ -72,12 +72,12 @@ static struct dongle_driver girbil = {
 	.set_speed	= girbil_change_speed,
 };
 
-int __init girbil_init(void)
+static int __init girbil_init(void)
 {
 	return irda_register_dongle(&girbil);
 }
 
-void __exit girbil_cleanup(void)
+static void __exit girbil_cleanup(void)
 {
 	irda_unregister_dongle(&girbil);
 }

drivers/net/irda/girbil.c

@@ -71,12 +71,12 @@ static struct dongle_reg dongle = {
 	.owner = THIS_MODULE,
 };
 
-int __init girbil_init(void)
+static int __init girbil_init(void)
 {
 	return irda_device_register_dongle(&dongle);
 }
 
-void __exit girbil_cleanup(void)
+static void __exit girbil_cleanup(void)
 {
 	irda_device_unregister_dongle(&dongle);
 }

drivers/net/irda/irport.c

@@ -98,7 +98,7 @@ EXPORT_SYMBOL(irport_change_speed);
 EXPORT_SYMBOL(irport_net_open);
 EXPORT_SYMBOL(irport_net_close);
 
-int __init irport_init(void)
+static int __init irport_init(void)
 {
  	int i;
 

drivers/net/irda/litelink-sir.c

@@ -64,12 +64,12 @@ static struct dongle_driver litelink = {
 	.set_speed	= litelink_change_speed,
 };
 
-int __init litelink_sir_init(void)
+static int __init litelink_sir_init(void)
 {
 	return irda_register_dongle(&litelink);
 }
 
-void __exit litelink_sir_cleanup(void)
+static void __exit litelink_sir_cleanup(void)
 {
 	irda_unregister_dongle(&litelink);
 }

drivers/net/irda/litelink.c

@@ -56,12 +56,12 @@ static struct dongle_reg dongle = {
 	.owner = THIS_MODULE,
 };
 
-int __init litelink_init(void)
+static int __init litelink_init(void)
 {
 	return irda_device_register_dongle(&dongle);
 }
 
-void __exit litelink_cleanup(void)
+static void __exit litelink_cleanup(void)
 {
 	irda_device_unregister_dongle(&dongle);
 }

drivers/net/irda/ma600-sir.c

@@ -66,13 +66,13 @@ static struct dongle_driver ma600 = {
 };
 
 
-int __init ma600_sir_init(void)
+static int __init ma600_sir_init(void)
 {
 	IRDA_DEBUG(2, "%s()\n", __FUNCTION__);
 	return irda_register_dongle(&ma600);
 }
 
-void __exit ma600_sir_cleanup(void)
+static void __exit ma600_sir_cleanup(void)
 {
 	IRDA_DEBUG(2, "%s()\n", __FUNCTION__);
 	irda_unregister_dongle(&ma600);

drivers/net/irda/ma600.c

@@ -82,13 +82,13 @@ static struct dongle_reg dongle = {
 	.owner = THIS_MODULE,
 };
 
-int __init ma600_init(void)
+static int __init ma600_init(void)
 {
 	IRDA_DEBUG(2, "%s()\n", __FUNCTION__);
 	return irda_device_register_dongle(&dongle);
 }
 
-void __exit ma600_cleanup(void)
+static void __exit ma600_cleanup(void)
 {
 	IRDA_DEBUG(2, "%s()\n", __FUNCTION__);
 	irda_device_unregister_dongle(&dongle);

drivers/net/irda/mcp2120-sir.c

@@ -49,12 +49,12 @@ static struct dongle_driver mcp2120 = {
 	.set_speed	= mcp2120_change_speed,
 };
 
-int __init mcp2120_init(void)
+static int __init mcp2120_init(void)
 {
 	return irda_register_dongle(&mcp2120);
 }
 
-void __exit mcp2120_cleanup(void)
+static void __exit mcp2120_cleanup(void)
 {
 	irda_unregister_dongle(&mcp2120);
 }

drivers/net/irda/mcp2120.c

@@ -48,12 +48,12 @@ static struct dongle_reg dongle = {
 	.owner = THIS_MODULE,
 };
 
-int __init mcp2120_init(void)
+static int __init mcp2120_init(void)
 {
 	return irda_device_register_dongle(&dongle);
 }
 
-void __exit mcp2120_cleanup(void)
+static void __exit mcp2120_cleanup(void)
 {
 	irda_device_unregister_dongle(&dongle);
 }

drivers/net/irda/nsc-ircc.c

@@ -155,7 +155,7 @@ static int nsc_ircc_pmproc(struct pm_dev *dev, pm_request_t rqst, void *data);
  *    Initialize chip. Just try to find out how many chips we are dealing with
  *    and where they are
  */
-int __init nsc_ircc_init(void)
+static int __init nsc_ircc_init(void)
 {
 	chipio_t info;
 	nsc_chip_t *chip;

drivers/net/irda/old_belkin-sir.c

@@ -78,12 +78,12 @@ static struct dongle_driver old_belkin = {
 	.set_speed	= old_belkin_change_speed,
 };
 
-int __init old_belkin_init(void)
+static int __init old_belkin_init(void)
 {
 	return irda_register_dongle(&old_belkin);
 }
 
-void __exit old_belkin_cleanup(void)
+static void __exit old_belkin_cleanup(void)
 {
 	irda_unregister_dongle(&old_belkin);
 }

drivers/net/irda/old_belkin.c

@@ -82,12 +82,12 @@ static struct dongle_reg dongle = {
 	.owner = THIS_MODULE,
 };
 
-int __init old_belkin_init(void)
+static int __init old_belkin_init(void)
 {
 	return irda_device_register_dongle(&dongle);
 }
 
-void __exit old_belkin_cleanup(void)
+static void __exit old_belkin_cleanup(void)
 {
 	irda_device_unregister_dongle(&dongle);
 }

drivers/net/irda/smsc-ircc2.c

@@ -322,7 +322,7 @@ static inline void register_bank(int iobase, int bank)
  *    Initialize chip. Just try to find out how many chips we are dealing with
  *    and where they are
  */
-int __init smsc_ircc_init(void)
+static int __init smsc_ircc_init(void)
 {
 	int ret=-ENODEV;
 
@@ -1727,7 +1727,7 @@ static int __exit smsc_ircc_close(struct smsc_ircc_cb *self)
 	return 0;
 }
 
-void __exit smsc_ircc_cleanup(void)
+static void __exit smsc_ircc_cleanup(void)
 {
 	int i;
 

drivers/net/irda/tekram-sir.c

@@ -59,7 +59,7 @@ static struct dongle_driver tekram = {
 	.set_speed	= tekram_change_speed,
 };
 
-int __init tekram_sir_init(void)
+static int __init tekram_sir_init(void)
 {
 	if (tekram_delay < 1  ||  tekram_delay > 500)
 		tekram_delay = 200;
@@ -68,7 +68,7 @@ int __init tekram_sir_init(void)
 	return irda_register_dongle(&tekram);
 }
 
-void __exit tekram_sir_cleanup(void)
+static void __exit tekram_sir_cleanup(void)
 {
 	irda_unregister_dongle(&tekram);
 }

drivers/net/irda/tekram.c

@@ -52,12 +52,12 @@ static struct dongle_reg dongle = {
 	.owner = THIS_MODULE,
 };
 
-int __init tekram_init(void)
+static int __init tekram_init(void)
 {
 	return irda_device_register_dongle(&dongle);
 }
 
-void __exit tekram_cleanup(void)
+static void __exit tekram_cleanup(void)
 {
 	irda_device_unregister_dongle(&dongle);
 }

drivers/net/irda/via-ircc.c

@@ -145,7 +145,7 @@ static struct pci_driver via_driver = {
  *
  *    Initialize chip. Just find out chip type and resource.
  */
-int __init via_ircc_init(void)
+static int __init via_ircc_init(void)
 {
 	int rc;
 

drivers/net/irda/w83977af_ir.c

@@ -110,7 +110,7 @@ static struct net_device_stats *w83977af_net_get_stats(struct net_device *dev);
  *    Initialize chip. Just try to find out how many chips we are dealing with
  *    and where they are
  */
-int __init w83977af_init(void)
+static int __init w83977af_init(void)
 {
         int i;
 
@@ -129,7 +129,7 @@ int __init w83977af_init(void)
  *    Close all configured chips
  *
  */
-void __exit w83977af_cleanup(void)
+static void __exit w83977af_cleanup(void)
 {
 	int i;