diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-04-05 04:55:58 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-04-05 04:55:58 +0000 |
| commit | 74a9f2e1b4d3ab45a9f72cb5b556c9f521524ab3 (patch) | |
| tree | 7c4cdb103ab1b388c9852a88bd6fb1e73eba0b5c /drivers/usb/plusb.c | |
| parent | ee6374c8b0d333c08061c6a97bc77090d7461225 (diff) | |
Merge with Linux 2.4.3.
Note that mingetty does no longer work with serial console, you have to
switch to another getty like getty_ps. This commit also includes a
fix for a setitimer bug which did prevent getty_ps from working on
older kernels.
Diffstat (limited to 'drivers/usb/plusb.c')
| -rw-r--r-- | drivers/usb/plusb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/plusb.c b/drivers/usb/plusb.c index 681709a61..0684f7819 100644 --- a/drivers/usb/plusb.c +++ b/drivers/usb/plusb.c @@ -887,7 +887,7 @@ int plusb_net_init(struct net_device *dev) /* --------------------------------------------------------------------- */ -static void *plusb_probe (struct usb_device *usbdev, unsigned int ifnum) +static void *plusb_probe (struct usb_device *usbdev, unsigned int ifnum, const struct usb_device_id *id) { plusb_t *s; |