diff options
| author |   Stefan Schweizer <genstef@gentoo.org> | 2007-12-21 23:15:54 +0000 |
|---|---|---|
| committer | Stefan Schweizer <genstef@gentoo.org> | 2007-12-21 23:15:54 +0000 |
| commit | 156eadbd32fbebf21493d9fb048d30d821911820 (patch) | |
| tree | 8cabab2c9ad1a4d6b40748e44ed21060eb5d1823 /net-dialup/fcdsl | |
| parent | Add 0.35. (diff) | |
| download | gentoo-2-156eadbd32fbebf21493d9fb048d30d821911820.tar.gz gentoo-2-156eadbd32fbebf21493d9fb048d30d821911820.tar.bz2 gentoo-2-156eadbd32fbebf21493d9fb048d30d821911820.zip | |
2.6.24 patch only for fcdsl version1 thanks to Arnd Feldmueller
(Portage version: 2.1.4_rc11)
Diffstat (limited to 'net-dialup/fcdsl')
| -rw-r--r-- | net-dialup/fcdsl/ChangeLog | 6 | ||||
| -rw-r--r-- | net-dialup/fcdsl/fcdsl-2.6.37.ebuild | 7 | ||||
| -rw-r--r-- | net-dialup/fcdsl/files/fcdsl-2.6.24.diff | 22 |
3 files changed, 31 insertions, 4 deletions
diff --git a/net-dialup/fcdsl/ChangeLog b/net-dialup/fcdsl/ChangeLog index e1824969823a..954514a6ff44 100644 --- a/net-dialup/fcdsl/ChangeLog +++ b/net-dialup/fcdsl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-dialup/fcdsl # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/ChangeLog,v 1.30 2007/07/13 08:00:12 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/ChangeLog,v 1.31 2007/12/21 23:15:54 genstef Exp $ + + 21 Dec 2007; Stefan Schweizer <genstef@gentoo.org> + +files/fcdsl-2.6.24.diff, fcdsl-2.6.37.ebuild: + 2.6.24 patch only for fcdsl version1 thanks to Arnd Feldmueller 13 Jul 2007; Stefan Schweizer <genstef@gentoo.org> +files/fcdsl-2.6.22.diff, fcdsl-2.6.37.ebuild: diff --git a/net-dialup/fcdsl/fcdsl-2.6.37.ebuild b/net-dialup/fcdsl/fcdsl-2.6.37.ebuild index bd4e19a4398e..56f5b2cdb34b 100644 --- a/net-dialup/fcdsl/fcdsl-2.6.37.ebuild +++ b/net-dialup/fcdsl/fcdsl-2.6.37.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/fcdsl-2.6.37.ebuild,v 1.8 2007/07/13 08:00:12 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/fcdsl-2.6.37.ebuild,v 1.9 2007/12/21 23:15:54 genstef Exp $ inherit linux-mod eutils rpm @@ -35,7 +35,7 @@ pkg_setup() { FCDSL_FIRMWARES=("fds2base.bin" "fdssbase.bin" "fdsubase.frm" "fdlubase.frm" "fds2base.frm" "fdslbase.bin" "fdlabase.frm") - CONFIG_CHECK="ISDN_CAPI_CAPI20" + #CONFIG_CHECK="ISDN_CAPI_CAPI20" linux-mod_pkg_setup MODULE_NAMES="" @@ -74,7 +74,7 @@ src_unpack() { cd "${S}" mv usr/src/kernel-modules/fcdsl/src/src.fcdslusb1 \ usr/src/kernel-modules/fcdsl/src/src.fcdslusb - # do not fail even if some drivers are not present + # use -f to not fail even if some drivers are not present einfo "When you have FCDSL_CARDS set some errors are OK here" if kernel_is ge 2 6 22 ; then patch -p0 -f < "${FILESDIR}"/fcdsl-2.6.22.diff @@ -84,6 +84,7 @@ src_unpack() { patch -p0 -f < ${FILESDIR}/fcdslslusb-2.6.20.diff cd usr/src/kernel-modules/fcdsl/src kernel_is ge 2 6 20 && patch -p1 -f < ${FILESDIR}/usb-2.6.20.diff + kernel_is ge 2 6 24 && patch -p0 -f < ${FILESDIR}/fcdsl-2.6.24.diff cd "${S}" if use x86; then diff --git a/net-dialup/fcdsl/files/fcdsl-2.6.24.diff b/net-dialup/fcdsl/files/fcdsl-2.6.24.diff new file mode 100644 index 000000000000..544b96ead128 --- /dev/null +++ b/net-dialup/fcdsl/files/fcdsl-2.6.24.diff @@ -0,0 +1,22 @@ +--- src.fcdsl/driver.c.orig 2007-12-22 00:07:35.000000000 +0100 ++++ src.fcdsl/driver.c 2007-12-22 00:07:46.000000000 +0100 +@@ -121,7 +121,7 @@ + + static DECLARE_WAIT_QUEUE_HEAD(wait); + static DECLARE_WAIT_QUEUE_HEAD(capi_wait); +-static DECLARE_MUTEX_LOCKED(hotplug); ++static DECLARE_MUTEX(hotplug); + + #define SCHED_WAKEUP_CAPI { atomic_set (&thread_capi_flag, 1); wake_up_interruptible (&capi_wait); } + #define SCHED_WAKEUP { atomic_set (&got_kicked, 1); wake_up_interruptible (&wait); } +@@ -210,7 +210,9 @@ + cp->rx_dmabuf = NULL; + goto dma_rx_exit; + } +- res = request_irq (cp->irq, &irq_handler, SA_INTERRUPT | SA_SHIRQ, TARGET, cp); ++ /* Renamed function now: IRQF_DISABLED and IRQF_SHARED */ ++ /* Arnd Feldmueller <arnd.feldmueller@web.de> */ ++ res = request_irq (cp->irq, &irq_handler, IRQF_DISABLED | IRQF_SHARED, TARGET, cp); + if (res) { + LOG("Could not install irq handler.\n"); + goto dma_tx_exit; |