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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
net
/
jazzsonic.c
diff --git
a/drivers/net/jazzsonic.c
b/drivers/net/jazzsonic.c
index
272d331
..
d34afb5
100644
(file)
--- a/
drivers/net/jazzsonic.c
+++ b/
drivers/net/jazzsonic.c
@@
-7,10
+7,10
@@
* dhd's support for 16-bit cards.
*
* (C) 1996,1998 by Thomas Bogendoerfer (tsbogend@alpha.franken.de)
* dhd's support for 16-bit cards.
*
* (C) 1996,1998 by Thomas Bogendoerfer (tsbogend@alpha.franken.de)
- *
+ *
* This driver is based on work from Andreas Busse, but most of
* the code is rewritten.
* This driver is based on work from Andreas Busse, but most of
* the code is rewritten.
- *
+ *
* (C) 1995 by Andreas Busse (andy@waldorf-gmbh.de)
*
* A driver for the onboard Sonic ethernet controller on Mips Jazz
* (C) 1995 by Andreas Busse (andy@waldorf-gmbh.de)
*
* A driver for the onboard Sonic ethernet controller on Mips Jazz
@@
-65,7
+65,7
@@
do { \
/* use 0 for production, 1 for verification, >1 for debug */
#ifdef SONIC_DEBUG
static unsigned int sonic_debug = SONIC_DEBUG;
/* use 0 for production, 1 for verification, >1 for debug */
#ifdef SONIC_DEBUG
static unsigned int sonic_debug = SONIC_DEBUG;
-#else
+#else
static unsigned int sonic_debug = 1;
#endif
static unsigned int sonic_debug = 1;
#endif
@@
-80,7
+80,7
@@
static struct {
/*
* We cannot use station (ethernet) address prefixes to detect the
* sonic controller since these are board manufacturer depended.
/*
* We cannot use station (ethernet) address prefixes to detect the
* sonic controller since these are board manufacturer depended.
- * So we check for known Silicon Revision IDs instead.
+ * So we check for known Silicon Revision IDs instead.
*/
static unsigned short known_revisions[] =
{
*/
static unsigned short known_revisions[] =
{
@@
-119,7
+119,7
@@
static int __init sonic_probe1(struct net_device *dev)
silicon_revision);
goto out;
}
silicon_revision);
goto out;
}
-
+
if (sonic_debug && version_printed++ == 0)
printk(version);
if (sonic_debug && version_printed++ == 0)
printk(version);
@@
-138,7
+138,7
@@
static int __init sonic_probe1(struct net_device *dev)
}
err = -ENOMEM;
}
err = -ENOMEM;
-
+
/* Initialize the device structure. */
lp->dma_bitmode = SONIC_BITMODE32;
/* Initialize the device structure. */
lp->dma_bitmode = SONIC_BITMODE32;
@@
-260,7
+260,7
@@
MODULE_DESCRIPTION("Jazz SONIC ethernet driver");
module_param(sonic_debug, int, 0);
MODULE_PARM_DESC(sonic_debug, "jazzsonic debug level (1-4)");
module_param(sonic_debug, int, 0);
MODULE_PARM_DESC(sonic_debug, "jazzsonic debug level (1-4)");
-#define SONIC_IRQ_FLAG
SA_INTERRUPT
+#define SONIC_IRQ_FLAG
IRQF_DISABLED
#include "sonic.c"
#include "sonic.c"