projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[powerpc.git]
/
drivers
/
net
/
dgrs.c
diff --git
a/drivers/net/dgrs.c
b/drivers/net/dgrs.c
index
e9361cb
..
a795202
100644
(file)
--- a/
drivers/net/dgrs.c
+++ b/
drivers/net/dgrs.c
@@
-110,7
+110,6
@@
static char version[] __initdata =
* DGRS include files
*/
typedef unsigned char uchar;
* DGRS include files
*/
typedef unsigned char uchar;
-typedef unsigned int bool;
#define vol volatile
#include "dgrs.h"
#define vol volatile
#include "dgrs.h"
@@
-896,10
+895,10
@@
static int dgrs_ioctl(struct net_device *devN, struct ifreq *ifr, int cmd)
* dev, priv will always refer to the 0th device in Multi-NIC mode.
*/
* dev, priv will always refer to the 0th device in Multi-NIC mode.
*/
-static irqreturn_t dgrs_intr(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t dgrs_intr(int irq, void *dev_id)
{
{
- struct net_device *dev0 =
(struct net_device *)
dev_id;
- DGRS_PRIV *priv0 =
(DGRS_PRIV *)
dev0->priv;
+ struct net_device *dev0 = dev_id;
+ DGRS_PRIV *priv0 = dev0->priv;
I596_CB *cbp;
int cmd;
int i;
I596_CB *cbp;
int cmd;
int i;