Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

1 files changed, 0 insertions, 10 deletions

diff --git a/drivers/net/hamradio/dmascc.c b/drivers/net/hamradio/dmascc.c
index 3be3f916643a..c8dc40214a08 100644
--- 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;