You can import this changeset into BK by piping this whole message to: '| bk receive [path to repository]' or apply the patch as usual. =================================================================== ChangeSet@1.797.106.9, 2002-11-24 21:08:35-02:00, acme@conectiva.com.br o mxser: add module_exit/module_init This fixes the compilation problem in 2.5 mxser.c | 29 +++++------------------------ 1 files changed, 5 insertions(+), 24 deletions(-) diff -Nru a/drivers/char/mxser.c b/drivers/char/mxser.c --- a/drivers/char/mxser.c Fri Dec 6 23:17:37 2002 +++ b/drivers/char/mxser.c Fri Dec 6 23:17:37 2002 @@ -328,13 +328,7 @@ * static functions: */ -#ifdef MODULE -int init_module(void); -void cleanup_module(void); -#endif - static void mxser_getcfg(int board, struct mxser_hwconf *hwconf); -int mxser_init(void); static int mxser_get_ISA_conf(int, struct mxser_hwconf *); static int mxser_get_PCI_conf(struct pci_dev *, int, struct mxser_hwconf *); static void mxser_do_softint(void *); @@ -373,21 +367,7 @@ * The MOXA C168/C104 serial driver boot-time initialization code! */ - -#ifdef MODULE -int init_module(void) -{ - int ret; - - if (verbose) - printk("Loading module mxser ...\n"); - ret = mxser_init(); - if (verbose) - printk("Done.\n"); - return (ret); -} - -void cleanup_module(void) +static void __exit mxser_module_exit(void) { int i, err = 0; @@ -411,8 +391,6 @@ printk("Done.\n"); } -#endif - int mxser_initbrd(int board, struct mxser_hwconf *hwconf) { @@ -510,7 +488,7 @@ return (0); } -int mxser_init(void) +static int __init mxser_module_init(void) { int i, m, retval, b; int n, index; @@ -2493,3 +2471,6 @@ } outb(0x00, port + 4); } + +module_init(mxser_module_init); +module_exit(mxser_module_exit); =================================================================== This BitKeeper patch contains the following changesets: 1.797.106.9 ## Wrapped with gzip_uu ## begin 664 bkpatch18471 M'XL(`#%,\3T``]546VO;,!1^CG[%@;ZLC-@ZNO@V,K(V8RL=K'3KVZ"HLE*+ MQE:PU:P#__C):N-O'1:5S;3H]9)$EPG2FO*UB9MBM&&/'-B?^Q-,7H M_/V'BT_OS@F93."X4LVU^6(\3";$NW:E%F4W5;Y:N";RK6JZVOAUTWX3VC-* M67@EIIS*I,>$BK376"(J@::D3&2)(,/\T\=S/ZJ"R#BF4@KLI1!I2F:`49JG M$=(DRH&R&#%F`A@6-"NX'%-64`I[2\-KA#$E1_!O81P3#0[JNX$34&4)M2MO M%^;2W%D?/^QM8WT("^MK93N8VSO3@:\,A(9+NU#>N@:6K;M:F!IL`P--IR`E MBIR<_>*`C/_R(80J2MX^@[AL[2"%6%>JC==`(KT%7E`J>YF%79\(S3.&(,89YPAR,"E@,&D" M*,D)SVGX['R82,/*V1(NUT#N\5UN07LU>`_)3&"X?C*3R$/BR;UYR+>-#^D# M]M_3AY.']!,F<@FS(TR^95)R$\. '/TTQI@4````` ` end