diff options
| author |   Daniel Drake <dsd@gentoo.org> | 2006-04-19 19:31:36 +0000 |
|---|---|---|
| committer | Daniel Drake <dsd@gentoo.org> | 2006-04-19 19:31:36 +0000 |
| commit | cfe299fe288de48b93d772485e128050e196856d (patch) | |
| tree | b413afffc229de86246a5ea196f5e0022295c976 /net-wireless/ndiswrapper | |
| parent | removed fpc{,-source} move entires because of bug 119565 (diff) | |
| download | gentoo-2-cfe299fe288de48b93d772485e128050e196856d.tar.gz gentoo-2-cfe299fe288de48b93d772485e128050e196856d.tar.bz2 gentoo-2-cfe299fe288de48b93d772485e128050e196856d.zip | |
Small compile fix for 2.6.16, bug #127569
(Portage version: 2.1_pre7-r5)
Diffstat (limited to 'net-wireless/ndiswrapper')
| -rw-r--r-- | net-wireless/ndiswrapper/ChangeLog | 6 | ||||
| -rw-r--r-- | net-wireless/ndiswrapper/files/ndiswrapper-1.2-kernel-2.6.16.patch | 12 | ||||
| -rw-r--r-- | net-wireless/ndiswrapper/ndiswrapper-1.2-r1.ebuild | 3 |
3 files changed, 19 insertions, 2 deletions
diff --git a/net-wireless/ndiswrapper/ChangeLog b/net-wireless/ndiswrapper/ChangeLog index 1c141735bdad..0f8d930abb16 100644 --- a/net-wireless/ndiswrapper/ChangeLog +++ b/net-wireless/ndiswrapper/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-wireless/ndiswrapper # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ChangeLog,v 1.45 2006/04/11 15:41:09 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ChangeLog,v 1.46 2006/04/19 19:31:36 dsd Exp $ + + 19 Apr 2006; Daniel Drake <dsd@gentoo.org> + +files/ndiswrapper-1.2-kernel-2.6.16.patch, ndiswrapper-1.2-r1.ebuild: + Small compile fix for 2.6.16, bug #127569 *ndiswrapper-1.13 (11 Apr 2006) diff --git a/net-wireless/ndiswrapper/files/ndiswrapper-1.2-kernel-2.6.16.patch b/net-wireless/ndiswrapper/files/ndiswrapper-1.2-kernel-2.6.16.patch new file mode 100644 index 000000000000..14cfeca4949c --- /dev/null +++ b/net-wireless/ndiswrapper/files/ndiswrapper-1.2-kernel-2.6.16.patch @@ -0,0 +1,12 @@ +--- ndiswrapper-1.2/driver/loader.c.orig 2006-04-19 11:59:32.000000000 +0100 ++++ ndiswrapper-1.2/driver/loader.c 2006-04-19 12:00:51.000000000 +0100 +@@ -972,7 +972,9 @@ static int register_devices(struct load_ + if (ndiswrapper_usb_devices) { + memset(&ndiswrapper_usb_driver, 0, + sizeof(ndiswrapper_usb_driver)); ++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15) + ndiswrapper_usb_driver.owner = THIS_MODULE; ++#endif + ndiswrapper_usb_driver.name = DRIVER_NAME; + ndiswrapper_usb_driver.id_table = ndiswrapper_usb_devices; + ndiswrapper_usb_driver.probe = ndiswrapper_add_usb_device; diff --git a/net-wireless/ndiswrapper/ndiswrapper-1.2-r1.ebuild b/net-wireless/ndiswrapper/ndiswrapper-1.2-r1.ebuild index 34af9d486fe3..831c90d41aab 100644 --- a/net-wireless/ndiswrapper/ndiswrapper-1.2-r1.ebuild +++ b/net-wireless/ndiswrapper/ndiswrapper-1.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ndiswrapper-1.2-r1.ebuild,v 1.2 2006/01/07 16:22:20 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ndiswrapper-1.2-r1.ebuild,v 1.3 2006/04/19 19:31:36 dsd Exp $ inherit eutils linux-mod @@ -35,6 +35,7 @@ src_unpack() { epatch "${FILESDIR}"/${PN}-1.2-suspend2.patch || die "suspend2 patch failed" epatch "${FILESDIR}"/${PN}-1.2-kernel-2.6.14.patch || die "2.6.14 patch failed" + epatch "${FILESDIR}"/${PN}-1.2-kernel-2.6.16.patch || die "2.6.16 patch failed" convert_to_m ${S}/driver/Makefile } |