diff options
author | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
commit | d6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch) | |
tree | e2be02f33984c48ec019c654051d27964e42c441 /drivers/net/hamradio/6pack.h | |
parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) |
Merge with 2.3.19.
Diffstat (limited to 'drivers/net/hamradio/6pack.h')
-rw-r--r-- | drivers/net/hamradio/6pack.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/hamradio/6pack.h b/drivers/net/hamradio/6pack.h index a5fe532f3..b929c83a6 100644 --- a/drivers/net/hamradio/6pack.h +++ b/drivers/net/hamradio/6pack.h @@ -70,7 +70,7 @@ struct sixpack { /* Various fields. */ struct tty_struct *tty; /* ptr to TTY structure */ - struct device *dev; /* easy for intr handling */ + struct net_device *dev; /* easy for intr handling */ /* These are pointers to the malloc()ed frame buffers. */ unsigned char *rbuff; /* receiver buffer */ @@ -128,7 +128,7 @@ struct sixpack { #define AX25_6PACK_HEADER_LEN 0 #define SIXPACK_MAGIC 0x5304 -extern int sixpack_init(struct device *dev); +extern int sixpack_init(struct net_device *dev); #endif |