Skip to content

L
linux
Commit 317c4235 authored by Jeff Garzik's avatar Jeff Garzik
Browse files
Options

Merge mandrakesoft.com:/home/jgarzik/vanilla/linus-2.5 

into mandrakesoft.com:/home/jgarzik/repo/net-drivers-2.5
parents f4e1c439 7bba6fe6
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 3 deletions
drivers/net/rcpci45.c
View file @ 317c4235
...@@ -92,8 +92,6 @@ static U32 DriverControlWord; ...@@ -92,8 +92,6 @@ static U32 DriverControlWord;
static void rc_timer (unsigned long); static void rc_timer (unsigned long);
static int RCinit (struct net_device *);
static int RCopen (struct net_device *); static int RCopen (struct net_device *);
static int RC_xmit_packet (struct sk_buff *, struct net_device *); static int RC_xmit_packet (struct sk_buff *, struct net_device *);
static void RCinterrupt (int, void *, struct pt_regs *); static void RCinterrupt (int, void *, struct pt_regs *);
...@@ -223,7 +221,7 @@ rcpci45_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -223,7 +221,7 @@ rcpci45_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
} }
pDpa->PLanApiPA = (void *) (((long) pDpa->msgbuf + 0xff) & ~0xff); pDpa->PLanApiPA = (void *) (((long) pDpa->msgbuf + 0xff) & ~0xff);
dprintk ("pDpa->PLanApiPA = 0x%x\n", (uint) pDpa->PLanApiPA); dprintk ("pDpa->PLanApiPA = %p\n", pDpa->PLanApiPA);
/* The adapter is accessible through memory-access read/write, not /* The adapter is accessible through memory-access read/write, not
* I/O read/write. Thus, we need to map it to some virtual address * I/O read/write. Thus, we need to map it to some virtual address
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7