git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
drivers
/
atm
/
nicstar.c
diff --git
a/drivers/atm/nicstar.c
b/drivers/atm/nicstar.c
index
b63669c
..
d99aede
100644
(file)
--- a/
drivers/atm/nicstar.c
+++ b/
drivers/atm/nicstar.c
@@
-54,7
+54,6
@@
#include <asm/uaccess.h>
#include <asm/atomic.h>
#include "nicstar.h"
#include <asm/uaccess.h>
#include <asm/atomic.h>
#include "nicstar.h"
-#include "nicstarmac.h"
#ifdef CONFIG_ATM_NICSTAR_USE_SUNI
#include "suni.h"
#endif /* CONFIG_ATM_NICSTAR_USE_SUNI */
#ifdef CONFIG_ATM_NICSTAR_USE_SUNI
#include "suni.h"
#endif /* CONFIG_ATM_NICSTAR_USE_SUNI */
@@
-267,7
+266,7
@@
static struct atmdev_ops atm_ops =
};
static struct timer_list ns_timer;
static char *mac[NS_MAX_CARDS];
};
static struct timer_list ns_timer;
static char *mac[NS_MAX_CARDS];
-
MODULE_PARM(mac, "1-" __MODULE_STRING(NS_MAX_CARDS) "s"
);
+
module_param_array(mac, charp, NULL, 0
);
MODULE_LICENSE("GPL");
MODULE_LICENSE("GPL");
@@
-467,6
+466,7
@@
static int __devinit ns_init_card(int i, struct pci_dev *pcidev)
u32 u32d[4];
u32 ns_cfg_rctsize;
int bcount;
u32 u32d[4];
u32 ns_cfg_rctsize;
int bcount;
+ unsigned long membase;
error = 0;
error = 0;
@@
-494,8
+494,8
@@
static int __devinit ns_init_card(int i, struct pci_dev *pcidev)
card->index = i;
card->atmdev = NULL;
card->pcidev = pcidev;
card->index = i;
card->atmdev = NULL;
card->pcidev = pcidev;
-
card->
membase = pci_resource_start(pcidev, 1);
- card->membase =
(unsigned long) ioremap(card->
membase, NS_IOREMAP_SIZE);
+ membase = pci_resource_start(pcidev, 1);
+ card->membase =
ioremap(
membase, NS_IOREMAP_SIZE);
if (card->membase == 0)
{
printk("nicstar%d: can't ioremap() membase.\n",i);
if (card->membase == 0)
{
printk("nicstar%d: can't ioremap() membase.\n",i);