diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-10-13 14:58:23 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-10-13 14:58:23 +0100 |
| commit | ebf8889bd1fe3615991ff4494635d237280652a2 (patch) | |
| tree | 10fb735717122bbb86474339eac07f26e7ccdf40 /include/linux/isdn.h | |
| parent | b160292cc216a50fd0cd386b0bda2cd48352c73b (diff) | |
| parent | 752097cec53eea111d087c545179b421e2bde98a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/isdn.h')
| -rw-r--r-- | include/linux/isdn.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/include/linux/isdn.h b/include/linux/isdn.h index 3c7875b7ab5b..ad09506554a3 100644 --- a/include/linux/isdn.h +++ b/include/linux/isdn.h @@ -353,13 +353,6 @@ typedef struct isdn_net_local_s { /* a particular channel (including */ /* the frame_cnt */ - int (*org_hhc)( - struct neighbour *neigh, - struct hh_cache *hh); - /* Ptr to orig. header_cache_update */ - void (*org_hcu)(struct hh_cache *, - struct net_device *, - unsigned char *); int pppbind; /* ippp device for bindings */ int dialtimeout; /* How long shall we try on dialing? (jiffies) */ int dialwait; /* How long shall we wait after failed attempt? (jiffies) */ @@ -389,7 +382,7 @@ typedef struct isdn_net_dev_s { online */ spinlock_t queue_lock; /* lock to protect queue */ void *next; /* Pointer to next isdn-interface */ - struct net_device dev; /* interface to upper levels */ + struct net_device *dev; /* interface to upper levels */ #ifdef CONFIG_ISDN_PPP ippp_bundle * pb; /* pointer to the common bundle structure * with the per-bundle data */ |