diff --git a/sys/dev/usb/ukyopon.c b/sys/dev/usb/ukyopon.c index 3330609d374e..8530ff0b87e8 100644 --- a/sys/dev/usb/ukyopon.c +++ b/sys/dev/usb/ukyopon.c @@ -1,4 +1,4 @@ -/* $NetBSD: ukyopon.c,v 1.10 2008/05/24 16:40:58 cube Exp $ */ +/* $NetBSD: ukyopon.c,v 1.11 2008/06/27 16:05:59 drochner Exp $ */ /* * Copyright (c) 1998, 2005 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ukyopon.c,v 1.10 2008/05/24 16:40:58 cube Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ukyopon.c,v 1.11 2008/06/27 16:05:59 drochner Exp $"); #include #include @@ -168,9 +168,6 @@ ukyopon_ioctl(void *addr, int portno, u_long cmd, void *data, int flag, return (error); } -#ifdef __strong_alias -__strong_alias(ukyopon_activate,umodem_common_activate) -#else int ukyopon_activate(device_ptr_t self, enum devact act) { @@ -178,7 +175,6 @@ ukyopon_activate(device_ptr_t self, enum devact act) return umodem_common_activate(&sc->sc_umodem, act); } -#endif USB_DETACH(ukyopon) { diff --git a/sys/dev/usb/umodem.c b/sys/dev/usb/umodem.c index 71db4df306d0..3ccc537e5a39 100644 --- a/sys/dev/usb/umodem.c +++ b/sys/dev/usb/umodem.c @@ -1,4 +1,4 @@ -/* $NetBSD: umodem.c,v 1.58 2008/05/24 16:40:58 cube Exp $ */ +/* $NetBSD: umodem.c,v 1.59 2008/06/27 16:05:59 drochner Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -44,7 +44,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: umodem.c,v 1.58 2008/05/24 16:40:58 cube Exp $"); +__KERNEL_RCSID(0, "$NetBSD: umodem.c,v 1.59 2008/06/27 16:05:59 drochner Exp $"); #include #include @@ -115,9 +115,6 @@ USB_ATTACH(umodem) USB_ATTACH_SUCCESS_RETURN; } -#ifdef __strong_alias -__strong_alias(umodem_activate,umodem_common_activate) -#else int umodem_activate(device_ptr_t self, enum devact act) { @@ -125,7 +122,6 @@ umodem_activate(device_ptr_t self, enum devact act) return umodem_common_activate(sc, act); } -#endif USB_DETACH(umodem) {