diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-08 02:59:00 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-08 02:59:00 +0000 |
| commit | 1fcb7623bc138d780101d7a70cfe29b11f7c67ef (patch) | |
| tree | e1ec9bb6aa19db16a405fb4393e2a90c38b4c75d /drivers/isdn | |
| parent | 458fe58677afb17219d864e100131728038b4f1b (diff) | |
Merge with Linux 2.4.0-test3-pre5. 64-bit kernel are still not
-Werror clean.
Diffstat (limited to 'drivers/isdn')
| -rw-r--r-- | drivers/isdn/avmb1/capi.c | 1 | ||||
| -rw-r--r-- | drivers/isdn/isdn_cards.c | 3 | ||||
| -rw-r--r-- | drivers/isdn/isdn_ppp.h | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/drivers/isdn/avmb1/capi.c b/drivers/isdn/avmb1/capi.c index 009010896..06ddc8199 100644 --- a/drivers/isdn/avmb1/capi.c +++ b/drivers/isdn/avmb1/capi.c @@ -171,6 +171,7 @@ * */ +#include <linux/config.h> #include <linux/module.h> #include <linux/errno.h> #include <linux/kernel.h> diff --git a/drivers/isdn/isdn_cards.c b/drivers/isdn/isdn_cards.c index bdbcd4191..a17cd1f79 100644 --- a/drivers/isdn/isdn_cards.c +++ b/drivers/isdn/isdn_cards.c @@ -76,6 +76,9 @@ extern void capi_init(void); extern void capidrv_init(void); #endif +extern int act2000_init(void); + + void isdn_cards_init(void) { diff --git a/drivers/isdn/isdn_ppp.h b/drivers/isdn/isdn_ppp.h index 1a1dcfcfe..2de3035c1 100644 --- a/drivers/isdn/isdn_ppp.h +++ b/drivers/isdn/isdn_ppp.h @@ -76,6 +76,7 @@ */ #include <linux/ppp_defs.h> /* for PPP_PROTOCOL */ +#include <linux/isdn_ppp.h> /* for isdn_ppp info */ extern void isdn_ppp_timer_timeout(void); extern int isdn_ppp_read(int, struct file *, char *, int); extern int isdn_ppp_write(int, struct file *, const char *, int); |