Commit 6089093e authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds

ip2: fix crashes on load/unload

This doesn't need to be two modules, and making it one cleans up the
problem
Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Cc: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent bff5fda9
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# Makefile for the Computone IntelliPort Plus Driver # Makefile for the Computone IntelliPort Plus Driver
# #
obj-$(CONFIG_COMPUTONE) += ip2.o ip2main.o obj-$(CONFIG_COMPUTONE) += ip2.o
ip2-objs := ip2base.o ip2-objs := ip2base.o ip2main.o
...@@ -345,27 +345,6 @@ have_requested_irq( char irq ) ...@@ -345,27 +345,6 @@ have_requested_irq( char irq )
return 0; return 0;
} }
/******************************************************************************/
/* Function: init_module() */
/* Parameters: None */
/* Returns: Success (0) */
/* */
/* Description: */
/* This is a required entry point for an installable module. It simply calls */
/* the driver initialisation function and returns what it returns. */
/******************************************************************************/
#ifdef MODULE
static int __init
ip2_init_module(void)
{
#ifdef IP2DEBUG_INIT
printk (KERN_DEBUG "Loading module ...\n" );
#endif
return 0;
}
module_init(ip2_init_module);
#endif /* MODULE */
/******************************************************************************/ /******************************************************************************/
/* Function: cleanup_module() */ /* Function: cleanup_module() */
/* Parameters: None */ /* Parameters: None */
...@@ -779,8 +758,6 @@ ip2_loadmain(int *iop, int *irqp, unsigned char *firmware, int firmsize) ...@@ -779,8 +758,6 @@ ip2_loadmain(int *iop, int *irqp, unsigned char *firmware, int firmsize)
return err; return err;
} }
EXPORT_SYMBOL(ip2_loadmain);
/******************************************************************************/ /******************************************************************************/
/* Function: ip2_init_board() */ /* Function: ip2_init_board() */
/* Parameters: Index of board in configuration structure */ /* Parameters: Index of board in configuration structure */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment