diff options
Diffstat (limited to 'drivers/isdn')
-rw-r--r-- | drivers/isdn/hardware/mISDN/avmfritz.c | 1 | ||||
-rw-r--r-- | drivers/isdn/hardware/mISDN/hfcmulti.c | 1 | ||||
-rw-r--r-- | drivers/isdn/hardware/mISDN/hfcpci.c | 1 | ||||
-rw-r--r-- | drivers/isdn/hardware/mISDN/mISDNinfineon.c | 1 | ||||
-rw-r--r-- | drivers/isdn/hardware/mISDN/mISDNipac.c | 1 | ||||
-rw-r--r-- | drivers/isdn/hardware/mISDN/netjet.c | 1 | ||||
-rw-r--r-- | drivers/isdn/hardware/mISDN/speedfax.c | 1 | ||||
-rw-r--r-- | drivers/isdn/hardware/mISDN/w6692.c | 1 | ||||
-rw-r--r-- | drivers/isdn/hisax/hisax.h | 1 | ||||
-rw-r--r-- | drivers/isdn/hisax/hisax_fcpcipnp.c | 1 | ||||
-rw-r--r-- | drivers/isdn/i4l/isdn_net.c | 5 |
11 files changed, 13 insertions, 2 deletions
diff --git a/drivers/isdn/hardware/mISDN/avmfritz.c b/drivers/isdn/hardware/mISDN/avmfritz.c index 472a2af79446..861b6511f3ee 100644 --- a/drivers/isdn/hardware/mISDN/avmfritz.c +++ b/drivers/isdn/hardware/mISDN/avmfritz.c | |||
@@ -20,6 +20,7 @@ | |||
20 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 20 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
21 | * | 21 | * |
22 | */ | 22 | */ |
23 | #include <linux/interrupt.h> | ||
23 | #include <linux/module.h> | 24 | #include <linux/module.h> |
24 | #include <linux/pci.h> | 25 | #include <linux/pci.h> |
25 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
diff --git a/drivers/isdn/hardware/mISDN/hfcmulti.c b/drivers/isdn/hardware/mISDN/hfcmulti.c index f6f3c87cc7c2..a440d7fff0ad 100644 --- a/drivers/isdn/hardware/mISDN/hfcmulti.c +++ b/drivers/isdn/hardware/mISDN/hfcmulti.c | |||
@@ -152,6 +152,7 @@ | |||
152 | 152 | ||
153 | #define HFC_MULTI_VERSION "2.03" | 153 | #define HFC_MULTI_VERSION "2.03" |
154 | 154 | ||
155 | #include <linux/interrupt.h> | ||
155 | #include <linux/module.h> | 156 | #include <linux/module.h> |
156 | #include <linux/slab.h> | 157 | #include <linux/slab.h> |
157 | #include <linux/pci.h> | 158 | #include <linux/pci.h> |
diff --git a/drivers/isdn/hardware/mISDN/hfcpci.c b/drivers/isdn/hardware/mISDN/hfcpci.c index b01a7be1300f..3261de18a91e 100644 --- a/drivers/isdn/hardware/mISDN/hfcpci.c +++ b/drivers/isdn/hardware/mISDN/hfcpci.c | |||
@@ -44,6 +44,7 @@ | |||
44 | * | 44 | * |
45 | */ | 45 | */ |
46 | 46 | ||
47 | #include <linux/interrupt.h> | ||
47 | #include <linux/module.h> | 48 | #include <linux/module.h> |
48 | #include <linux/pci.h> | 49 | #include <linux/pci.h> |
49 | #include <linux/delay.h> | 50 | #include <linux/delay.h> |
diff --git a/drivers/isdn/hardware/mISDN/mISDNinfineon.c b/drivers/isdn/hardware/mISDN/mISDNinfineon.c index bc0529ac88a1..6218775ce87d 100644 --- a/drivers/isdn/hardware/mISDN/mISDNinfineon.c +++ b/drivers/isdn/hardware/mISDN/mISDNinfineon.c | |||
@@ -38,6 +38,7 @@ | |||
38 | * | 38 | * |
39 | */ | 39 | */ |
40 | 40 | ||
41 | #include <linux/interrupt.h> | ||
41 | #include <linux/module.h> | 42 | #include <linux/module.h> |
42 | #include <linux/pci.h> | 43 | #include <linux/pci.h> |
43 | #include <linux/delay.h> | 44 | #include <linux/delay.h> |
diff --git a/drivers/isdn/hardware/mISDN/mISDNipac.c b/drivers/isdn/hardware/mISDN/mISDNipac.c index 64ecc6f5ffaf..d2ffb1d9b831 100644 --- a/drivers/isdn/hardware/mISDN/mISDNipac.c +++ b/drivers/isdn/hardware/mISDN/mISDNipac.c | |||
@@ -20,6 +20,7 @@ | |||
20 | * | 20 | * |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include <linux/irqreturn.h> | ||
23 | #include <linux/slab.h> | 24 | #include <linux/slab.h> |
24 | #include <linux/module.h> | 25 | #include <linux/module.h> |
25 | #include <linux/mISDNhw.h> | 26 | #include <linux/mISDNhw.h> |
diff --git a/drivers/isdn/hardware/mISDN/netjet.c b/drivers/isdn/hardware/mISDN/netjet.c index db25b6b2ae39..5ef9f11ee74b 100644 --- a/drivers/isdn/hardware/mISDN/netjet.c +++ b/drivers/isdn/hardware/mISDN/netjet.c | |||
@@ -20,6 +20,7 @@ | |||
20 | * | 20 | * |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include <linux/interrupt.h> | ||
23 | #include <linux/module.h> | 24 | #include <linux/module.h> |
24 | #include <linux/pci.h> | 25 | #include <linux/pci.h> |
25 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
diff --git a/drivers/isdn/hardware/mISDN/speedfax.c b/drivers/isdn/hardware/mISDN/speedfax.c index 9e07246bb9e7..4d0d41ea1228 100644 --- a/drivers/isdn/hardware/mISDN/speedfax.c +++ b/drivers/isdn/hardware/mISDN/speedfax.c | |||
@@ -22,6 +22,7 @@ | |||
22 | * | 22 | * |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include <linux/interrupt.h> | ||
25 | #include <linux/module.h> | 26 | #include <linux/module.h> |
26 | #include <linux/slab.h> | 27 | #include <linux/slab.h> |
27 | #include <linux/pci.h> | 28 | #include <linux/pci.h> |
diff --git a/drivers/isdn/hardware/mISDN/w6692.c b/drivers/isdn/hardware/mISDN/w6692.c index 9e84870b971c..e10e0284533c 100644 --- a/drivers/isdn/hardware/mISDN/w6692.c +++ b/drivers/isdn/hardware/mISDN/w6692.c | |||
@@ -21,6 +21,7 @@ | |||
21 | * | 21 | * |
22 | */ | 22 | */ |
23 | 23 | ||
24 | #include <linux/interrupt.h> | ||
24 | #include <linux/module.h> | 25 | #include <linux/module.h> |
25 | #include <linux/pci.h> | 26 | #include <linux/pci.h> |
26 | #include <linux/delay.h> | 27 | #include <linux/delay.h> |
diff --git a/drivers/isdn/hisax/hisax.h b/drivers/isdn/hisax/hisax.h index de1c669c7b13..0a5c42a3f125 100644 --- a/drivers/isdn/hisax/hisax.h +++ b/drivers/isdn/hisax/hisax.h | |||
@@ -16,6 +16,7 @@ | |||
16 | #include <linux/slab.h> | 16 | #include <linux/slab.h> |
17 | #include <linux/mm.h> | 17 | #include <linux/mm.h> |
18 | #include <linux/mman.h> | 18 | #include <linux/mman.h> |
19 | #include <linux/interrupt.h> | ||
19 | #include <linux/ioport.h> | 20 | #include <linux/ioport.h> |
20 | #include <linux/timer.h> | 21 | #include <linux/timer.h> |
21 | #include <linux/wait.h> | 22 | #include <linux/wait.h> |
diff --git a/drivers/isdn/hisax/hisax_fcpcipnp.c b/drivers/isdn/hisax/hisax_fcpcipnp.c index 8b0a7d86b30f..478ebab54ca4 100644 --- a/drivers/isdn/hisax/hisax_fcpcipnp.c +++ b/drivers/isdn/hisax/hisax_fcpcipnp.c | |||
@@ -25,6 +25,7 @@ | |||
25 | 25 | ||
26 | #include <linux/module.h> | 26 | #include <linux/module.h> |
27 | #include <linux/init.h> | 27 | #include <linux/init.h> |
28 | #include <linux/interrupt.h> | ||
28 | #include <linux/pci.h> | 29 | #include <linux/pci.h> |
29 | #include <linux/isapnp.h> | 30 | #include <linux/isapnp.h> |
30 | #include <linux/kmod.h> | 31 | #include <linux/kmod.h> |
diff --git a/drivers/isdn/i4l/isdn_net.c b/drivers/isdn/i4l/isdn_net.c index 97988111e45a..48e9cc0369b1 100644 --- a/drivers/isdn/i4l/isdn_net.c +++ b/drivers/isdn/i4l/isdn_net.c | |||
@@ -1983,13 +1983,14 @@ isdn_net_rebuild_header(struct sk_buff *skb) | |||
1983 | return ret; | 1983 | return ret; |
1984 | } | 1984 | } |
1985 | 1985 | ||
1986 | static int isdn_header_cache(const struct neighbour *neigh, struct hh_cache *hh) | 1986 | static int isdn_header_cache(const struct neighbour *neigh, struct hh_cache *hh, |
1987 | __be16 type) | ||
1987 | { | 1988 | { |
1988 | const struct net_device *dev = neigh->dev; | 1989 | const struct net_device *dev = neigh->dev; |
1989 | isdn_net_local *lp = netdev_priv(dev); | 1990 | isdn_net_local *lp = netdev_priv(dev); |
1990 | 1991 | ||
1991 | if (lp->p_encap == ISDN_NET_ENCAP_ETHER) | 1992 | if (lp->p_encap == ISDN_NET_ENCAP_ETHER) |
1992 | return eth_header_cache(neigh, hh); | 1993 | return eth_header_cache(neigh, hh, type); |
1993 | return -1; | 1994 | return -1; |
1994 | } | 1995 | } |
1995 | 1996 | ||