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.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
drivers
/
net
/
tokenring
/
ibmtr.c
diff --git
a/drivers/net/tokenring/ibmtr.c
b/drivers/net/tokenring/ibmtr.c
index
10fa8e7
..
69e9246
100644
(file)
--- a/
drivers/net/tokenring/ibmtr.c
+++ b/
drivers/net/tokenring/ibmtr.c
@@
-127,6
+127,7
@@
in the event that chatty debug messages are desired - jjs 12/30/98 */
#include <linux/ioport.h>
#include <linux/netdevice.h>
#include <linux/ioport.h>
#include <linux/netdevice.h>
+#include <linux/ip.h>
#include <linux/trdevice.h>
#include <linux/ibmtr.h>
#include <linux/trdevice.h>
#include <linux/ibmtr.h>
@@
-382,7
+383,7
@@
static int __devinit ibmtr_probe1(struct net_device *dev, int PIOaddr)
{
unsigned char segment, intr=0, irq=0, i, j, cardpresent=NOTOK, temp=0;
{
unsigned char segment, intr=0, irq=0, i, j, cardpresent=NOTOK, temp=0;
- void * t_mmio =
0
;
+ void * t_mmio =
NULL
;
struct tok_info *ti = dev->priv;
void *cd_chanid;
unsigned char *tchanid, ctemp;
struct tok_info *ti = dev->priv;
void *cd_chanid;
unsigned char *tchanid, ctemp;