Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--net-dialup/fcdsl/ChangeLog9
-rw-r--r--net-dialup/fcdsl/fcdsl-2.6.37.ebuild310
-rw-r--r--net-dialup/fcdsl/files/digest-fcdsl-2.6.3712
-rw-r--r--net-dialup/fcdsl/files/fcdsl-2.6.20.diff348
-rw-r--r--net-dialup/fcdsl/files/fcdsl-2.6.22.diff459
-rw-r--r--net-dialup/fcdsl/files/fcdsl-2.6.23.diff249
-rw-r--r--net-dialup/fcdsl/files/fcdsl.diff157
-rw-r--r--net-dialup/fcdsl/files/fcdsl2.diff62
-rw-r--r--net-dialup/fcdsl/files/fcdslsl.diff63
-rw-r--r--net-dialup/fcdsl/files/fcdslslusb-2.6.20.diff23
-rw-r--r--net-dialup/fcdsl/files/usb-2.6.20.diff189
11 files changed, 8 insertions, 1873 deletions
diff --git a/net-dialup/fcdsl/ChangeLog b/net-dialup/fcdsl/ChangeLog
index 9b3e251a52e7..9d3c96a3717d 100644
--- a/net-dialup/fcdsl/ChangeLog
+++ b/net-dialup/fcdsl/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for net-dialup/fcdsl
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/ChangeLog,v 1.34 2008/01/06 01:33:29 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/ChangeLog,v 1.35 2008/01/06 01:35:57 sbriesen Exp $
+
+ 06 Jan 2008; Stefan Briesenick <sbriesen@gentoo.org>
+ -files/fcdsl-2.6.20.diff, -files/fcdslslusb-2.6.20.diff,
+ -files/usb-2.6.20.diff, -files/fcdsl-2.6.22.diff,
+ -files/fcdsl-2.6.23.diff, -files/fcdsl.diff, -files/fcdsl2.diff,
+ -files/fcdslsl.diff, -fcdsl-2.6.37.ebuild:
+ removed old ebuild, all drivers have their own package now
*fcdsl-0.1 (06 Jan 2008)
diff --git a/net-dialup/fcdsl/fcdsl-2.6.37.ebuild b/net-dialup/fcdsl/fcdsl-2.6.37.ebuild
deleted file mode 100644
index 8f927d475272..000000000000
--- a/net-dialup/fcdsl/fcdsl-2.6.37.ebuild
+++ /dev/null
@@ -1,310 +0,0 @@
-# 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.11 2007/12/25 20:27:53 genstef Exp $
-
-inherit linux-mod eutils rpm
-
-DESCRIPTION="AVM FRITZ!Card DSL drivers for 2.6 kernel"
-HOMEPAGE="http://www.avm.de/"
-
-SRC_HEAD="ftp://ftp.suse.com/pub/suse/i386/10.1/SUSE-Linux10.1-Beta3-Extra/suse"
-SRC_URI="x86? ( ${SRC_HEAD}/i586/km_${P/2.6./2.6-}.i586.rpm
- ${SRC_HEAD}/i586/avm_${P/2.6./2.6-}.i586.rpm )
- amd64? ( ${SRC_HEAD}/x86_64/km_${P/2.6./2.6-}.x86_64.rpm
- ${SRC_HEAD}/x86_64/avm_${P/2.6./2.6-}.x86_64.rpm )"
-
-LICENSE="LGPL-2"
-KEYWORDS="-* ~amd64 x86"
-IUSE="unicode"
-SLOT="0"
-
-RDEPEND=">=net-dialup/capi4k-utils-20040810"
-
-S="${WORKDIR}"
-
-pkg_setup() {
- use x86 && FCDSL_MODULES=("fcdsl2" "fcdslsl" "fcdslusb" "fcdslslusb" "fcdslusb2"
- "fcdsl" "fcdslusba")
- use amd64 && FCDSL_MODULES=("fcdsl2" "fcdslsl" "fcdslusb" "fcdslslusb" "fcdslusb2")
- FCDSL_NAMES=("AVM FRITZ!Card DSL v2.0" "AVM FRITZ!Card DSL SL"
- "AVM FRITZ!Card DSL USB" "AVM FRITZ!Card DSL SL USB" "AVM Fritz!Card DSL USB v2.0"
- "AVM FRITZ!Card DSL" "AVM Fritz!Card DSL USB analog")
- FCDSL_BUSTYPES=("pci" "pci" "usb" "usb" "usb" "pci" "usb")
- FCDSL_IDS=("1244:2900" "1244:2700" "057c:2300" "057c:3500"
- "057c:3600" "1131:5402" "057c:3000")
- FCDSL_FIRMWARES=("fds2base.bin" "fdssbase.bin" "fdsubase.frm" "fdlubase.frm"
- "fds2base.frm" "fdslbase.bin" "fdlabase.frm")
-
- #CONFIG_CHECK="ISDN_CAPI_CAPI20"
- linux-mod_pkg_setup
-
- MODULE_NAMES=""
- #Check existence of user selected cards
- if [ -n "${FCDSL_CARDS}" ] ; then
- for USERCARD in ${FCDSL_CARDS} ; do
- for ((CARD=0; CARD < ${#FCDSL_MODULES[*]}; CARD++)); do
- if [ "${USERCARD}" = "${FCDSL_MODULES[CARD]}" ]; then
- MODULE_NAMES="${MODULE_NAMES}
- ${FCDSL_MODULES[CARD]}(net:${WORKDIR}/usr/src/kernel-modules/fcdsl/src/src.${FCDSL_MODULES[CARD]})"
- continue 2
- fi
- done
- die "Driver for ${USERCARD} not present in ${P}"
- done
- else
- elog
- elog "You can control the modules which are built with the variable"
- elog "FCDSL_CARDS which should contain a blank separated list"
- elog "of a selection from the following cards:"
- elog " ${FCDSL_MODULES[*]}"
- for ((CARD=0; CARD < ${#FCDSL_MODULES[*]}; CARD++)); do
- MODULE_NAMES="${MODULE_NAMES} ${FCDSL_MODULES[CARD]}(net:${WORKDIR}/usr/src/kernel-modules/fcdsl/src/src.${FCDSL_MODULES[CARD]})"
- done
- fi
- BUILD_TARGETS="all"
- BUILD_PARAMS="KDIR='${KV_DIR}' LIBDIR='${S}'"
-}
-
-src_unpack() {
- local rpm_archive
- for rpm_archive in ${A} ; do
- rpm_unpack "${DISTDIR}/${rpm_archive}" || die "failed to unpack ${rpm_archive} file"
- done
-
- cd "${S}"
- mv usr/src/kernel-modules/fcdsl/src/src.fcdslusb1 \
- usr/src/kernel-modules/fcdsl/src/src.fcdslusb
- # 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
- elif kernel_is ge 2 6 20 ; then
- patch -p0 -f < ${FILESDIR}/fcdsl-2.6.20.diff
- fi
- 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
- cd "${S}"
-
- if use x86; then
- for ((CARD=0; CARD < ${#FCDSL_MODULES[*]}; CARD++)); do
- cd usr/src/kernel-modules/fcdsl/src/src.${FCDSL_MODULES[CARD]}
- [ -f "${FILESDIR}/${FCDSL_MODULES[CARD]}.diff" ] && epatch "${FILESDIR}/${FCDSL_MODULES[CARD]}.diff"
- cd "${S}"
- done
- fi
- cd usr/src/kernel-modules/fcdsl/src
- kernel_is ge 2 6 23 && patch -p0 -f < ${FILESDIR}/fcdsl-2.6.23.diff
- cd "${S}"
-
- # convert docs from latin1 to UTF-8
- if use unicode; then
- for i in usr/share/doc/packages/avm_fcdsl/compile-help-german.txt etc/drdsl/drdsl.ini; do
- einfo "Converting '${i##*/}' to UTF-8"
- iconv -f latin1 -t utf8 -o "${i}~" "${i}" && mv -f "${i}~" "${i}" || rm -f "${i}~"
- done
- fi
-}
-
-src_install() {
- linux-mod_src_install
-
- for ((CARD=0; CARD < ${#FCDSL_MODULES[*]}; CARD++)); do
- if [ -n "${FCDSL_CARDS}" ] ; then
- INS=""
- for USERCARD in ${FCDSL_CARDS} ; do
- if [ "${USERCARD}" = "${FCDSL_MODULES[CARD]}" ]; then INS="1"; fi
- done
- if [ -z "${INS}" ]; then continue; fi
- fi
-
- insinto /lib/firmware/isdn
- doins "${WORKDIR}/lib/firmware/isdn/${FCDSL_FIRMWARES[CARD]}"
- done
-
- insinto /etc/drdsl
- doins etc/drdsl/drdsl.ini
- dosbin sbin/drdsl
-
- cd usr/share/doc/packages/avm_fcdsl
- dodoc *.txt
- dohtml *.html *.jpg
- docinto example
- dodoc example/*
-}
-
-pkg_postinst() {
- linux-mod_pkg_postinst
-
- elog "The preferred way to setup your card is either /etc/capi.conf"
- elog "or hotplug, since USB-Cards are detected automatically."
- elog
- elog "If you want to setup your DSL card driver and create a peer file, please run:"
- elog " etc-update"
- elog " emerge --config '=${CATEGORY}/${PF}'"
- elog " /etc/init.d/capi start"
- elog " drdsl"
- #ewarn
- #ewarn "'drdsl' has now its own ebuild. Please emerge net-dialup/drdsl."
- epause 10
-}
-
-#pkg-config functions
-
-detect_fcdsl_card() {
- PCI_IDS=""
- USB_IDS=""
- if [ -d /sys/bus ]; then
- if [ -d /sys/bus/pci/devices ]; then
- cd /sys/bus/pci/devices
- for PCI_DEVICE in *; do
- vendor="$(< ${PCI_DEVICE}/vendor)"
- device="$(< ${PCI_DEVICE}/device)"
- PCI_IDS="${PCI_IDS}${vendor:2}:${device:2} "
- done
- fi
- if [ -d /sys/bus/usb/devices ]; then
- cd /sys/bus/usb/devices
- for USB_DEVICE in [0-9]*; do
- if [ -f ${USB_DEVICE}/idVendor ]; then
- USB_IDS="${USB_IDS}$(< ${USB_DEVICE}/idVendor):$(< ${USB_DEVICE}/idProduct) "
- fi
- done
- fi
- fi
-
- FCDSL_MODULE=""
- for ((CARD=0; CARD < ${#FCDSL_IDS[*]}; CARD++)); do
- BUS_IDS=""
- if [ "${FCDSL_BUSTYPES[CARD]}" == "pci" ]; then
- BUS_IDS="${PCI_IDS}"
- else
- BUS_IDS="${USB_IDS}"
- fi
- for BUS_ID in ${BUS_IDS}; do
- if [ "${BUS_ID}" == "${FCDSL_IDS[CARD]}" ]; then
- einfo "Found: ${FCDSL_NAMES[CARD]}"
- FCDSL_FIRMWARE="${FCDSL_FIRMWARES[CARD]}"
- FCDSL_MODULE="${FCDSL_MODULES[CARD]}"
- fi
- done
- done
- if [ "${FCDSL_MODULE}" == "" ]; then
- ewarn "No AVM FRITZ!Card DSL found!"
- fi
-}
-
-readpassword() {
- VALUE_1=""
- VALUE_2=""
- while true; do
- einfo "Enter your password:"
- read -r -s VALUE_1
- einfo "Retype your password:"
- read -r -s VALUE_2
- if [ "${VALUE_1}" == "" ]; then
- echo
- eerror "You entered a blank password. Please try again."
- echo
- else
- if [ "${VALUE_1}" == "${VALUE_2}" ] ; then
- break
- else
- echo
- eerror "Your password entries do not match. Please try again."
- echo
- fi
- fi
- done
- eval ${1}=${VALUE_1}
-
- VALUE_1=""
- VALUE_2=""
- unset VALUE_1
- unset VALUE_2
-}
-
-readvalue() {
- VALUE=""
- while true; do
- einfo "${2}:"
- read VALUE
- if [ "${VALUE}" == "" ]; then
- eerror "You entered a blank value. Please try again."
- echo
- else
- break
- fi
- done
- eval ${1}=${VALUE}
-
- VALUE=""
- unset VALUE
-}
-
-pkg_config() {
- detect_fcdsl_card
-
- if [ "${FCDSL_MODULE}" != "" ]; then
- readvalue FCDSL_PROVIDER "Enter the name of your ISP"
- if [ ! -e "/etc/ppp/peers/${FCDSL_PROVIDER}" ]; then
- readvalue FCDSL_USER "Enter your user name"
- if ! grep "${FCDSL_USER}" /etc/ppp/pap-secrets >/dev/null 2>&1; then
- readpassword FCDSL_PASSWORD
- echo '"'${FCDSL_USER}'" * "'${FCDSL_PASSWORD}'"' >>/etc/ppp/pap-secrets
- unset FCDSL_PASSWORD
- cat <<EOF >"/etc/ppp/peers/${FCDSL_PROVIDER}"
-connect ""
-ipcp-accept-remote
-ipcp-accept-local
-usepeerdns
-defaultroute
-user "${FCDSL_USER}"
-hide-password
-sync
-noauth
-lcp-echo-interval 5
-lcp-echo-failure 3
-lcp-max-configure 50
-lcp-max-terminate 2
-noccp
-noipx
-noproxyarp
-mru 1492
-mtu 1492
-linkname "${FCDSL_PROVIDER}"
-ipparam internet
-plugin capiplugin.so
-avmadsl
-:
-/dev/null
-EOF
- echo
- echo
- echo
- einfo "Now, you can start an ADSL connection with either"
- einfo " pon \"${FCDSL_PROVIDER}\""
- einfo "or"
- einfo " pppd call \"${FCDSL_PROVIDER}\""
- else
- ewarn "User \"${FCDSL_USER}\" already exists in \"/etc/ppp/pap-secrets\"!"
- fi
- else
- ewarn "Peer file \"/etc/ppp/peers/${FCDSL_PROVIDER}\" already exists!"
- fi
-
- #Uncomment correspondent lines in /etc/capi.conf & /etc/modules.d/fcdsl
- if [ -f /etc/capi.conf ]; then
- sed -i -e "s:^#${FCDSL_MODULE}:${FCDSL_MODULE}:" \
- /etc/capi.conf >/dev/null 2>&1
- fi
- if [ -f /etc/modules.d/fcdsl ]; then
- sed -i -e "s:^#options ${FCDSL_MODULE}:options ${FCDSL_MODULE}:" \
- /etc/modules.d/fcdsl >/dev/null 2>&1
- fi
- else
- ewarn "No AVM FRITZ!Card DSL found!"
- fi
- unset FCDSL_PROVIDER
- unset FCDSL_USER
-}
diff --git a/net-dialup/fcdsl/files/digest-fcdsl-2.6.37 b/net-dialup/fcdsl/files/digest-fcdsl-2.6.37
deleted file mode 100644
index 1623b4ff6e5b..000000000000
--- a/net-dialup/fcdsl/files/digest-fcdsl-2.6.37
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 cdbb9f6bbaa4d44f0346ed81e089c202 avm_fcdsl-2.6-37.i586.rpm 1059204
-RMD160 3ab3bb6a8006167004c93c5348f07d4fc6fc2a96 avm_fcdsl-2.6-37.i586.rpm 1059204
-SHA256 6f3531eaa2583a50586d6f29c7f3a48cd16a507ea4d1cbc1ccb2e2d718396021 avm_fcdsl-2.6-37.i586.rpm 1059204
-MD5 0cceb1102af309056d00df7cc1a6a4d5 avm_fcdsl-2.6-37.x86_64.rpm 1064850
-RMD160 f0a76d19f0ed2221f872e42dbc38cba874d31137 avm_fcdsl-2.6-37.x86_64.rpm 1064850
-SHA256 b9498312286e7d3f8c3bd7ac202e7bd75245fd93dc9aa8f2c784ace90a955757 avm_fcdsl-2.6-37.x86_64.rpm 1064850
-MD5 c0613d5e257cb6f27fbaa9d197ad92d1 km_fcdsl-2.6-37.i586.rpm 2447670
-RMD160 a8372219af67b1a9d5c27d0c382f30b5c05a2e7e km_fcdsl-2.6-37.i586.rpm 2447670
-SHA256 8d767da36061ed4a0a9ee84b989d1810bcde0dab0474087b7e85e2bbc0751e4e km_fcdsl-2.6-37.i586.rpm 2447670
-MD5 db9062e2a9725814ca5f5098fe30d864 km_fcdsl-2.6-37.x86_64.rpm 1792580
-RMD160 8484ee301a6d603a7d9d0e1c97bc8d542e31833c km_fcdsl-2.6-37.x86_64.rpm 1792580
-SHA256 0412b03faa8b4f0e0b90e915e9492ae345fe7a797270b682de64b65ed9d20d33 km_fcdsl-2.6-37.x86_64.rpm 1792580
diff --git a/net-dialup/fcdsl/files/fcdsl-2.6.20.diff b/net-dialup/fcdsl/files/fcdsl-2.6.20.diff
deleted file mode 100644
index 268504c99913..000000000000
--- a/net-dialup/fcdsl/files/fcdsl-2.6.20.diff
+++ /dev/null
@@ -1,348 +0,0 @@
-diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdsl/driver.c usr/src/kernel-modules/fcdsl/src/src.fcdsl/driver.c
---- usr/src/kernel-modules/fcdsl/src/src.fcdsl/driver.c
-+++ usr/src/kernel-modules/fcdsl/src/src.fcdsl/driver.c
-@@ -1823,19 +1823,19 @@
-
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
--int driver_init (void) {
-+int avm_driver_init (void) {
-
- return (NULL != (capi_lib = link_library (&capi_card)));
--} /* driver_init */
-+} /* avm_driver_init */
-
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
--void driver_exit (void) {
-+void avm_driver_exit (void) {
-
- assert (capi_lib != NULL);
- free_library ();
- capi_lib = NULL;
--} /* driver_exit */
-+} /* avm_driver_exit */
-
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
-diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdsl/driver.h usr/src/kernel-modules/fcdsl/src/src.fcdsl/driver.h
---- usr/src/kernel-modules/fcdsl/src/src.fcdsl/driver.h
-+++ usr/src/kernel-modules/fcdsl/src/src.fcdsl/driver.h
-@@ -23,7 +23,7 @@
- #ifndef __have_driver_h__
- #define __have_driver_h__
-
--#include <linux/config.h>
-+#include <linux/autoconf.h>
- #include <linux/pci.h>
- #include <linux/list.h>
- #include <linux/skbuff.h>
-@@ -139,8 +139,8 @@
-
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
--extern int driver_init (void);
--extern void driver_exit (void);
-+extern int avm_driver_init (void);
-+extern void avm_driver_exit (void);
-
- #endif
-
-diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdsl/main.c usr/src/kernel-modules/fcdsl/src/src.fcdsl/main.c
---- usr/src/kernel-modules/fcdsl/src/src.fcdsl/main.c
-+++ usr/src/kernel-modules/fcdsl/src/src.fcdsl/main.c
-@@ -23,7 +23,7 @@
- #include <stdarg.h>
- #include <asm/uaccess.h>
- #include <linux/pci.h>
--#include <linux/config.h>
-+#include <linux/autoconf.h>
- #include <linux/version.h>
- #include <linux/kernel.h>
- #include <linux/module.h>
-@@ -115,14 +115,14 @@
- return -ENODEV;
- }
- NOTE( "Loading...\n");
-- if (!driver_init ()) {
-+ if (!avm_driver_init ()) {
- ERROR("Error: Driver library not available.\n");
- ERROR("Not loaded.\n");
- return -ENOSYS;
- }
- if (0 != (res = add_card (dev))) {
- ERROR("Not loaded.\n");
-- driver_exit ();
-+ avm_driver_exit ();
- return res;
- }
- NOTE("Loaded.\n");
-@@ -143,7 +143,7 @@
- NOTE("Removing...\n");
- remove_ctrls (card);
- NOTE("Removed.\n");
-- driver_exit ();
-+ avm_driver_exit ();
- #ifndef NDEBUG
- if (hallocated() != 0) {
- ERROR( "%u bytes leaked.\n", hallocated());
-diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdsl2/driver.c usr/src/kernel-modules/fcdsl/src/src.fcdsl2/driver.c
---- usr/src/kernel-modules/fcdsl/src/src.fcdsl2/driver.c
-+++ usr/src/kernel-modules/fcdsl/src/src.fcdsl2/driver.c
-@@ -1576,19 +1576,19 @@
-
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
--int driver_init (void) {
-+int avm_driver_init (void) {
-
- return (NULL != (capi_lib = link_library (&capi_card)));
--} /* driver_init */
-+} /* avm_driver_init */
-
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
--void driver_exit (void) {
-+void avm_driver_exit (void) {
-
- assert (capi_lib);
- free_library ();
- capi_lib = NULL;
--} /* driver_exit */
-+} /* avm_driver_exit */
-
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
-diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdsl2/driver.h usr/src/kernel-modules/fcdsl/src/src.fcdsl2/driver.h
---- usr/src/kernel-modules/fcdsl/src/src.fcdsl2/driver.h
-+++ usr/src/kernel-modules/fcdsl/src/src.fcdsl2/driver.h
-@@ -24,7 +24,7 @@
- #define __have_driver_h__
-
- #include <asm/atomic.h>
--#include <linux/config.h>
-+#include <linux/autoconf.h>
- #include <linux/skbuff.h>
- #include <linux/pci.h>
- #include <linux/spinlock.h>
-@@ -161,8 +161,8 @@
-
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
--extern int driver_init (void);
--extern void driver_exit (void);
-+extern int avm_driver_init (void);
-+extern void avm_driver_exit (void);
-
- #endif
-
-diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdsl2/main.c usr/src/kernel-modules/fcdsl/src/src.fcdsl2/main.c
---- usr/src/kernel-modules/fcdsl/src/src.fcdsl2/main.c
-+++ usr/src/kernel-modules/fcdsl/src/src.fcdsl2/main.c
-@@ -23,7 +23,7 @@
- #include <stdarg.h>
- #include <asm/uaccess.h>
- #include <linux/pci.h>
--#include <linux/config.h>
-+#include <linux/autoconf.h>
- #include <linux/version.h>
- #include <linux/kernel.h>
- #include <linux/module.h>
-@@ -116,14 +116,14 @@
- return -ENODEV;
- }
- NOTE("Loading...\n");
-- if (!driver_init ()) {
-+ if (!avm_driver_init ()) {
- ERROR("Error: Driver library not available.\n");
- NOTE("Not loaded.\n");
- return -ENOSYS;
- }
- if (0 != (res = add_card (dev))) {
- NOTE("Not loaded.\n");
-- driver_exit ();
-+ avm_driver_exit ();
- return res;
- }
- NOTE("Loaded.\n");
-@@ -144,7 +144,7 @@
- NOTE("Removing...\n");
- remove_ctrls (cp);
- NOTE("Removed.\n");
-- driver_exit ();
-+ avm_driver_exit ();
- #ifndef NDEBUG
- if (hallocated() != 0) {
- ERROR("%u bytes leaked.\n", hallocated());
-diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdslsl/driver.c usr/src/kernel-modules/fcdsl/src/src.fcdslsl/driver.c
---- usr/src/kernel-modules/fcdsl/src/src.fcdslsl/driver.c
-+++ usr/src/kernel-modules/fcdsl/src/src.fcdslsl/driver.c
-@@ -1577,19 +1577,19 @@
-
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
--int driver_init (void) {
-+int avm_driver_init (void) {
-
- return (NULL != (capi_lib = link_library (&capi_card)));
--} /* driver_init */
-+} /* avm_driver_init */
-
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
--void driver_exit (void) {
-+void avm_driver_exit (void) {
-
- assert (capi_lib);
- free_library ();
- capi_lib = NULL;
--} /* driver_exit */
-+} /* avm_driver_exit */
-
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
-diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdslsl/driver.h usr/src/kernel-modules/fcdsl/src/src.fcdslsl/driver.h
---- usr/src/kernel-modules/fcdsl/src/src.fcdslsl/driver.h
-+++ usr/src/kernel-modules/fcdsl/src/src.fcdslsl/driver.h
-@@ -24,7 +24,7 @@
- #define __have_driver_h__
-
- #include <asm/atomic.h>
--#include <linux/config.h>
-+#include <linux/autoconf.h>
- #include <linux/skbuff.h>
- #include <linux/pci.h>
- #include <linux/spinlock.h>
-@@ -161,8 +161,8 @@
-
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
--extern int driver_init (void);
--extern void driver_exit (void);
-+extern int avm_driver_init (void);
-+extern void avm_driver_exit (void);
-
- #endif
-
-diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdslsl/main.c usr/src/kernel-modules/fcdsl/src/src.fcdslsl/main.c
---- usr/src/kernel-modules/fcdsl/src/src.fcdslsl/main.c
-+++ usr/src/kernel-modules/fcdsl/src/src.fcdslsl/main.c
-@@ -23,7 +23,7 @@
- #include <stdarg.h>
- #include <asm/uaccess.h>
- #include <linux/pci.h>
--#include <linux/config.h>
-+#include <linux/autoconf.h>
- #include <linux/version.h>
- #include <linux/kernel.h>
- #include <linux/module.h>
-@@ -116,14 +116,14 @@
- return -ENODEV;
- }
- NOTE("Loading...\n");
-- if (!driver_init ()) {
-+ if (!avm_driver_init ()) {
- ERROR("Error: Driver library not available.\n");
- NOTE("Not loaded.\n");
- return -ENOSYS;
- }
- if (0 != (res = add_card (dev))) {
- NOTE("Not loaded.\n");
-- driver_exit ();
-+ avm_driver_exit ();
- return res;
- }
- NOTE("Loaded.\n");
-@@ -144,7 +144,7 @@
- NOTE("Removing...\n");
- remove_ctrls (cp);
- NOTE("Removed.\n");
-- driver_exit ();
-+ avm_driver_exit ();
- #ifndef NDEBUG
- if (hallocated() != 0) {
- ERROR("%u bytes leaked.\n", hallocated());
-diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdslslusb/driver.h usr/src/kernel-modules/fcdsl/src/src.fcdslslusb/driver.h
---- usr/src/kernel-modules/fcdsl/src/src.fcdslslusb/driver.h
-+++ usr/src/kernel-modules/fcdsl/src/src.fcdslslusb/driver.h
-@@ -24,7 +24,7 @@
- #define __have_driver_h__
-
- #include <asm/atomic.h>
--#include <linux/config.h>
-+#include <linux/autoconf.h>
- #include <linux/skbuff.h>
- #include <linux/spinlock.h>
- #include <linux/usb.h>
-diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdslslusb/main.c usr/src/kernel-modules/fcdsl/src/src.fcdslslusb/main.c
---- usr/src/kernel-modules/fcdsl/src/src.fcdslslusb/main.c
-+++ usr/src/kernel-modules/fcdsl/src/src.fcdslslusb/main.c
-@@ -27,7 +27,7 @@
- #include <stdarg.h>
- #include <asm/uaccess.h>
- #include <linux/usb.h>
--#include <linux/config.h>
-+#include <linux/autoconf.h>
- #include <linux/version.h>
- #include <linux/kernel.h>
- #include <linux/module.h>
-diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdslusb/driver.h usr/src/kernel-modules/fcdsl/src/src.fcdslusb/driver.h
---- usr/src/kernel-modules/fcdsl/src/src.fcdslusb/driver.h
-+++ usr/src/kernel-modules/fcdsl/src/src.fcdslusb/driver.h
-@@ -25,7 +25,7 @@
-
- #include <asm/semaphore.h>
- #include <asm/atomic.h>
--#include <linux/config.h>
-+#include <linux/autoconf.h>
- #include <linux/skbuff.h>
- #include <linux/capi.h>
- #include <linux/isdn/capilli.h>
-diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdslusb2/driver.h usr/src/kernel-modules/fcdsl/src/src.fcdslusb2/driver.h
---- usr/src/kernel-modules/fcdsl/src/src.fcdslusb2/driver.h
-+++ usr/src/kernel-modules/fcdsl/src/src.fcdslusb2/driver.h
-@@ -24,7 +24,7 @@
- #define __have_driver_h__
-
- #include <asm/atomic.h>
--#include <linux/config.h>
-+#include <linux/autoconf.h>
- #include <linux/skbuff.h>
- #include <linux/spinlock.h>
- #include <linux/usb.h>
-diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdslusb2/main.c usr/src/kernel-modules/fcdsl/src/src.fcdslusb2/main.c
---- usr/src/kernel-modules/fcdsl/src/src.fcdslusb2/main.c
-+++ usr/src/kernel-modules/fcdsl/src/src.fcdslusb2/main.c
-@@ -27,7 +27,7 @@
- #include <stdarg.h>
- #include <asm/uaccess.h>
- #include <linux/usb.h>
--#include <linux/config.h>
-+#include <linux/autoconf.h>
- #include <linux/version.h>
- #include <linux/kernel.h>
- #include <linux/module.h>
-diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdslusba/driver.h usr/src/kernel-modules/fcdsl/src/src.fcdslusba/driver.h
---- usr/src/kernel-modules/fcdsl/src/src.fcdslusba/driver.h
-+++ usr/src/kernel-modules/fcdsl/src/src.fcdslusba/driver.h
-@@ -24,7 +24,7 @@
- #define __have_driver_h__
-
- #include <asm/atomic.h>
--#include <linux/config.h>
-+#include <linux/autoconf.h>
- #include <linux/skbuff.h>
- #include <linux/spinlock.h>
- #include <linux/usb.h>
-diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdslusba/main.c usr/src/kernel-modules/fcdsl/src/src.fcdslusba/main.c
---- usr/src/kernel-modules/fcdsl/src/src.fcdslusba/main.c
-+++ usr/src/kernel-modules/fcdsl/src/src.fcdslusba/main.c
-@@ -27,7 +27,7 @@
- #include <stdarg.h>
- #include <asm/uaccess.h>
- #include <linux/usb.h>
--#include <linux/config.h>
-+#include <linux/autoconf.h>
- #include <linux/version.h>
- #include <linux/kernel.h>
- #include <linux/module.h>
diff --git a/net-dialup/fcdsl/files/fcdsl-2.6.22.diff b/net-dialup/fcdsl/files/fcdsl-2.6.22.diff
deleted file mode 100644
index 7cb3925737fa..000000000000
--- a/net-dialup/fcdsl/files/fcdsl-2.6.22.diff
+++ /dev/null
@@ -1,459 +0,0 @@
-diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdsl/driver.c usr/src/kernel-modules/fcdsl/src/src.fcdsl/driver.c
---- usr/src/kernel-modules/fcdsl/src/src.fcdsl/driver.c
-+++ usr/src/kernel-modules/fcdsl/src/src.fcdsl/driver.c
-@@ -122,7 +122,7 @@
- static void rx_task (unsigned long data);
- static void tx_handler (card_p cp);
- static void rx_handler (card_p cp);
--static irqreturn_t irq_handler (int, void *, struct pt_regs *);
-+static irqreturn_t irq_handler (int, void *);
- static void enable_thread (void);
- static void disable_thread (void);
- static int make_thread (void);
-@@ -1549,7 +1549,7 @@
-
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
--static irqreturn_t irq_handler (int irq, void * args, struct pt_regs * regs) {
-+static irqreturn_t irq_handler (int irq, void * args) {
- unsigned long flags;
- int tx_flag = 0;
- int rx_flag = 0;
-@@ -1557,7 +1557,6 @@
- card_p cp;
-
- UNUSED_ARG (irq);
-- UNUSED_ARG (regs);
- if (capi_card != (card_p) args) {
- return IRQ_NONE;
- }
-@@ -1797,19 +1796,19 @@
-
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
--int driver_init (void) {
-+int avm_driver_init (void) {
-
- return (NULL != (capi_lib = link_library (&capi_card)));
--} /* driver_init */
-+} /* avm_driver_init */
-
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
--void driver_exit (void) {
-+void avm_driver_exit (void) {
-
- assert (capi_lib != NULL);
- free_library ();
- capi_lib = NULL;
--} /* driver_exit */
-+} /* avm_driver_exit */
-
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
-diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdsl/driver.h usr/src/kernel-modules/fcdsl/src/src.fcdsl/driver.h
---- usr/src/kernel-modules/fcdsl/src/src.fcdsl/driver.h
-+++ usr/src/kernel-modules/fcdsl/src/src.fcdsl/driver.h
-@@ -23,7 +23,7 @@
- #ifndef __have_driver_h__
- #define __have_driver_h__
-
--#include <linux/config.h>
-+#include <linux/autoconf.h>
- #include <linux/pci.h>
- #include <linux/list.h>
- #include <linux/skbuff.h>
-@@ -139,8 +139,8 @@
-
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
--extern int driver_init (void);
--extern void driver_exit (void);
-+extern int avm_driver_init (void);
-+extern void avm_driver_exit (void);
-
- #endif
-
-diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdsl/main.c usr/src/kernel-modules/fcdsl/src/src.fcdsl/main.c
---- usr/src/kernel-modules/fcdsl/src/src.fcdsl/main.c
-+++ usr/src/kernel-modules/fcdsl/src/src.fcdsl/main.c
-@@ -23,7 +23,7 @@
- #include <stdarg.h>
- #include <asm/uaccess.h>
- #include <linux/pci.h>
--#include <linux/config.h>
-+#include <linux/autoconf.h>
- #include <linux/version.h>
- #include <linux/kernel.h>
- #include <linux/module.h>
-@@ -115,14 +115,14 @@
- return -ENODEV;
- }
- NOTE( "Loading...\n");
-- if (!driver_init ()) {
-+ if (!avm_driver_init ()) {
- ERROR("Error: Driver library not available.\n");
- ERROR("Not loaded.\n");
- return -ENOSYS;
- }
- if (0 != (res = add_card (dev))) {
- ERROR("Not loaded.\n");
-- driver_exit ();
-+ avm_driver_exit ();
- return res;
- }
- NOTE("Loaded.\n");
-@@ -143,7 +143,7 @@
- NOTE("Removing...\n");
- remove_ctrls (card);
- NOTE("Removed.\n");
-- driver_exit ();
-+ avm_driver_exit ();
- #ifndef NDEBUG
- if (hallocated() != 0) {
- ERROR( "%u bytes leaked.\n", hallocated());
-@@ -196,7 +196,7 @@
- return -ENOSYS;
- }
-
-- if (0 == (err = pci_module_init (&fcdsl_driver))) {
-+ if (0 == (err = pci_register_driver (&fcdsl_driver))) {
- LOG("PCI driver registered.\n");
- register_capi_driver (&fcdsl_capi_driver);
- LOG("CAPI driver registered.\n");
-diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdsl2/devif.c usr/src/kernel-modules/fcdsl/src/src.fcdsl2/devif.c
---- usr/src/kernel-modules/fcdsl/src/src.fcdsl2/devif.c
-+++ usr/src/kernel-modules/fcdsl/src/src.fcdsl2/devif.c
-@@ -747,12 +747,11 @@
-
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
--irqreturn_t device_interrupt (int irq, void * args, struct pt_regs * regs) {
-+irqreturn_t device_interrupt (int irq, void * args) {
- unsigned long intpins;
- card_p cp = (card_p) args;
-
- UNUSED_ARG (irq);
-- UNUSED_ARG (regs);
- assert (capi_card == cp);
-
- intpins = PINL (cp->mmio_base + C6205_PCI_HSR_OFFSET);
-diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdsl2/devif.h usr/src/kernel-modules/fcdsl/src/src.fcdsl2/devif.h
---- usr/src/kernel-modules/fcdsl/src/src.fcdsl2/devif.h
-+++ usr/src/kernel-modules/fcdsl/src/src.fcdsl2/devif.h
-@@ -80,7 +80,7 @@
- extern void set_interrupt_callback (irq_callback_t, void *);
- extern void clear_interrupt_callback (void);
-
--extern irqreturn_t device_interrupt (int, void *, struct pt_regs *);
-+extern irqreturn_t device_interrupt (int, void *);
-
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
-diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdsl2/driver.c usr/src/kernel-modules/fcdsl/src/src.fcdsl2/driver.c
---- usr/src/kernel-modules/fcdsl/src/src.fcdsl2/driver.c
-+++ usr/src/kernel-modules/fcdsl/src/src.fcdsl2/driver.c
-@@ -1563,19 +1563,19 @@
-
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
--int driver_init (void) {
-+int avm_driver_init (void) {
-
- return (NULL != (capi_lib = link_library (&capi_card)));
--} /* driver_init */
-+} /* avm_driver_init */
-
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
--void driver_exit (void) {
-+void avm_driver_exit (void) {
-
- assert (capi_lib);
- free_library ();
- capi_lib = NULL;
--} /* driver_exit */
-+} /* avm_driver_exit */
-
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
-diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdsl2/driver.h usr/src/kernel-modules/fcdsl/src/src.fcdsl2/driver.h
---- usr/src/kernel-modules/fcdsl/src/src.fcdsl2/driver.h
-+++ usr/src/kernel-modules/fcdsl/src/src.fcdsl2/driver.h
-@@ -24,7 +24,7 @@
- #define __have_driver_h__
-
- #include <asm/atomic.h>
--#include <linux/config.h>
-+#include <linux/autoconf.h>
- #include <linux/skbuff.h>
- #include <linux/pci.h>
- #include <linux/spinlock.h>
-@@ -161,8 +161,8 @@
-
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
--extern int driver_init (void);
--extern void driver_exit (void);
-+extern int avm_driver_init (void);
-+extern void avm_driver_exit (void);
-
- #endif
-
-diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdsl2/main.c usr/src/kernel-modules/fcdsl/src/src.fcdsl2/main.c
---- usr/src/kernel-modules/fcdsl/src/src.fcdsl2/main.c
-+++ usr/src/kernel-modules/fcdsl/src/src.fcdsl2/main.c
-@@ -23,7 +23,7 @@
- #include <stdarg.h>
- #include <asm/uaccess.h>
- #include <linux/pci.h>
--#include <linux/config.h>
-+#include <linux/autoconf.h>
- #include <linux/version.h>
- #include <linux/kernel.h>
- #include <linux/module.h>
-@@ -116,14 +116,14 @@
- return -ENODEV;
- }
- NOTE("Loading...\n");
-- if (!driver_init ()) {
-+ if (!avm_driver_init ()) {
- ERROR("Error: Driver library not available.\n");
- NOTE("Not loaded.\n");
- return -ENOSYS;
- }
- if (0 != (res = add_card (dev))) {
- NOTE("Not loaded.\n");
-- driver_exit ();
-+ avm_driver_exit ();
- return res;
- }
- NOTE("Loaded.\n");
-@@ -144,7 +144,7 @@
- NOTE("Removing...\n");
- remove_ctrls (cp);
- NOTE("Removed.\n");
-- driver_exit ();
-+ avm_driver_exit ();
- #ifndef NDEBUG
- if (hallocated() != 0) {
- ERROR("%u bytes leaked.\n", hallocated());
-@@ -195,7 +195,7 @@
- NOTE("-- 32 bit CAPI driver --\n");
- #endif
-
-- if (0 == (err = pci_module_init (&fcdsl2_driver))) {
-+ if (0 == (err = pci_register_driver (&fcdsl2_driver))) {
- LOG("PCI driver registered.\n");
- register_capi_driver (&fcdsl2_capi_driver);
- LOG("CAPI driver registered.\n");
-diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdslsl/devif.c usr/src/kernel-modules/fcdsl/src/src.fcdslsl/devif.c
---- usr/src/kernel-modules/fcdsl/src/src.fcdslsl/devif.c
-+++ usr/src/kernel-modules/fcdsl/src/src.fcdslsl/devif.c
-@@ -747,12 +747,11 @@
-
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
--irqreturn_t device_interrupt (int irq, void * args, struct pt_regs * regs) {
-+irqreturn_t device_interrupt (int irq, void * args) {
- unsigned long intpins;
- card_p cp = (card_p) args;
-
- UNUSED_ARG (irq);
-- UNUSED_ARG (regs);
- assert (capi_card == cp);
-
- intpins = PINL (cp->mmio_base + C6205_PCI_HSR_OFFSET);
-diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdslsl/devif.h usr/src/kernel-modules/fcdsl/src/src.fcdslsl/devif.h
---- usr/src/kernel-modules/fcdsl/src/src.fcdslsl/devif.h
-+++ usr/src/kernel-modules/fcdsl/src/src.fcdslsl/devif.h
-@@ -80,7 +80,7 @@
- extern void set_interrupt_callback (irq_callback_t, void *);
- extern void clear_interrupt_callback (void);
-
--extern irqreturn_t device_interrupt (int, void *, struct pt_regs *);
-+extern irqreturn_t device_interrupt (int, void *);
-
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
-diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdslsl/driver.c usr/src/kernel-modules/fcdsl/src/src.fcdslsl/driver.c
---- usr/src/kernel-modules/fcdsl/src/src.fcdslsl/driver.c
-+++ usr/src/kernel-modules/fcdsl/src/src.fcdslsl/driver.c
-@@ -1563,19 +1563,19 @@
-
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
--int driver_init (void) {
-+int avm_driver_init (void) {
-
- return (NULL != (capi_lib = link_library (&capi_card)));
--} /* driver_init */
-+} /* avm_driver_init */
-
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
--void driver_exit (void) {
-+void avm_driver_exit (void) {
-
- assert (capi_lib);
- free_library ();
- capi_lib = NULL;
--} /* driver_exit */
-+} /* avm_driver_exit */
-
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
-diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdslsl/driver.h usr/src/kernel-modules/fcdsl/src/src.fcdslsl/driver.h
---- usr/src/kernel-modules/fcdsl/src/src.fcdslsl/driver.h
-+++ usr/src/kernel-modules/fcdsl/src/src.fcdslsl/driver.h
-@@ -24,7 +24,7 @@
- #define __have_driver_h__
-
- #include <asm/atomic.h>
--#include <linux/config.h>
-+#include <linux/autoconf.h>
- #include <linux/skbuff.h>
- #include <linux/pci.h>
- #include <linux/spinlock.h>
-@@ -161,8 +161,8 @@
-
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
--extern int driver_init (void);
--extern void driver_exit (void);
-+extern int avm_driver_init (void);
-+extern void avm_driver_exit (void);
-
- #endif
-
-diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdslsl/main.c usr/src/kernel-modules/fcdsl/src/src.fcdslsl/main.c
---- usr/src/kernel-modules/fcdsl/src/src.fcdslsl/main.c
-+++ usr/src/kernel-modules/fcdsl/src/src.fcdslsl/main.c
-@@ -23,7 +23,7 @@
- #include <stdarg.h>
- #include <asm/uaccess.h>
- #include <linux/pci.h>
--#include <linux/config.h>
-+#include <linux/autoconf.h>
- #include <linux/version.h>
- #include <linux/kernel.h>
- #include <linux/module.h>
-@@ -116,14 +116,14 @@
- return -ENODEV;
- }
- NOTE("Loading...\n");
-- if (!driver_init ()) {
-+ if (!avm_driver_init ()) {
- ERROR("Error: Driver library not available.\n");
- NOTE("Not loaded.\n");
- return -ENOSYS;
- }
- if (0 != (res = add_card (dev))) {
- NOTE("Not loaded.\n");
-- driver_exit ();
-+ avm_driver_exit ();
- return res;
- }
- NOTE("Loaded.\n");
-@@ -144,7 +144,7 @@
- NOTE("Removing...\n");
- remove_ctrls (cp);
- NOTE("Removed.\n");
-- driver_exit ();
-+ avm_driver_exit ();
- #ifndef NDEBUG
- if (hallocated() != 0) {
- ERROR("%u bytes leaked.\n", hallocated());
-@@ -195,7 +195,7 @@
- NOTE("-- 32 bit CAPI driver --\n");
- #endif
-
-- if (0 == (err = pci_module_init (&fcdsl2_driver))) {
-+ if (0 == (err = pci_register_driver (&fcdsl2_driver))) {
- LOG("PCI driver registered.\n");
- register_capi_driver (&fcdsl2_capi_driver);
- LOG("CAPI driver registered.\n");
-diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdslslusb/driver.h usr/src/kernel-modules/fcdsl/src/src.fcdslslusb/driver.h
---- usr/src/kernel-modules/fcdsl/src/src.fcdslslusb/driver.h
-+++ usr/src/kernel-modules/fcdsl/src/src.fcdslslusb/driver.h
-@@ -24,7 +24,7 @@
- #define __have_driver_h__
-
- #include <asm/atomic.h>
--#include <linux/config.h>
-+#include <linux/autoconf.h>
- #include <linux/skbuff.h>
- #include <linux/spinlock.h>
- #include <linux/usb.h>
-diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdslslusb/main.c usr/src/kernel-modules/fcdsl/src/src.fcdslslusb/main.c
---- usr/src/kernel-modules/fcdsl/src/src.fcdslslusb/main.c
-+++ usr/src/kernel-modules/fcdsl/src/src.fcdslslusb/main.c
-@@ -27,7 +27,7 @@
- #include <stdarg.h>
- #include <asm/uaccess.h>
- #include <linux/usb.h>
--#include <linux/config.h>
-+#include <linux/autoconf.h>
- #include <linux/version.h>
- #include <linux/kernel.h>
- #include <linux/module.h>
-diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdslusb/driver.h usr/src/kernel-modules/fcdsl/src/src.fcdslusb/driver.h
---- usr/src/kernel-modules/fcdsl/src/src.fcdslusb/driver.h
-+++ usr/src/kernel-modules/fcdsl/src/src.fcdslusb/driver.h
-@@ -25,7 +25,7 @@
-
- #include <asm/semaphore.h>
- #include <asm/atomic.h>
--#include <linux/config.h>
-+#include <linux/autoconf.h>
- #include <linux/skbuff.h>
- #include <linux/capi.h>
- #include <linux/isdn/capilli.h>
-diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdslusb2/driver.h usr/src/kernel-modules/fcdsl/src/src.fcdslusb2/driver.h
---- usr/src/kernel-modules/fcdsl/src/src.fcdslusb2/driver.h
-+++ usr/src/kernel-modules/fcdsl/src/src.fcdslusb2/driver.h
-@@ -24,7 +24,7 @@
- #define __have_driver_h__
-
- #include <asm/atomic.h>
--#include <linux/config.h>
-+#include <linux/autoconf.h>
- #include <linux/skbuff.h>
- #include <linux/spinlock.h>
- #include <linux/usb.h>
-diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdslusb2/main.c usr/src/kernel-modules/fcdsl/src/src.fcdslusb2/main.c
---- usr/src/kernel-modules/fcdsl/src/src.fcdslusb2/main.c
-+++ usr/src/kernel-modules/fcdsl/src/src.fcdslusb2/main.c
-@@ -27,7 +27,7 @@
- #include <stdarg.h>
- #include <asm/uaccess.h>
- #include <linux/usb.h>
--#include <linux/config.h>
-+#include <linux/autoconf.h>
- #include <linux/version.h>
- #include <linux/kernel.h>
- #include <linux/module.h>
-diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdslusba/driver.h usr/src/kernel-modules/fcdsl/src/src.fcdslusba/driver.h
---- usr/src/kernel-modules/fcdsl/src/src.fcdslusba/driver.h
-+++ usr/src/kernel-modules/fcdsl/src/src.fcdslusba/driver.h
-@@ -24,7 +24,7 @@
- #define __have_driver_h__
-
- #include <asm/atomic.h>
--#include <linux/config.h>
-+#include <linux/autoconf.h>
- #include <linux/skbuff.h>
- #include <linux/spinlock.h>
- #include <linux/usb.h>
-diff -Nur usr/src/kernel-modules/fcdsl/src/src.fcdslusba/main.c usr/src/kernel-modules/fcdsl/src/src.fcdslusba/main.c
---- usr/src/kernel-modules/fcdsl/src/src.fcdslusba/main.c
-+++ usr/src/kernel-modules/fcdsl/src/src.fcdslusba/main.c
-@@ -27,7 +27,7 @@
- #include <stdarg.h>
- #include <asm/uaccess.h>
- #include <linux/usb.h>
--#include <linux/config.h>
-+#include <linux/autoconf.h>
- #include <linux/version.h>
- #include <linux/kernel.h>
- #include <linux/module.h>
diff --git a/net-dialup/fcdsl/files/fcdsl-2.6.23.diff b/net-dialup/fcdsl/files/fcdsl-2.6.23.diff
deleted file mode 100644
index 7b0236a66cf5..000000000000
--- a/net-dialup/fcdsl/files/fcdsl-2.6.23.diff
+++ /dev/null
@@ -1,249 +0,0 @@
---- src.fcdsl/driver.h.orig 2007-12-25 17:47:47.000000000 +0100
-+++ src.fcdsl/driver.h 2007-12-25 16:01:55.000000000 +0100
-@@ -23,7 +23,6 @@
- #ifndef __have_driver_h__
- #define __have_driver_h__
-
--#include <linux/autoconf.h>
- #include <linux/pci.h>
- #include <linux/list.h>
- #include <linux/skbuff.h>
-@@ -140,7 +139,7 @@
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
- extern int avm_driver_init (void);
--extern void avm_driver_exit (void);
-+extern void driver_exit (void);
-
- #endif
-
---- src.fcdsl/driver.c.orig 2007-12-25 17:47:47.000000000 +0100
-+++ src.fcdsl/driver.c 2007-12-25 16:01:55.000000000 +0100
-@@ -18,10 +18,6 @@
- * http://www.opensource.org/licenses/lgpl-license.html
- *
- * Contact: AVM GmbH, Alt-Moabit 95, 10559 Berlin, Germany, email: info@avm.de
-- *
-- * Mon Oct 20 22:43:31 2003
-- * Modified by Joerg Lehrke to improve locking
-- * Fixed for rev 0.4.1 by Stefan Schweizer
- */
-
- #include <asm/io.h>
-@@ -61,8 +57,6 @@
- #include "dbgif.h"
- #endif
-
--#undef SINGLE_LOCK
--
- #define KILOBYTE 1024
- #define MEGABYTE (1024*KILOBYTE)
- #define DMA_BUFFER_SIZE (9*KILOBYTE)
-@@ -108,11 +102,7 @@
- static struct capi_ctr capi_ctrl[2];
- static int capi_ctrl_ix = 0;
- static per_ctrl_t ctrl_params[2];
--#if defined (SINGLE_LOCK)
--# define stack_lock qt_lock
--#else
- static spinlock_t stack_lock = SPIN_LOCK_UNLOCKED;
--#endif
- static atomic_t rx_flag = ATOMIC_INIT (0);
- static atomic_t tx_flag = ATOMIC_INIT (0);
- static atomic_t thread_flag = ATOMIC_INIT (0);
-@@ -210,7 +200,7 @@
- cp->rx_dmabuf = NULL;
- goto dma_rx_exit;
- }
-- res = request_irq (cp->irq, &irq_handler, SA_INTERRUPT | SA_SHIRQ, TARGET, cp);
-+ 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;
-@@ -1157,7 +1147,7 @@
- } /* remove_ctrl */
-
- /*---------------------------------------------------------------------------*\
--\*---------------------------------------------------------------------------*/
-+\*-C-------------------------------------------------------------------------*/
- static inline int in_critical (void) {
-
- return (0 < atomic_read (&crit_count));
-@@ -1316,7 +1306,7 @@
- capi_ctr_handle_message (ctrl, appl, skb);
- } /* msg2capi */
-
--/*---------------------------------------------------------------------------*\
-+/*-S-------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
- static __attr void __stack scheduler_control (unsigned ena) {
- int enabled = (int) ena;
-@@ -1334,7 +1324,6 @@
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
- static int sched_thread (void * arg) {
-- unsigned long flags;
-
- UNUSED_ARG (arg);
- daemonize (TARGET);
-@@ -1368,7 +1357,6 @@
- }
-
- /* Body of thread, invoke scheduler */
-- local_irq_save(flags);
- if (spin_trylock (&stack_lock)) {
- os_timer_poll ();
- assert (capi_lib->cm_schedule);
-@@ -1377,7 +1365,6 @@
- }
- spin_unlock (&stack_lock);
- }
-- local_irq_restore(flags);
- }
- LOG("Scheduler thread stopped.\n");
- up (&hotplug);
-@@ -1483,22 +1470,17 @@
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
- static void tx_task (unsigned long data) {
-- unsigned long flags;
--
-+
- UNUSED_ARG (data);
- if (in_critical ()) {
- atomic_set (&tx_flag, 1);
- kick_scheduler ();
-+ } else if (spin_trylock (&stack_lock)) {
-+ tx_handler (capi_card);
-+ spin_unlock (&stack_lock);
- } else {
-- local_irq_save(flags);
-- if (spin_trylock (&stack_lock)) {
-- tx_handler (capi_card);
-- spin_unlock (&stack_lock);
-- } else {
-- atomic_set (&tx_flag, 1);
-- kick_scheduler ();
-- }
-- local_irq_restore(flags);
-+ atomic_set (&tx_flag, 1);
-+ kick_scheduler ();
- }
- } /* tx_task */
-
-@@ -1551,22 +1533,17 @@
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
- static void rx_task (unsigned long data) {
-- unsigned long flags;
-
- UNUSED_ARG (data);
- if (in_critical ()) {
- atomic_set (&rx_flag, 1);
- kick_scheduler ();
-+ } else if (spin_trylock (&stack_lock)) {
-+ rx_handler (capi_card);
-+ spin_unlock (&stack_lock);
- } else {
-- local_irq_save(flags);
-- if (spin_trylock (&stack_lock)) {
-- rx_handler (capi_card);
-- spin_unlock (&stack_lock);
-- } else {
-- atomic_set (&rx_flag, 1);
-- kick_scheduler ();
-- }
-- local_irq_restore(flags);
-+ atomic_set (&rx_flag, 1);
-+ kick_scheduler ();
- }
- } /* rx_task */
-
-@@ -1584,7 +1561,6 @@
- return IRQ_NONE;
- }
- cp = (card_p) args;
-- spin_lock (&stack_lock);
- while (0 != ((flags = PEEK (cp->io_base + INT_CTL)) & CARD_PCI_INT_ASSERT)) {
- ++count;
- assert (count < 3);
-@@ -1595,7 +1571,6 @@
- assert ((PEEK (cp->io_base + INT_CTL)
- & ~(CARD_PCI_INT_ASSERT | CARD_PCI_INT_ISASSERTED)) != 0);
- if (!atomic_read (&link_open)) {
-- spin_unlock (&stack_lock);
- return IRQ_HANDLED;
- }
- tx_flag = PEEK (cp->io_base + XFER_TOTM_STATUS) == TM_READY;
-@@ -1610,7 +1585,6 @@
- }
- }
- info (0 == (PEEK (cp->io_base + INT_CTL) & CARD_PCI_INT_ASSERT));
-- spin_unlock (&stack_lock);
- return IRQ_RETVAL(count > 0);
- } /* irq_handler */
-
-@@ -1829,12 +1803,12 @@
-
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
--void avm_driver_exit (void) {
-+void driver_exit (void) {
-
- assert (capi_lib != NULL);
- free_library ();
- capi_lib = NULL;
--} /* avm_driver_exit */
-+} /* driver_exit */
-
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
---- src.fcdsl/main.c.orig 2007-12-25 17:47:47.000000000 +0100
-+++ src.fcdsl/main.c 2007-12-25 17:41:12.000000000 +0100
-@@ -23,7 +23,6 @@
- #include <stdarg.h>
- #include <asm/uaccess.h>
- #include <linux/pci.h>
--#include <linux/autoconf.h>
- #include <linux/version.h>
- #include <linux/kernel.h>
- #include <linux/module.h>
-@@ -72,6 +71,9 @@
- MODULE_PARM_DESC (VPI, "VPI - Virtual Path Identifier");
- MODULE_PARM_DESC (VCI, "VCI - Virtual Channel Identifier");
-
-+/* Define new pci initialize, Arnd Feldmueller <arnd.feldmueller@web.de> */
-+#define pci_module_init pci_register_driver
-+
- MODULE_LICENSE ("Proprietary");
- MODULE_DESCRIPTION ("CAPI4Linux: Driver for " PRODUCT_LOGO);
-
-@@ -122,7 +124,9 @@
- }
- if (0 != (res = add_card (dev))) {
- ERROR("Not loaded.\n");
-- avm_driver_exit ();
-+ /* avm_driver_exit(); is old function, Arnd Feldmueller
-+ <arnd.feldmueller@web.de> */
-+ driver_exit ();
- return res;
- }
- NOTE("Loaded.\n");
-@@ -143,7 +147,7 @@
- NOTE("Removing...\n");
- remove_ctrls (card);
- NOTE("Removed.\n");
-- avm_driver_exit ();
-+ driver_exit ();
- #ifndef NDEBUG
- if (hallocated() != 0) {
- ERROR( "%u bytes leaked.\n", hallocated());
-@@ -196,7 +200,7 @@
- return -ENOSYS;
- }
-
-- if (0 == (err = pci_register_driver (&fcdsl_driver))) {
-+ if (0 == (err = pci_module_init (&fcdsl_driver))) {
- LOG("PCI driver registered.\n");
- register_capi_driver (&fcdsl_capi_driver);
- LOG("CAPI driver registered.\n");
diff --git a/net-dialup/fcdsl/files/fcdsl.diff b/net-dialup/fcdsl/files/fcdsl.diff
deleted file mode 100644
index 590ad5ef379a..000000000000
--- a/net-dialup/fcdsl/files/fcdsl.diff
+++ /dev/null
@@ -1,157 +0,0 @@
---- driver.c.orig 2004-05-14 02:00:00.000000000 +0200
-+++ driver.c 2005-01-21 15:40:33.000000000 +0100
-@@ -18,6 +18,10 @@
- * http://www.opensource.org/licenses/lgpl-license.html
- *
- * Contact: AVM GmbH, Alt-Moabit 95, 10559 Berlin, Germany, email: info@avm.de
-+ *
-+ * Mon Oct 20 22:43:31 2003
-+ * Modified by Joerg Lehrke to improve locking
-+ * Fixed for rev 0.4.1 by Stefan Schweizer
- */
-
- #include <asm/io.h>
-@@ -57,6 +61,8 @@
- #include "dbgif.h"
- #endif
-
-+#undef SINGLE_LOCK
-+
- #define KILOBYTE 1024
- #define MEGABYTE (1024*KILOBYTE)
- #define DMA_BUFFER_SIZE (9*KILOBYTE)
-@@ -101,7 +107,11 @@
- static struct capi_ctr capi_ctrl[2];
- static int capi_ctrl_ix = 0;
- static per_ctrl_t ctrl_params[2];
-+#if defined (SINGLE_LOCK)
-+# define stack_lock qt_lock
-+#else
- static spinlock_t stack_lock = SPIN_LOCK_UNLOCKED;
-+#endif
- static atomic_t rx_flag = ATOMIC_INIT (0);
- static atomic_t tx_flag = ATOMIC_INIT (0);
- static atomic_t thread_flag = ATOMIC_INIT (0);
-@@ -1142,7 +1152,7 @@
- } /* remove_ctrl */
-
- /*---------------------------------------------------------------------------*\
--\*-C-------------------------------------------------------------------------*/
-+\*---------------------------------------------------------------------------*/
- static inline int in_critical (void) {
-
- return (0 < atomic_read (&crit_count));
-@@ -1301,7 +1311,7 @@
- capi_ctr_handle_message (ctrl, appl, skb);
- } /* msg2capi */
-
--/*-S-------------------------------------------------------------------------*\
-+/*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
- static __attr void __stack scheduler_control (unsigned ena) {
- int enabled = (int) ena;
-@@ -1323,6 +1333,7 @@
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
- static int sched_thread (void * arg) {
-+ unsigned long flags;
-
- UNUSED_ARG (arg);
- daemonize (TARGET);
-@@ -1356,6 +1367,7 @@
- }
-
- /* Body of thread, invoke scheduler */
-+ local_irq_save(flags);
- if (spin_trylock (&stack_lock)) {
- os_timer_poll ();
- assert (capi_lib->cm_schedule);
-@@ -1364,6 +1376,7 @@
- }
- spin_unlock (&stack_lock);
- }
-+ local_irq_restore(flags);
- }
- LOG("Scheduler thread stopped.\n");
- up (&hotplug);
-@@ -1470,17 +1483,22 @@
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
- static void tx_task (unsigned long data) {
--
-+ unsigned long flags;
-+
- UNUSED_ARG (data);
- if (in_critical ()) {
- atomic_set (&tx_flag, 1);
- kick_scheduler ();
-- } else if (spin_trylock (&stack_lock)) {
-- tx_handler (capi_card);
-- spin_unlock (&stack_lock);
- } else {
-- atomic_set (&tx_flag, 1);
-- kick_scheduler ();
-+ local_irq_save(flags);
-+ if (spin_trylock (&stack_lock)) {
-+ tx_handler (capi_card);
-+ spin_unlock (&stack_lock);
-+ } else {
-+ atomic_set (&tx_flag, 1);
-+ kick_scheduler ();
-+ }
-+ local_irq_restore(flags);
- }
- } /* tx_task */
-
-@@ -1533,17 +1551,22 @@
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
- static void rx_task (unsigned long data) {
-+ unsigned long flags;
-
- UNUSED_ARG (data);
- if (in_critical ()) {
- atomic_set (&rx_flag, 1);
- kick_scheduler ();
-- } else if (spin_trylock (&stack_lock)) {
-- rx_handler (capi_card);
-- spin_unlock (&stack_lock);
- } else {
-- atomic_set (&rx_flag, 1);
-- kick_scheduler ();
-+ local_irq_save(flags);
-+ if (spin_trylock (&stack_lock)) {
-+ rx_handler (capi_card);
-+ spin_unlock (&stack_lock);
-+ } else {
-+ atomic_set (&rx_flag, 1);
-+ kick_scheduler ();
-+ }
-+ local_irq_restore(flags);
- }
- } /* rx_task */
-
-@@ -1562,6 +1585,7 @@
- return IRQ_NONE;
- }
- cp = (card_p) args;
-+ spin_lock (&stack_lock);
- while (0 != ((flags = PEEK (cp->io_base + INT_CTL)) & CARD_PCI_INT_ASSERT)) {
- ++count;
- assert (count < 3);
-@@ -1572,6 +1596,7 @@
- assert ((PEEK (cp->io_base + INT_CTL)
- & ~(CARD_PCI_INT_ASSERT | CARD_PCI_INT_ISASSERTED)) != 0);
- if (!atomic_read (&link_open)) {
-+ spin_unlock (&stack_lock);
- return IRQ_HANDLED;
- }
- tx_flag = PEEK (cp->io_base + XFER_TOTM_STATUS) == TM_READY;
-@@ -1586,6 +1611,7 @@
- }
- }
- info (0 == (PEEK (cp->io_base + INT_CTL) & CARD_PCI_INT_ASSERT));
-+ spin_unlock (&stack_lock);
- return IRQ_RETVAL(count > 0);
- } /* irq_handler */
-
diff --git a/net-dialup/fcdsl/files/fcdsl2.diff b/net-dialup/fcdsl/files/fcdsl2.diff
deleted file mode 100644
index c8df5fa0f57b..000000000000
--- a/net-dialup/fcdsl/files/fcdsl2.diff
+++ /dev/null
@@ -1,62 +0,0 @@
---- driver.c.orig 2004-07-01 00:00:00.000000000 +0200
-+++ driver.c 2005-02-26 11:15:41.000000000 +0100
-@@ -18,6 +18,10 @@
- * http://www.opensource.org/licenses/lgpl-license.html
- *
- * Contact: AVM GmbH, Alt-Moabit 95, 10559 Berlin, Germany, email: info@avm.de
-+ *
-+ * Mon Oct 20 22:43:31 2003
-+ * Modified by Joerg Lehrke to improve locking
-+ * Fixed for rev 0.4.1 by Stefan Schweizer
- */
-
- #include <asm/io.h>
-@@ -54,6 +58,8 @@
- #include "devif.h"
- #include "driver.h"
-
-+#undef SINGLE_LOCK
-+
- #define KILOBYTE 1024
- #define MEGABYTE (1024*KILOBYTE)
- #define _2_MEGS_ (2*MEGABYTE)
-@@ -92,7 +98,11 @@ typedef struct __db {
- card_p capi_card = NULL;
- lib_callback_t * capi_lib = NULL;
- atomic_t crit_count = ATOMIC_INIT(0);
-+#if defined (SINGLE_LOCK)
-+# define stack_lock qt_lock
-+#else
- spinlock_t stack_lock = SPIN_LOCK_UNLOCKED;
-+#endif
-
- static int nvers = 0;
- static atomic_t scheduler_enabled = ATOMIC_INIT (1);
-@@ -1322,9 +1332,10 @@ void msg2capi (unsigned char * msg) {
- capi_ctr_handle_message (ctrl, appl, skb);
- } /* msg2capi */
-
--/*-S-------------------------------------------------------------------------*\
-+/*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
- static int sched_thread (void * arg) {
-+ unsigned long flags;
-
- UNUSED_ARG (arg);
- daemonize (TARGET);
-@@ -1356,6 +1367,7 @@ static int sched_thread (void * arg) {
- continue;
- }
- /* Body of thread, invoke scheduler */
-+ local_irq_save(flags);
- if (spin_trylock (&stack_lock)) {
- os_timer_poll ();
- assert (capi_lib->cm_schedule);
-@@ -1364,6 +1376,7 @@ static int sched_thread (void * arg) {
- }
- spin_unlock (&stack_lock);
- }
-+ local_irq_restore(flags);
- }
- LOG("Scheduler thread stopped.\n");
- up (&thread_sync);
diff --git a/net-dialup/fcdsl/files/fcdslsl.diff b/net-dialup/fcdsl/files/fcdslsl.diff
deleted file mode 100644
index ff06da9df07b..000000000000
--- a/net-dialup/fcdsl/files/fcdslsl.diff
+++ /dev/null
@@ -1,63 +0,0 @@
---- driver.c.orig 2004-06-17 02:00:00.000000000 +0200
-+++ driver.c 2005-02-26 11:02:38.000000000 +0100
-@@ -18,6 +18,11 @@
- * http://www.opensource.org/licenses/lgpl-license.html
- *
- * Contact: AVM GmbH, Alt-Moabit 95, 10559 Berlin, Germany, email: info@avm.de
-+ *
-+ * Sunday Dec 07 18:10 2003
-+ * Modified by Christian 'greeny' Heckhoff to improve locking
-+ * based on modifications by Joerg Lehrke for Fritz!Card DSL
-+ *
- */
-
- #include <asm/io.h>
-@@ -54,6 +59,8 @@
- #include "devif.h"
- #include "driver.h"
-
-+#undef SINGLE_LOCK
-+
- #define KILOBYTE 1024
- #define MEGABYTE (1024*KILOBYTE)
- #define _2_MEGS_ (2*MEGABYTE)
-@@ -92,7 +99,11 @@ typedef struct __db {
- card_p capi_card = NULL;
- lib_callback_t * capi_lib = NULL;
- atomic_t crit_count = ATOMIC_INIT(0);
-+#if defined (SINGLE_LOCK)
-+# define stack_lock qt_lock
-+#else
- spinlock_t stack_lock = SPIN_LOCK_UNLOCKED;
-+#endif
-
- static int nvers = 0;
- static atomic_t scheduler_enabled = ATOMIC_INIT (1);
-@@ -1322,9 +1333,10 @@ void msg2capi (unsigned char * msg) {
- capi_ctr_handle_message (ctrl, appl, skb);
- } /* msg2capi */
-
--/*-S-------------------------------------------------------------------------*\
-+/*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
- static int sched_thread (void * arg) {
-+ unsigned long flags;
-
- UNUSED_ARG (arg);
- daemonize (TARGET);
-@@ -1356,6 +1368,7 @@ static int sched_thread (void * arg) {
- continue;
- }
- /* Body of thread, invoke scheduler */
-+ local_irq_save(flags);
- if (spin_trylock (&stack_lock)) {
- os_timer_poll ();
- assert (capi_lib->cm_schedule);
-@@ -1364,6 +1377,7 @@ static int sched_thread (void * arg) {
- }
- spin_unlock (&stack_lock);
- }
-+ local_irq_restore(flags);
- }
- LOG("Scheduler thread stopped.\n");
- up (&thread_sync);
diff --git a/net-dialup/fcdsl/files/fcdslslusb-2.6.20.diff b/net-dialup/fcdsl/files/fcdslslusb-2.6.20.diff
deleted file mode 100644
index a8ae5ac3d85c..000000000000
--- a/net-dialup/fcdsl/files/fcdslslusb-2.6.20.diff
+++ /dev/null
@@ -1,23 +0,0 @@
---- usr/src/kernel-modules/fcdsl/src/src.fcdslslusb/main.c
-+++ usr/src/kernel-modules/fcdsl/src/src.fcdslslusb/main.c
-@@ -92,17 +92,12 @@
-
- static struct usb_driver usb_driver = {
-
--#ifndef OLD_USB_DRIVER
-- .driver = {
--#endif
-- .owner = THIS_MODULE,
-- .name = TARGET,
--#ifndef OLD_USB_DRIVER
-- },
--#endif
-+ .name = TARGET,
-+
- .id_table = usb_id_table,
- .probe = usb_probe,
- .disconnect = usb_disconnect,
-+
- } ;
-
- MODULE_DEVICE_TABLE (usb, usb_id_table);
diff --git a/net-dialup/fcdsl/files/usb-2.6.20.diff b/net-dialup/fcdsl/files/usb-2.6.20.diff
deleted file mode 100644
index 7beff8b9f9a0..000000000000
--- a/net-dialup/fcdsl/files/usb-2.6.20.diff
+++ /dev/null
@@ -1,189 +0,0 @@
-diff -ur /var/tmp/portage/net-dialup/fcdsl-2.6.37/work/usr/src/kernel-modules/fcdsl/src/src.fcdslslusb/driver.c ./src.fcdslslusb/driver.c
---- /var/tmp/portage/net-dialup/fcdsl-2.6.37/work/usr/src/kernel-modules/fcdsl/src/src.fcdslslusb/driver.c 2005-07-06 22:00:00.000000000 +0000
-+++ ./src.fcdslslusb/driver.c 2007-06-27 19:56:42.000000000 +0000
-@@ -106,7 +106,7 @@
- static int hard_error_issued = FALSE;
- static atomic_t resetting_ctrl = ATOMIC_INIT (0);
- static struct work_struct closing_work;
--static void closing_worker (void *);
-+static void closing_worker (struct work_struct *);
- static atomic_t closing_worker_running = ATOMIC_INIT (0);
- static void (* close_func) (void *) = NULL;
- static void * close_data = NULL;
-@@ -341,8 +341,8 @@
-
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
--static void closing_worker (void * ctx) {
-- card_p card = (card_p) ctx;
-+static void closing_worker (struct work_struct *work) {
-+ card_p card = capi_card;
-
- DECLARE_WAIT_QUEUE_HEAD(close_wait);
-
-@@ -434,7 +434,7 @@
- close_func = func;
- close_data = data;
-
-- INIT_WORK (&closing_work, closing_worker, capi_card);
-+ INIT_WORK (&closing_work, closing_worker);
- schedule_work (&closing_work);
- LOG("Worker scheduled.\n");
- } /* start_closing_worker */
-diff -ur /var/tmp/portage/net-dialup/fcdsl-2.6.37/work/usr/src/kernel-modules/fcdsl/src/src.fcdslusb/driver.c ./src.fcdslusb/driver.c
---- /var/tmp/portage/net-dialup/fcdsl-2.6.37/work/usr/src/kernel-modules/fcdsl/src/src.fcdslusb/driver.c 2005-08-04 22:00:00.000000000 +0000
-+++ ./src.fcdslusb/driver.c 2007-06-27 19:53:54.000000000 +0000
-@@ -84,7 +84,7 @@
- static atomic_t thread_capi_flag;
- static atomic_t resetting_ctrl = ATOMIC_INIT (0);
- static struct work_struct closing_work;
--static void closing_worker (void *);
-+static void closing_worker (struct work_struct *);
- static atomic_t closing_worker_running = ATOMIC_INIT (0);
- static void (* close_func) (void *) = NULL;
- static void * close_data = NULL;
-@@ -699,8 +699,8 @@
-
- /*-C-------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
--static void closing_worker (void * ctx) {
-- card_p card = (card_p) ctx;
-+static void closing_worker (struct work_struct *work) {
-+ card_p card = capi_card;
-
- DECLARE_WAIT_QUEUE_HEAD(close_wait);
-
-@@ -787,7 +787,7 @@
- close_func = func;
- close_data = data;
-
-- INIT_WORK (&closing_work, closing_worker, capi_card);
-+ INIT_WORK (&closing_work, closing_worker);
- schedule_work (&closing_work);
- LOG("Worker scheduled.\n");
- } /* start_closing_worker */
-diff -ur /var/tmp/portage/net-dialup/fcdsl-2.6.37/work/usr/src/kernel-modules/fcdsl/src/src.fcdslusb/main.c ./src.fcdslusb/main.c
---- /var/tmp/portage/net-dialup/fcdsl-2.6.37/work/usr/src/kernel-modules/fcdsl/src/src.fcdslusb/main.c 2006-01-30 16:06:37.000000000 +0000
-+++ ./src.fcdslusb/main.c 2007-06-27 19:40:42.000000000 +0000
-@@ -76,14 +76,7 @@
- } ;
-
- static struct usb_driver usb_driver = {
--#ifndef OLD_USB_DRIVER
-- .driver = {
--#endif
-- .owner = THIS_MODULE,
-- .name = TARGET,
--#ifndef OLD_USB_DRIVER
-- },
--#endif
-+ .name = TARGET,
- .id_table = usb_id_table,
- .probe = usb_probe,
- .disconnect = usb_disconnect,
-diff -ur /var/tmp/portage/net-dialup/fcdsl-2.6.37/work/usr/src/kernel-modules/fcdsl/src/src.fcdslusb2/driver.c ./src.fcdslusb2/driver.c
---- /var/tmp/portage/net-dialup/fcdsl-2.6.37/work/usr/src/kernel-modules/fcdsl/src/src.fcdslusb2/driver.c 2005-08-04 22:00:00.000000000 +0000
-+++ ./src.fcdslusb2/driver.c 2007-06-27 19:57:51.000000000 +0000
-@@ -106,7 +106,7 @@
- static int hard_error_issued = FALSE;
- static atomic_t resetting_ctrl = ATOMIC_INIT (0);
- static struct work_struct closing_work;
--static void closing_worker (void *);
-+static void closing_worker (struct work_struct *);
- static atomic_t closing_worker_running = ATOMIC_INIT (0);
- static void (* close_func) (void *) = NULL;
- static void * close_data = NULL;
-@@ -341,8 +341,8 @@
-
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
--static void closing_worker (void * ctx) {
-- card_p card = (card_p) ctx;
-+static void closing_worker (struct work_struct *work) {
-+ card_p card = capi_card;
-
- DECLARE_WAIT_QUEUE_HEAD(close_wait);
-
-@@ -434,7 +434,7 @@
- close_func = func;
- close_data = data;
-
-- INIT_WORK (&closing_work, closing_worker, capi_card);
-+ INIT_WORK (&closing_work, closing_worker);
- schedule_work (&closing_work);
- LOG("Worker scheduled.\n");
- } /* start_closing_worker */
-Only in ./src.fcdslusb2: driver.o
-Only in ./src.fcdslusb2: lib.o
-diff -ur /var/tmp/portage/net-dialup/fcdsl-2.6.37/work/usr/src/kernel-modules/fcdsl/src/src.fcdslusb2/main.c ./src.fcdslusb2/main.c
---- /var/tmp/portage/net-dialup/fcdsl-2.6.37/work/usr/src/kernel-modules/fcdsl/src/src.fcdslusb2/main.c 2007-06-27 20:01:13.000000000 +0000
-+++ ./src.fcdslusb2/main.c 2007-06-27 19:57:13.000000000 +0000
-@@ -91,15 +91,7 @@
- } ;
-
- static struct usb_driver usb_driver = {
--
--#ifndef OLD_USB_DRIVER
-- .driver = {
--#endif
-- .owner = THIS_MODULE,
-- .name = TARGET,
--#ifndef OLD_USB_DRIVER
-- },
--#endif
-+ .name = TARGET,
- .id_table = usb_id_table,
- .probe = usb_probe,
- .disconnect = usb_disconnect,
-diff -ur /var/tmp/portage/net-dialup/fcdsl-2.6.37/work/usr/src/kernel-modules/fcdsl/src/src.fcdslusba/driver.c ./src.fcdslusba/driver.c
---- /var/tmp/portage/net-dialup/fcdsl-2.6.37/work/usr/src/kernel-modules/fcdsl/src/src.fcdslusba/driver.c 2005-07-06 22:00:00.000000000 +0000
-+++ ./src.fcdslusba/driver.c 2007-06-27 19:58:47.000000000 +0000
-@@ -106,7 +106,7 @@
- static int hard_error_issued = FALSE;
- static atomic_t resetting_ctrl = ATOMIC_INIT (0);
- static struct work_struct closing_work;
--static void closing_worker (void *);
-+static void closing_worker (struct work_struct *);
- static atomic_t closing_worker_running = ATOMIC_INIT (0);
- static void (* close_func) (void *) = NULL;
- static void * close_data = NULL;
-@@ -341,8 +341,8 @@
-
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
--static void closing_worker (void * ctx) {
-- card_p card = (card_p) ctx;
-+static void closing_worker (struct work_struct *work) {
-+ card_p card = capi_card;
-
- DECLARE_WAIT_QUEUE_HEAD(close_wait);
-
-@@ -434,7 +434,7 @@
- close_func = func;
- close_data = data;
-
-- INIT_WORK (&closing_work, closing_worker, capi_card);
-+ INIT_WORK (&closing_work, closing_worker);
- schedule_work (&closing_work);
- LOG("Worker scheduled.\n");
- } /* start_closing_worker */
-diff -ur /var/tmp/portage/net-dialup/fcdsl-2.6.37/work/usr/src/kernel-modules/fcdsl/src/src.fcdslusba/main.c ./src.fcdslusba/main.c
---- /var/tmp/portage/net-dialup/fcdsl-2.6.37/work/usr/src/kernel-modules/fcdsl/src/src.fcdslusba/main.c 2007-06-27 20:01:13.000000000 +0000
-+++ ./src.fcdslusba/main.c 2007-06-27 19:58:18.000000000 +0000
-@@ -91,15 +91,7 @@
- } ;
-
- static struct usb_driver usb_driver = {
--
--#ifndef OLD_USB_DRIVER
-- .driver = {
--#endif
-- .owner = THIS_MODULE,
-- .name = TARGET,
--#ifndef OLD_USB_DRIVER
-- },
--#endif
-+ .name = TARGET,
- .id_table = usb_id_table,
- .probe = usb_probe,
- .disconnect = usb_disconnect,