]>
Commit | Line | Data |
---|---|---|
ff4ccc8a | 1 | --- linux-2.6.2-rc3/drivers/char/moxa.c 2003-10-09 10:02:39.000000000 +0200 |
2 | +++ linux-m68k-2.6.2-rc3/drivers/char/moxa.c 2004-01-10 04:25:26.000000000 +0100 | |
3 | @@ -49,6 +49,7 @@ | |
4 | #include <linux/tty_driver.h> | |
5 | #include <linux/delay.h> | |
6 | #include <linux/pci.h> | |
7 | +#include <linux/init.h> | |
8 | ||
9 | #include <asm/system.h> | |
10 | #include <asm/io.h> | |
11 | @@ -292,7 +293,7 @@ | |
12 | ||
13 | static int __init moxa_init(void) | |
14 | { | |
15 | - int i, n, numBoards; | |
16 | + int i, numBoards; | |
17 | struct moxa_str *ch; | |
18 | ||
19 | printk(KERN_INFO "MOXA Intellio family driver version %s\n", MOXA_VERSION); | |
20 | @@ -410,7 +411,7 @@ | |
21 | #ifdef CONFIG_PCI | |
22 | { | |
23 | struct pci_dev *p = NULL; | |
24 | - n = (sizeof(moxa_pcibrds) / sizeof(moxa_pcibrds[0])) - 1; | |
25 | + int n = (sizeof(moxa_pcibrds) / sizeof(moxa_pcibrds[0])) - 1; | |
26 | i = 0; | |
27 | while (i < n) { | |
28 | while ((p = pci_find_device(moxa_pcibrds[i].vendor, moxa_pcibrds[i].device, p))!=NULL) | |
29 | --- linux-2.6.2-rc3/drivers/char/mxser.c 2003-10-09 10:02:40.000000000 +0200 | |
30 | +++ linux-m68k-2.6.2-rc3/drivers/char/mxser.c 2004-01-10 04:26:02.000000000 +0100 | |
31 | @@ -56,6 +56,7 @@ | |
32 | #include <linux/mm.h> | |
33 | #include <linux/smp_lock.h> | |
34 | #include <linux/pci.h> | |
35 | +#include <linux/init.h> | |
36 | ||
37 | #include <asm/system.h> | |
38 | #include <asm/io.h> | |
39 | @@ -496,7 +497,6 @@ | |
40 | static int __init mxser_module_init(void) | |
41 | { | |
42 | int i, m, retval, b; | |
43 | - int n, index; | |
44 | struct mxser_hwconf hwconf; | |
45 | ||
46 | mxvar_sdriver = alloc_tty_driver(MXSER_PORTS + 1); | |
47 | @@ -600,9 +600,8 @@ | |
48 | #ifdef CONFIG_PCI | |
49 | { | |
50 | struct pci_dev *pdev = NULL; | |
51 | - | |
52 | - n = (sizeof(mxser_pcibrds) / sizeof(mxser_pcibrds[0])) - 1; | |
53 | - index = 0; | |
54 | + int n = (sizeof(mxser_pcibrds) / sizeof(mxser_pcibrds[0])) - 1; | |
55 | + int index = 0; | |
56 | for (b = 0; b < n; b++) { | |
57 | while ((pdev = pci_find_device(mxser_pcibrds[b].vendor, mxser_pcibrds[b].device, pdev))) | |
58 | { |