diff options
| author | Len Brown <len.brown@intel.com> | 2005-09-03 02:44:09 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-09-03 02:44:09 -0400 |
| commit | 129521dcc94f781890f8f668219ab79f0073ff9f (patch) | |
| tree | 9f70707c88da65577f38814fe37b24c4b4957d64 /net/irda/irmod.c | |
| parent | 824b558bbe2c298b165cdb54c33718994dda30bb (diff) | |
| parent | f505380ba7b98ec97bf25300c2a58aeae903530b (diff) | |
Merge linux-2.6 into linux-acpi-2.6 test
Diffstat (limited to 'net/irda/irmod.c')
| -rw-r--r-- | net/irda/irmod.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/irda/irmod.c b/net/irda/irmod.c index 6ffaed4544e9..634901dd156f 100644 --- a/net/irda/irmod.c +++ b/net/irda/irmod.c | |||
| @@ -54,7 +54,7 @@ extern int irsock_init(void); | |||
| 54 | extern void irsock_cleanup(void); | 54 | extern void irsock_cleanup(void); |
| 55 | /* irlap_frame.c */ | 55 | /* irlap_frame.c */ |
| 56 | extern int irlap_driver_rcv(struct sk_buff *, struct net_device *, | 56 | extern int irlap_driver_rcv(struct sk_buff *, struct net_device *, |
| 57 | struct packet_type *); | 57 | struct packet_type *, struct net_device *); |
| 58 | 58 | ||
| 59 | /* | 59 | /* |
| 60 | * Module parameters | 60 | * Module parameters |