Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[linux-2.6-omap-h63xx.git] / drivers / net / hamradio / dmascc.c

diff --git a/drivers/net/hamradio/dmascc.c b/drivers/net/hamradio/dmascc.c
index 3be3f916643a17fcb53574f83cf39d8c8ae5bb9e..c8dc40214a087f752a0be4ce7b644e7c24fc223c 100644 (file)
--- a/drivers/net/hamradio/dmascc.c
+++ b/drivers/net/hamradio/dmascc.c
@@ -311,16 +311,6 @@ static void __exit dmascc_exit(void)
        }
 }
 
-#ifndef MODULE
-void __init dmascc_setup(char *str, int *ints)
-{
-       int i;
-
-       for (i = 0; i < MAX_NUM_DEVS && i < ints[0]; i++)
-               io[i] = ints[i + 1];
-}
-#endif
-
 static int __init dmascc_init(void)
 {
        int h, i, j, n;