punt

13 files changed, 0 insertions, 1953 deletions

diff --git a/net-dialup/fritzcapi/ChangeLog b/net-dialup/fritzcapi/ChangeLog
deleted file mode 100644
index ee7df6092c13..000000000000
--- a/net-dialup/fritzcapi/ChangeLog
+++ /dev/null
@@ -1,170 +0,0 @@
-# ChangeLog for net-dialup/fritzcapi
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/fritzcapi/ChangeLog,v 1.34 2007/08/29 18:45:40 genstef Exp $
-
-*fritzcapi-2.6.43.ebuild (29 Aug 2007)
-
-  29 Aug 2007; Stefan Schweizer <genstef@gentoo.org>
-  +files/2.6.43-linux-2.6.22-pci_module_init.patch, fritzcapi-2.6.43.ebuild:
-  Add amd64 patch for 2.6.22 for fcpci only thanks to <apost1@gmx.de>, bug
-  190152 and 184903
-
-  23 Jul 2007; Stefan Schweizer <genstef@gentoo.org>
-  fritzcapi-2.6.43.ebuild:
-  The 2.6.22 works only for x86 thanks Sven M. Höritz
-  <sven.hoeritz@gmail.com> by mail
-
-  11 Jul 2007; Stefan Schweizer <genstef@gentoo.org>
-  +files/fritzcapi-2.6.22.patch, fritzcapi-2.6.43.ebuild:
-  Add 2.6.22 support thanks to Sven <skoehler@upb.de> in bug 184903
-
-  27 Jun 2007; Stefan Schweizer <genstef@gentoo.org>
-  +files/2.6.43-linux-2.6.19-irq_handler.amd64.patch,
-  +files/fritzcapi-2.6.20.amd64.patch, +files/2.6.43-fcpcmcia.amd64.patch,
-  fritzcapi-2.6.43.ebuild:
-  amd64 later 2.6 kernel fixes thanks to Miroslaw Mieszczak
-  <mieszcz@zabrze.zigzag.pl> in bug 163366
-
-  02 May 2007; Marius Mauch <genone@gentoo.org> fritzcapi-2.6.43.ebuild:
-  Replacing einfo with elog
-
-  06 Feb 2007; <genstef@gentoo.org> fritzcapi-2.6.43.ebuild:
-  comment out 2.6.20 patch for dsd
-
-  06 Feb 2007; <genstef@gentoo.org> +files/fritzcapi-2.6.20.patch,
-  fritzcapi-2.6.43.ebuild:
-  Add patch to fix kernels >= 2.6.20 thanks to Michael Biebl <biebl@teco.edu>
-  in bug 165536
-
-  05 Feb 2007; <genstef@gentoo.org> +files/2.6.43-fcpcmcia.patch,
-  fritzcapi-2.6.43.ebuild:
-  Fix fcpcmcia build thanks to Peter Eisenlohr in bug 163366
-
-  04 Feb 2007; <genstef@gentoo.org>
-  +files/2.6.43-linux-2.6.19-irq_handler.patch, fritzcapi-2.6.43.ebuild:
-  Add patch for 2.6.20 compatibility thanks to Martin von Gagern
-  <Martin.vGagern@gmx.net> in bug 163366
-
-  13 Dec 2006; Stefan Schweizer <genstef@gentoo.org>
-  +files/fcusb2-2.6.19.patch, fritzcapi-2.6.43.ebuild:
-  add 2.6.19 fcusb patcht thanks to Michael Biebl <biebl@teco.edu> in bug 156808
-
-  01 Dec 2006; Stefan Schweizer <genstef@gentoo.org>
-  fritzcapi-2.6.43.ebuild:
-  2.6.19 fix thanks to Martin von Gagern <Martin.vGagern@gmx.net> in bug 153553
-
-  07 Jul 2006; Stefan Schweizer <genstef@gentoo.org>
-  -files/fritzcapi-fix-for-2.6.10.patch, -fritzcapi-2.6.32.ebuild,
-  -fritzcapi-2.6.35.ebuild, -fritzcapi-2.6.42.ebuild,
-  fritzcapi-2.6.43.ebuild:
-  Add a check for kernel 2.6.17 and disable fcpcmcia there thanks to agaffney
-  in bug 139502, remove old ebuilds
-
-  27 Apr 2006; Alin Nastac <mrness@gentoo.org> fritzcapi-2.6.43.ebuild:
-  Stable on x86 (#131352).
-
-  12 Mar 2006; Alin Nastac <mrness@gentoo.org> fritzcapi-2.6.43.ebuild:
-  Beautify src_unpack function. Quote strings containing $WORKDIR, $S or $KV_DIR.
-
-*fritzcapi-2.6.43 (22 Feb 2006)
-
-  22 Feb 2006; Stefan Schweizer <genstef@gentoo.org>
-  +fritzcapi-2.6.43.ebuild:
-  Version bump thanks to Sven M. Höritz <sven.hoeritz@informatik.uni-ulm.de>
-
-*fritzcapi-2.6.42 (20 Oct 2005)
-
-  20 Oct 2005; Stefan Schweizer <genstef@gentoo.org>
-  +fritzcapi-2.6.42.ebuild:
-  Version bump including amd64 support thanks to Jochen Klumpp
-  <jochen.klumpp@online.de> and sbriesen for testing.
-
-  23 Aug 2005; Stefan Schweizer <genstef@gentoo.org>
-  fritzcapi-2.6.35.ebuild:
-  Fix building with KBUILD_OUTPUT
-
-*fritzcapi-2.6.35 (11 Aug 2005)
-
-  11 Aug 2005; Stefan Schweizer <genstef@gentoo.org>
-  +fritzcapi-2.6.35.ebuild:
-  Version bump thanks to Markus Friedrich <fm12@freenet.de>
-  and Christoph Dahlen <christoph@dahlen.org> in bug 99650
-
-  14 May 2005; Stefan Schweizer <genstef@gentoo.org>
-  fritzcapi-2.6.32.ebuild:
-  Fix bug fxusb_CZ not installed, found in
-  http://forums.gentoo.org/viewtopic-t-332961.html thanks to sprittwicht
-
-  10 May 2005; Stefan Schweizer <genstef@gentoo.org>
-  fritzcapi-2.6.32.ebuild:
-  Fix unpack problem reportet by Lukas Schubert
-  <lukas.schubert@adviceandact.de> on gentoo-user-de
-
-  24 Apr 2005; Stefan Schweizer <genstef@gentoo.org>
-  fritzcapi-2.6.32.ebuild:
-  Add USE_EXPAND to avoid downloading unneeded drivers.
-
-  14 Apr 2005; Stefan Schweizer <genstef@gentoo.org>
-  fritzcapi-2.6.32.ebuild:
-  Fixes thanks to Martin von Gagern <Martin.vGagern@gmx.net> in bug 89023
-
-  26 Feb 2005; Stefan Schweizer <genstef@gentoo.org>
-  fritzcapi-2.6.32.ebuild:
-  Fixing firmware unpack, removing capi.conf example in favour of capi4k-utils
-
-  18 Feb 2005; Alin Nastac <mrness@gentoo.org> fritzcapi-2.6.32.ebuild:
-  Remove /lib/isdn symlink as is no longer required by the current version of
-  isdn4k-utils.
-
-  06 Feb 2005; Alin Nastac <mrness@gentoo.org> metadata.xml,
-  -files/fritzcapi-2.6.26.7-fix-for-2.6.10.patch,
-  +files/fritzcapi-fix-for-2.6.10.patch, -fritzcapi-2.6.26.7-r3.ebuild,
-  fritzcapi-2.6.32.ebuild:
-  Remove obsolete ebuild.
-
-*fritzcapi-2.6.32 (29 Jan 2005)
-
-  29 Jan 2005; Stefan Schweizer <genstef@gentoo.org>
-  +fritzcapi-2.6.32.ebuild:
-  New version from SuSE, I also added newer tarballs from AVM for some drivers
-
-  20 Jan 2005; Stefan Schweizer <genstef@gentoo.org>
-  fritzcapi-2.6.26.7-r3.ebuild:
-  x86 stable
-
-  31 Dec 2004; Alin Nastac <mrness@gentoo.org>
-  +files/fritzcapi-2.6.26.7-fix-for-2.6.10.patch,
-  fritzcapi-2.6.26.7-r3.ebuild:
-  Fix broken build of fcpcmcia module on kernel versions >= 2.6.10 (#75904).
-
-  23 Dec 2004; Alin Nastac <mrness@gentoo.org> fritzcapi-2.6.26.7-r3.ebuild:
-  Replace kernel-mod inherit with linux-mod, thanks to Stefan Schweizer
-  <genstef@gentoo.org> (#75117).
-
-*fritzcapi-2.6.26.7-r3 (12 Dec 2004)
-
-  12 Dec 2004; Alin Nastac <mrness@gentoo.org> -fritzcapi-2.6.26.7-r1.ebuild,
-  -fritzcapi-2.6.26.7-r2.ebuild, +fritzcapi-2.6.26.7-r3.ebuild,
-  -fritzcapi-2.6.26.7.ebuild:
-  Add fcusb2 firmware files and hotplug script. See #52984.
-
-*fritzcapi-2.6.26.7-r2 (05 Dec 2004)
-
-  05 Dec 2004; Alin Nastac <mrness@gentoo.org> +fritzcapi-2.6.26.7-r2.ebuild:
-  Put informational messages about env variable FRITZCAPI_CARDS (see #73431).
-
-*fritzcapi-2.6.26.7-r1 (28 Nov 2004)
-
-  28 Nov 2004; Alin Nastac <mrness@gentoo.org> +fritzcapi-2.6.26.7-r1.ebuild:
-  Add support for env variable FRITZCAPI_CARDS. If it is non-empty, only these
-  modules will be installed.
-
-  22 Nov 2004; Alin Nastac <mrness@gentoo.org> fritzcapi-2.6.26.7.ebuild:
-  Add pcmcia and usb flags to IUSE.
-
-*fritzcapi-2.6.26.7 (20 Nov 2004)
-
-  20 Nov 2004; Alin Nastac <mrness@gentoo.org> +metadata.xml,
-  +fritzcapi-2.6.26.7.ebuild:
-  Initial import, thanks to Stefan Schweizer <genstef@gentoo.org>. Closing #71821
-
diff --git a/net-dialup/fritzcapi/Manifest b/net-dialup/fritzcapi/Manifest
deleted file mode 100644
index 45007f1bf074..000000000000
--- a/net-dialup/fritzcapi/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-AUX 2.6.43-fcpcmcia.amd64.patch 18215 RMD160 e44a890617a725c5d275359e10d3e54bc0aa73a3 SHA1 986316eaf2ad505489b076f639a022bf69ae0f57 SHA256 336411117944f827439adb6b73a41cbc11ef6d9183f06770e2e5077246bdeb9b
-AUX 2.6.43-fcpcmcia.patch 19228 RMD160 635959d15326b93ebc5e84a5696a744f3ea49027 SHA1 97374936d420f4b2ce289f030f7f620af4d8ebb9 SHA256 236d4317ce27c043a0f4ead448fdea3bb506ffbf0e2554453f6937181241eea0
-AUX 2.6.43-linux-2.6.19-irq_handler.amd64.patch 3418 RMD160 8ef21ea3a1d46e56cd711e205849c2491779e6f2 SHA1 b68bd20809939b75628436147aeea713b5a1aea1 SHA256 1084d798c9a54bc5f1f00d746be302cdc5a893db14484c1dce96c0002a393147
-AUX 2.6.43-linux-2.6.19-irq_handler.patch 6472 RMD160 a899fc6f602b0bb988ab68aa82c3947ca3f3b139 SHA1 2d89534668665afc71b0476bd4e4749f4cd80067 SHA256 b9df1c8677a29e25c77b65d0b219b4ddbcc373a9dd628ac0a79dfb3c1c3a57e8
-AUX 2.6.43-linux-2.6.22-pci_module_init.patch 602 RMD160 553a37ebc0889ed396dd2ed7dae700654f8c97b7 SHA1 532f1aff414bb70b48dc93ac52c2f0e686953846 SHA256 4d42f809ff4b5777d867e270ae9e1b34d80d078813d90f2dd40e0a83190f6036
-AUX fcusb2-2.6.19.patch 396 RMD160 923e9cfcc98cca937cb5311db09d8c4b6d913442 SHA1 b8fb157ce239ed250501a1ab093e8dbd51bf97a6 SHA256 67541e2783e105ce1d7ca9f4d76fff7fb1f9cb9acc74a21c9d375b40d5df01b3
-AUX fritzcapi-2.6.20.amd64.patch 586 RMD160 22ffeb87d46a08fec992d19320d474323dce8a30 SHA1 8237450b4224ab105e1b8bc1fe07212a9c3c5326 SHA256 5f42a0366a92d769a0c868e6fe73710fbba3c834a1e744c6bb86cb29f64d5068
-AUX fritzcapi-2.6.20.patch 3500 RMD160 670766ffe9f17e2953c5413163a45158da0f608a SHA1 2bdcf2b28a048d2bd65d3c6a3eec70668559ad1f SHA256 6d919ea803b79caced2bdd0b35efbc739131ceb65904d14e58927d5b7875bc5e
-AUX fritzcapi-2.6.22.patch 2428 RMD160 9ceb93eefb5d5bc3a86017edb8b44c0ec6dcd969 SHA1 9afebb93f80195bcfcdb1fdf0bdf42c8aa559f9c SHA256 0999d963f00d20ac7072e5e7e7dda6ca572cdb340e19fc2252b181de27d39908
-DIST km_fritzcapi-2.6-43.i586.rpm 2991322 RMD160 a300b383d474ddf9283c1bd9fae310be196c0199 SHA1 80768055694913b706075fa03f15a7477ef29a3f SHA256 e90827d8c2b53dc475c97be8c8a018777830519592bc9e25ef1a49389d12e475
-DIST km_fritzcapi-2.6-43.x86_64.rpm 1006645 RMD160 7338380933345b211ba92654565c78cf4ad793ca SHA1 f7e5d9cf8c43db73b4e0c4fcb76753af74b6e743 SHA256 506ff28f5fd1d70969378d52d5d48f9937b585556a4a5475bbfd92865b74a860
-EBUILD fritzcapi-2.6.43.ebuild 5707 RMD160 3c08de4ac8499c187226d3529b53755e2b85b995 SHA1 5d96ff6e8384d9bc7b17ff8698321c0aa014c856 SHA256 e3f012e2cc2c4d0c536666f393139cd2176d681a1f00f638e2d5cd18540094bd
-MISC ChangeLog 6530 RMD160 1dd0980c7201375851a39cbad02c4d2cf47e77c9 SHA1 5be758f363bed28f2cec6dbb1c7443e86238aa29 SHA256 9fc636f7e819a7267730ba5d620defd0a78ac4f07b7eb7b1cafacbd016dd9b44
-MISC metadata.xml 319 RMD160 d4d008a13689fabae0994a25a60961b2fc5e6269 SHA1 bfea39d327ea986c5fc5e31864ce1bfeccb2f4d9 SHA256 ce891f4c7e75069036c8c422a1502ce9bbd4670be2e7f918dfa9da5e917787fc
diff --git a/net-dialup/fritzcapi/files/2.6.43-fcpcmcia.amd64.patch b/net-dialup/fritzcapi/files/2.6.43-fcpcmcia.amd64.patch
deleted file mode 100644
index 440e036a1510..000000000000
--- a/net-dialup/fritzcapi/files/2.6.43-fcpcmcia.amd64.patch
+++ /dev/null
@@ -1,599 +0,0 @@
-diff -ur usr.orig/src/kernel-modules/fritzcapi/fritz.pcmcia/src/driver.h usr/src/kernel-modules/fritzcapi/fritz.pcmcia/src/driver.h
---- usr.orig/src/kernel-modules/fritzcapi/fritz.pcmcia/src/driver.h	2005-07-07 00:00:00.000000000 +0200
-+++ usr/src/kernel-modules/fritzcapi/fritz.pcmcia/src/driver.h	2007-01-25 11:39:11.000000000 +0100
-@@ -23,7 +23,6 @@
- #ifndef __have_driver_h__
- #define __have_driver_h__
- 
--#include <linux/config.h>
- #include <linux/skbuff.h>
- #include <linux/capi.h>
- #include <linux/list.h>
-diff -ur usr.orig/src/kernel-modules/fritzcapi/fritz.pcmcia/src/fcpcmcia_cs.c usr/src/kernel-modules/fritzcapi/fritz.pcmcia/src/fcpcmcia_cs.c
---- usr.orig/src/kernel-modules/fritzcapi/fritz.pcmcia/src/fcpcmcia_cs.c	2006-01-30 17:09:05.000000000 +0100
-+++ usr/src/kernel-modules/fritzcapi/fritz.pcmcia/src/fcpcmcia_cs.c	2007-02-05 21:43:14.000000000 +0100
-@@ -46,7 +46,6 @@
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
- #define PCMCIA_IRQ_INFO2
- #endif
--#define NEW_PCMCIA_DRV
- 
- /*====================================================================*/
- MODULE_LICENSE("GPL");
-@@ -111,13 +110,9 @@
-    handler.
- */
- 
--static void cs_config(dev_link_t *);
--static void cs_release(dev_link_t *);
--#ifdef NEW_PCMCIA_DRV
--static void cs_detach(struct pcmcia_device *p_dev);
--static int cs_attach(struct pcmcia_device *p_dev);
--#else
--static int cs_event(event_t event, int priority, event_callback_args_t *);
-+static int cs_config(struct pcmcia_device *link);
-+static void cs_release(struct pcmcia_device *link);
-+
- 
- /*
-    The attach() and detach() entry points are used to create and destroy
-@@ -125,48 +120,33 @@
-    needed to manage one actual PCMCIA card.
- */
- 
--static dev_link_t * cs_attach(void);
--static void cs_detach(dev_link_t *);
--/*
--   The dev_info variable is the "key" that is used to match up this
--   device driver with appropriate cards, through the card configuration
--   database.
--*/
-+static void cs_detach(struct pcmcia_device *p_dev);
- 
--static dev_info_t dev_info = "fcpcmcia_cs";
- 
- /*
-    A linked list of "instances" of the skeleton device.  Each actual
-    PCMCIA card corresponds to one device instance, and is described
--   by one dev_link_t structure (defined in ds.h).
-+   by one struct pcmcia_device structure (defined in ds.h).
- 
-    You may not want to use a linked list for this -- for example, the
--   memory card driver uses an array of dev_link_t pointers, where minor
-+   memory card driver uses an array of struct pcmcia_device pointers, where minor
-    device numbers are used to derive the corresponding array index.
- */
- 
--static dev_link_t *dev_list = NULL;
- 
--#endif
- /*
--   A dev_link_t structure has fields for most things that are needed
--   to keep track of a socket, but there will usually be some device
--   specific information that also needs to be kept track of.  The
--   'priv' pointer in a dev_link_t structure can be used to point to
--   a device-specific private data structure, like this.
--
-    A driver needs to provide a dev_node_t structure for each device
-    on a card.  In some cases, there is only one device per card (for
-    example, ethernet cards, modems).  In other cases, there may be
-    many actual or logical devices (SCSI adapters, memory cards with
-    multiple partitions).  The dev_node_t structures need to be kept
--   in a linked list starting at the 'dev' field of a dev_link_t
-+   in a linked list starting at the 'dev' field of a struct pcmcia_device
-    structure.  We allocate them in the card's private data structure,
-    because they generally can't be allocated dynamically.
- */
-    
- typedef struct local_info_t {
--    dev_node_t	node;
-+	dev_node_t node;
- } local_info_t;
- 
- /*======================================================================
-@@ -181,101 +161,52 @@
-     
- ======================================================================*/
- 
--#ifdef NEW_PCMCIA_DRV
--static int cs_attach(struct pcmcia_device *p_dev)
-+static int cs_probe(struct pcmcia_device *p_dev)
- {
--#else
--static dev_link_t *cs_attach(void)
--{
--    client_reg_t client_reg;
--    int ret;
--#endif
--    dev_link_t *link;
--    local_info_t *local;
-+	local_info_t *local;
- #if defined (PCMCIA_IRQ_INFO2)
--    int i;
-+	int i;
- #endif
-     
--    NOTE("Attaching device...\n");
-+	NOTE("Attaching device...\n");
- 
--    /* Initialize the dev_link_t structure */
--    link = kmalloc(sizeof(struct dev_link_t), GFP_KERNEL);
--    if (!link)
--        goto err;
--    memset(link, 0, sizeof(struct dev_link_t));
--
--    /* The io structure describes IO port mapping */
--    link->io.NumPorts1 = 16;
--    link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
--    link->io.NumPorts2 = 0;
-+	/* The io structure describes IO port mapping */
-+	p_dev->io.NumPorts1 = 16;
-+	p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
-+	p_dev->io.NumPorts2 = 0;
- 
--    /* Interrupt setup */
--    link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED;
-+	/* Interrupt setup */
-+	p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED;
- 
- #if defined (PCMCIA_IRQ_INFO2)
--    link->irq.IRQInfo1 = IRQ_INFO2_VALID|IRQ_LEVEL_ID;
--    if (irq_list_count > 0) {
--	for (i = 0; (i < irq_list_count) && (irq_list[i] > 0); i++)
--	    link->irq.IRQInfo2 |= 1 << irq_list[i];
--    } else {
--	for (i = 0; (i < irq_list_count) && (default_irq_list[i] > 0); i++)
--	    link->irq.IRQInfo2 |= 1 << default_irq_list[i];
--    }
-+	p_dev->irq.IRQInfo1 = IRQ_INFO2_VALID|IRQ_LEVEL_ID;
-+	if (irq_list_count > 0) {
-+		for (i = 0; (i < irq_list_count) && (irq_list[i] > 0); i++)
-+			p_dev->irq.IRQInfo2 |= 1 << irq_list[i];
-+	} else {
-+		for (i = 0; (i < irq_list_count) && (default_irq_list[i] > 0); i++)
-+			p_dev->irq.IRQInfo2 |= 1 << default_irq_list[i];
-+	}
- #else
--    link->irq.IRQInfo1 = IRQ_LEVEL_ID;
-+	p_dev->irq.IRQInfo1 = IRQ_LEVEL_ID;
- #endif
-     
--    /* General socket configuration */
--    link->conf.Attributes = CONF_ENABLE_IRQ;
--    link->conf.Vcc = 50;
--    link->conf.IntType = INT_MEMORY_AND_IO;
--    link->conf.ConfigIndex = 1;
--    link->conf.Present = PRESENT_OPTION;
--
--    /* Allocate space for private device-specific data */
--    local = kmalloc(sizeof(local_info_t), GFP_KERNEL);
--    if (!local)
--        goto err_kfree;
--    memset(local, 0, sizeof(local_info_t));
--    link->priv = local;
--    
--#ifdef NEW_PCMCIA_DRV
--    link->handle = p_dev;
--    p_dev->instance = link;
--    link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
--    cs_config(link);
--    return 0;
--#else
--    /* Register with Card Services */
--    link->next = dev_list;
--    dev_list = link;
--    client_reg.dev_info = &dev_info;
--#if 0
--    client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
--    client_reg.EventMask =
--	CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
--	CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
--	CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME;
--    client_reg.event_handler = &cs_event;
--#endif
--    client_reg.Version = 0x0210;
--    client_reg.event_callback_args.client_data = link;
--    ret = pcmcia_register_client(&link->handle, &client_reg);
--    if (ret != 0) {
--	cs_error(link->handle, RegisterClient, ret);
--	cs_detach(link);
--	goto err;
--    }
--    return link;
--#endif
-- err_kfree:
--    kfree(link);
-- err:
--#ifdef NEW_PCMCIA_DRV
--    return -EINVAL;
--#else
--    return NULL;
--#endif
-+	/* General socket configuration */
-+	p_dev->conf.Attributes = CONF_ENABLE_IRQ;
-+	p_dev->conf.IntType = INT_MEMORY_AND_IO;
-+	p_dev->conf.ConfigIndex = 1;
-+	p_dev->conf.Present = PRESENT_OPTION;
-+
-+	/* Allocate space for private device-specific data */
-+	local = kmalloc(sizeof(local_info_t), GFP_KERNEL);
-+	if (!local)
-+	 	goto err_kfree;
-+	memset(local, 0, sizeof(local_info_t));
-+	p_dev->priv = local;
-+	return cs_config(p_dev);
-+
-+err_kfree:
-+	return -ENOMEM;
- } /* cs_attach */
- 
- /*======================================================================
-@@ -286,47 +217,12 @@
-     when the device is released.
- 
- ======================================================================*/
--#ifdef NEW_PCMCIA_DRV
--static void cs_detach(struct pcmcia_device *p_dev)
--{
--    dev_link_t *link = dev_to_instance(p_dev);
- 
--    if (link->state & DEV_CONFIG)
--    	cs_release(link);
--#else
--static void cs_detach(dev_link_t *link)
-+static void cs_detach(struct pcmcia_device *link)
- {
--    dev_link_t **linkp;
--
--    NOTE("Detaching device...\n");
--
--    /* Locate device structure */
--    for (linkp = &dev_list; *linkp; linkp = &(*linkp)->next)
--	if (*linkp == link) break;
--    if (*linkp == NULL)
--	return;
--
--    /*
--       If the device is currently configured and active, we won't
--       actually delete it yet.  Instead, it is marked so that when
--       the release() function is called, that will trigger a proper
--       detach().
--    */
--    if (link->state & DEV_CONFIG) {
--	link->state |= DEV_STALE_LINK;
--	return;
--    }
--
--    /* Break the link with Card Services */
--    if (link->handle)
--	pcmcia_deregister_client(link->handle);
--    
--    /* Unlink device structure, free pieces */
--    *linkp = link->next;
--#endif
--    kfree(link->priv);
--    kfree(link);
--} /* cs_detach */
-+	cs_release(link);
-+	kfree(link->priv);
-+}
- 
- /*======================================================================
- 
-@@ -336,14 +232,15 @@
-     
- ======================================================================*/
- 
--static int get_tuple(client_handle_t handle, tuple_t *tuple, cisparse_t *parse)
-+static int get_tuple(struct pcmcia_device *handle, tuple_t *tuple,
-+                     cisparse_t *parse)
- {
-     int i = pcmcia_get_tuple_data(handle, tuple);
-     if (i != CS_SUCCESS) return i;
-     return pcmcia_parse_tuple(handle, tuple, parse);
- }
- 
--static int first_tuple(client_handle_t handle, tuple_t *tuple,
-+static int first_tuple(struct pcmcia_device *handle, tuple_t *tuple,
- 		     cisparse_t *parse)
- {
-     int i = pcmcia_get_first_tuple(handle, tuple);
-@@ -351,7 +248,7 @@
-     return get_tuple(handle, tuple, parse);
- }
- 
--static int next_tuple(client_handle_t handle, tuple_t *tuple,
-+static int next_tuple(struct pcmcia_device *handle, tuple_t *tuple,
- 		     cisparse_t *parse)
- {
-     int i = pcmcia_get_next_tuple(handle, tuple);
-@@ -359,9 +256,8 @@
-     return get_tuple(handle, tuple, parse);
- }
- 
--static void cs_config(dev_link_t *link)
-+static int cs_config(struct pcmcia_device *link)
- {
--    client_handle_t handle;
-     tuple_t tuple;
-     cisparse_t parse;
-     cistpl_cftable_entry_t *cf = &parse.cftable_entry;
-@@ -369,7 +265,6 @@
-     int i;
-     u_char buf[64];
-     char devname[128];
--    handle = link->handle;
-     dev = link->priv;
- 
-     /*
-@@ -378,25 +273,21 @@
-     */
-     do {
- 	tuple.DesiredTuple = CISTPL_CONFIG;
--	i = pcmcia_get_first_tuple(handle, &tuple);
-+	i = pcmcia_get_first_tuple(link, &tuple);
- 	if (i != CS_SUCCESS) break;
- 	tuple.TupleData = buf;
- 	tuple.TupleDataMax = 64;
- 	tuple.TupleOffset = 0;
--	i = pcmcia_get_tuple_data(handle, &tuple);
-+	i = pcmcia_get_tuple_data(link, &tuple);
- 	if (i != CS_SUCCESS) break;
--	i = pcmcia_parse_tuple(handle, &tuple, &parse);
-+	i = pcmcia_parse_tuple(link, &tuple, &parse);
- 	if (i != CS_SUCCESS) break;
- 	link->conf.ConfigBase = parse.config.base;
-     } while (0);
-     if (i != CS_SUCCESS) {
--	cs_error(link->handle, ParseTuple, i);
--	link->state &= ~DEV_CONFIG_PENDING;
--	return;
-+	cs_error(link, ParseTuple, i);
-+        return -ENODEV;
-     }
--    
--    /* Configure card */
--    link->state |= DEV_CONFIG;
- 
-     do {
- 
-@@ -407,7 +298,7 @@
- 	tuple.DesiredTuple = CISTPL_VERS_1;
- 
- 	devname[0] = 0;
--	if( !first_tuple(handle, &tuple, &parse) && parse.version_1.ns > 1 ) {
-+	if( !first_tuple(link, &tuple, &parse) && parse.version_1.ns > 1 ) {
- 	    strlcpy(devname,parse.version_1.str + parse.version_1.ofs[1], 
- 			sizeof(devname));
- 	}
-@@ -418,7 +309,7 @@
- 	tuple.TupleOffset = 0; tuple.TupleDataMax = 255;
- 	tuple.Attributes = 0;
- 	tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
--	i = first_tuple(handle, &tuple, &parse);
-+	i = first_tuple(link, &tuple, &parse);
- 	while (i == CS_SUCCESS) {
- 	    if (cf->io.nwin > 0) {
- 		link->conf.ConfigIndex = cf->index;
-@@ -428,36 +319,36 @@
-                 NOTE("testing i/o %#x-%#x\n",
- 			link->io.BasePort1,
- 		        link->io.BasePort1+link->io.NumPorts1-1);
--		i = pcmcia_request_io(link->handle, &link->io);
-+		i = pcmcia_request_io(link, &link->io);
- 		if (i == CS_SUCCESS) goto found_port;
- 	    }
--	    i = next_tuple(handle, &tuple, &parse);
-+	    i = next_tuple(link, &tuple, &parse);
- 	}
- 
- found_port:
- 	if (i != CS_SUCCESS) {
--	    cs_error(link->handle, RequestIO, i);
-+	    cs_error(link, RequestIO, i);
- 	    break;
- 	}
- 	
- 	/*
- 	 * allocate an interrupt line
- 	 */
--	i = pcmcia_request_irq(link->handle, &link->irq);
-+	i = pcmcia_request_irq(link, &link->irq);
- 	if (i != CS_SUCCESS) {
--	    cs_error(link->handle, RequestIRQ, i);
--	    pcmcia_release_io(link->handle, &link->io);
-+	    cs_error(link, RequestIRQ, i);
-+            /* undo */
-+            pcmcia_disable_device(link);
- 	    break;
- 	}
- 	
- 	/*
-          * configure the PCMCIA socket
- 	  */
--	i = pcmcia_request_configuration(link->handle, &link->conf);
-+	i = pcmcia_request_configuration(link, &link->conf);
- 	if (i != CS_SUCCESS) {
--	    cs_error(link->handle, RequestConfiguration, i);
--	    pcmcia_release_io(link->handle, &link->io);
--	    pcmcia_release_irq(link->handle, &link->irq);
-+	    cs_error(link, RequestConfiguration, i);
-+            pcmcia_disable_device(link);
- 	    break;
- 	}
- 
-@@ -469,14 +360,13 @@
-     strcpy(dev->node.dev_name, "A1");
-     dev->node.major = 64;
-     dev->node.minor = 0;
--    link->dev = &dev->node;
--    
--    link->state &= ~DEV_CONFIG_PENDING;
-+
-+    link->dev_node = &dev->node;
-     /* If any step failed, release any partially configured state */
-     if (i != 0) {
-         ERROR("Failed to setup controller, releasing link...\n");
- 	cs_release(link);
--	return;
-+	return -ENODEV;
-     }
-     NOTE("Ready to call card driver for '%s'...\n", devname);
- 
-@@ -488,7 +378,7 @@
- 		link->irq.AssignedIRQ
- 	);
- 	cs_release(link);
--	return;
-+	return -ENODEV;
-     }
-     dev->node.minor = i;
- 
-@@ -498,6 +388,7 @@
- 	link->io.BasePort1, 
- 	link->irq.AssignedIRQ
-     );
-+    return 0;
- } /* cs_config */
- 
- /*======================================================================
-@@ -508,96 +399,13 @@
-     
- ======================================================================*/
- 
--static void cs_release(dev_link_t *link)
-+static void cs_release(struct pcmcia_device *link)
- {
-     fcpcmcia_delcard(link->io.BasePort1, link->irq.AssignedIRQ);
- 
--    /* Unlink the device chain */
--    link->dev = NULL;
--    
--    /* Don't bother checking to see if these succeed or not */
--    pcmcia_release_configuration(link->handle);
--    pcmcia_release_io(link->handle, &link->io);
--    pcmcia_release_irq(link->handle, &link->irq);
--    link->state &= ~DEV_CONFIG;
--    
--#ifndef NEW_PCMCIA_DRV
--    if (link->state & DEV_STALE_LINK)
--	cs_detach(link);
--#endif
-+    pcmcia_disable_device(link);
- } /* cs_release */
- 
--#ifdef NEW_PCMCIA_DRV
--static int cs_suspend(struct pcmcia_device *dev)
--{
--	dev_link_t *link = dev_to_instance(dev);
--
--	link->state |= DEV_SUSPEND;
--	if (link->state & DEV_CONFIG)
--		pcmcia_release_configuration(link->handle);
--
--	return 0;
--}
--
--static int cs_resume(struct pcmcia_device *dev)
--{
--	dev_link_t *link = dev_to_instance(dev);
--
--	link->state &= ~DEV_SUSPEND;
--	if (link->state & DEV_CONFIG)
--		pcmcia_request_configuration(link->handle, &link->conf);
--
--	return 0;
--}
--#else
--/*======================================================================
--
--    The card status event handler.  Mostly, this schedules other
--    stuff to run after an event is received.  A CARD_REMOVAL event
--    also sets some flags to discourage the net drivers from trying
--    to talk to the card any more.
--
--    When a CARD_REMOVAL event is received, we immediately set a flag
--    to block future accesses to this device.  All the functions that
--    actually access the device should check this flag to make sure
--    the card is still present.
--    
--======================================================================*/
--
--static int cs_event(event_t event, int priority, event_callback_args_t *args)
--{
--    dev_link_t *link = args->client_data;
--
--    LOG("Card service event: %x\n", event);
--    switch (event) {
--    case CS_EVENT_CARD_REMOVAL:
--	link->state &= ~DEV_PRESENT;
--	if (link->state & DEV_CONFIG)
--		cs_release(link);
--	break;
--    case CS_EVENT_CARD_INSERTION:
--	link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
--	cs_config(link);
--	break;
--    case CS_EVENT_PM_SUSPEND:
--	link->state |= DEV_SUSPEND;
--	/* Fall through... */
--    case CS_EVENT_RESET_PHYSICAL:
--	if (link->state & DEV_CONFIG)
--	    pcmcia_release_configuration(link->handle);
--	break;
--    case CS_EVENT_PM_RESUME:
--	link->state &= ~DEV_SUSPEND;
--	/* Fall through... */
--    case CS_EVENT_CARD_RESET:
--	if (link->state & DEV_CONFIG)
--	    pcmcia_request_configuration(link->handle, &link->conf);
--	break;
--    }
--    return 0;
--} /* cs_event */
--#endif
--
- static struct pcmcia_device_id fcpcmcia_ids[] = {
- 	PCMCIA_DEVICE_PROD_ID12("AVM", "ISDN A", 0x95d42008, 0xadc9d4bb),
- 	PCMCIA_DEVICE_PROD_ID12("ISDN", "CARD", 0x8d9761c8, 0x01c5aa7b),
-@@ -610,17 +418,10 @@
- 	.drv	= {
- 		.name	= "fcpcmcia_cs",
- 	},
--#ifdef NEW_PCMCIA_DRV
--	.probe = cs_attach,
--	.remove = cs_detach,
--	.suspend= cs_suspend,
--	.resume = cs_resume,
--#else
--	.attach	= cs_attach,
--	.detach	= cs_detach,
--	.event	= cs_event,
--#endif
--	.id_table = fcpcmcia_ids, 
-+	.probe	= cs_probe,
-+	.remove	= cs_detach,
-+	.id_table = fcpcmcia_ids,
-+
- };
- 
- static int __init cs_init(void)
-@@ -631,6 +432,7 @@
- static void __exit cs_exit(void)
- {
- 	pcmcia_unregister_driver(&cs_driver);
-+
- }
- 
- module_init(cs_init);
-diff -ur usr.orig/src/kernel-modules/fritzcapi/fritz.pcmcia/src/main.c usr/src/kernel-modules/fritzcapi/fritz.pcmcia/src/main.c
---- usr.orig/src/kernel-modules/fritzcapi/fritz.pcmcia/src/main.c	2005-07-07 00:00:00.000000000 +0200
-+++ usr/src/kernel-modules/fritzcapi/fritz.pcmcia/src/main.c	2007-01-25 11:39:11.000000000 +0100
-@@ -22,7 +22,6 @@
- 
- #include <stdarg.h>
- #include <asm/uaccess.h>
--#include <linux/config.h>
- #include <linux/version.h>
- #include <linux/kernel.h>
- #include <linux/module.h>
diff --git a/net-dialup/fritzcapi/files/2.6.43-fcpcmcia.patch b/net-dialup/fritzcapi/files/2.6.43-fcpcmcia.patch
deleted file mode 100644
index aae12b1ff030..000000000000
--- a/net-dialup/fritzcapi/files/2.6.43-fcpcmcia.patch
+++ /dev/null
@@ -1,621 +0,0 @@
-diff -ur usr.orig/src/kernel-modules/fritzcapi/fritz.pcmcia/src/driver.h usr/src/kernel-modules/fritzcapi/fritz.pcmcia/src/driver.h
---- usr.orig/src/kernel-modules/fritzcapi/fritz.pcmcia/src/driver.h	2005-07-07 00:00:00.000000000 +0200
-+++ usr/src/kernel-modules/fritzcapi/fritz.pcmcia/src/driver.h	2007-01-25 11:39:11.000000000 +0100
-@@ -23,7 +23,6 @@
- #ifndef __have_driver_h__
- #define __have_driver_h__
- 
--#include <linux/config.h>
- #include <linux/skbuff.h>
- #include <linux/capi.h>
- #include <linux/list.h>
-diff -ur usr.orig/src/kernel-modules/fritzcapi/fritz.pcmcia/src/fcpcmcia_cs.c usr/src/kernel-modules/fritzcapi/fritz.pcmcia/src/fcpcmcia_cs.c
---- usr.orig/src/kernel-modules/fritzcapi/fritz.pcmcia/src/fcpcmcia_cs.c	2006-01-30 17:09:05.000000000 +0100
-+++ usr/src/kernel-modules/fritzcapi/fritz.pcmcia/src/fcpcmcia_cs.c	2007-02-05 21:43:14.000000000 +0100
-@@ -46,7 +46,6 @@
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
- #define PCMCIA_IRQ_INFO2
- #endif
--#define NEW_PCMCIA_DRV
- 
- /*====================================================================*/
- MODULE_LICENSE("GPL");
-@@ -111,13 +110,9 @@
-    handler.
- */
- 
--static void cs_config(dev_link_t *);
--static void cs_release(dev_link_t *);
--#ifdef NEW_PCMCIA_DRV
--static void cs_detach(struct pcmcia_device *p_dev);
--static int cs_attach(struct pcmcia_device *p_dev);
--#else
--static int cs_event(event_t event, int priority, event_callback_args_t *);
-+static int cs_config(struct pcmcia_device *link);
-+static void cs_release(struct pcmcia_device *link);
-+
- 
- /*
-    The attach() and detach() entry points are used to create and destroy
-@@ -125,48 +120,33 @@
-    needed to manage one actual PCMCIA card.
- */
- 
--static dev_link_t * cs_attach(void);
--static void cs_detach(dev_link_t *);
--/*
--   The dev_info variable is the "key" that is used to match up this
--   device driver with appropriate cards, through the card configuration
--   database.
--*/
-+static void cs_detach(struct pcmcia_device *p_dev);
- 
--static dev_info_t dev_info = "fcpcmcia_cs";
- 
- /*
-    A linked list of "instances" of the skeleton device.  Each actual
-    PCMCIA card corresponds to one device instance, and is described
--   by one dev_link_t structure (defined in ds.h).
-+   by one struct pcmcia_device structure (defined in ds.h).
- 
-    You may not want to use a linked list for this -- for example, the
--   memory card driver uses an array of dev_link_t pointers, where minor
-+   memory card driver uses an array of struct pcmcia_device pointers, where minor
-    device numbers are used to derive the corresponding array index.
- */
- 
--static dev_link_t *dev_list = NULL;
- 
--#endif
- /*
--   A dev_link_t structure has fields for most things that are needed
--   to keep track of a socket, but there will usually be some device
--   specific information that also needs to be kept track of.  The
--   'priv' pointer in a dev_link_t structure can be used to point to
--   a device-specific private data structure, like this.
--
-    A driver needs to provide a dev_node_t structure for each device
-    on a card.  In some cases, there is only one device per card (for
-    example, ethernet cards, modems).  In other cases, there may be
-    many actual or logical devices (SCSI adapters, memory cards with
-    multiple partitions).  The dev_node_t structures need to be kept
--   in a linked list starting at the 'dev' field of a dev_link_t
-+   in a linked list starting at the 'dev' field of a struct pcmcia_device
-    structure.  We allocate them in the card's private data structure,
-    because they generally can't be allocated dynamically.
- */
-    
- typedef struct local_info_t {
--    dev_node_t	node;
-+	dev_node_t node;
- } local_info_t;
- 
- /*======================================================================
-@@ -181,101 +161,52 @@
-     
- ======================================================================*/
- 
--#ifdef NEW_PCMCIA_DRV
--static int cs_attach(struct pcmcia_device *p_dev)
-+static int cs_probe(struct pcmcia_device *p_dev)
- {
--#else
--static dev_link_t *cs_attach(void)
--{
--    client_reg_t client_reg;
--    int ret;
--#endif
--    dev_link_t *link;
--    local_info_t *local;
-+	local_info_t *local;
- #if defined (PCMCIA_IRQ_INFO2)
--    int i;
-+	int i;
- #endif
-     
--    NOTE("Attaching device...\n");
-+	NOTE("Attaching device...\n");
- 
--    /* Initialize the dev_link_t structure */
--    link = kmalloc(sizeof(struct dev_link_t), GFP_KERNEL);
--    if (!link)
--        goto err;
--    memset(link, 0, sizeof(struct dev_link_t));
--
--    /* The io structure describes IO port mapping */
--    link->io.NumPorts1 = 16;
--    link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
--    link->io.NumPorts2 = 0;
-+	/* The io structure describes IO port mapping */
-+	p_dev->io.NumPorts1 = 16;
-+	p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
-+	p_dev->io.NumPorts2 = 0;
- 
--    /* Interrupt setup */
--    link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED;
-+	/* Interrupt setup */
-+	p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED;
- 
- #if defined (PCMCIA_IRQ_INFO2)
--    link->irq.IRQInfo1 = IRQ_INFO2_VALID|IRQ_LEVEL_ID;
--    if (irq_list_count > 0) {
--	for (i = 0; (i < irq_list_count) && (irq_list[i] > 0); i++)
--	    link->irq.IRQInfo2 |= 1 << irq_list[i];
--    } else {
--	for (i = 0; (i < irq_list_count) && (default_irq_list[i] > 0); i++)
--	    link->irq.IRQInfo2 |= 1 << default_irq_list[i];
--    }
-+	p_dev->irq.IRQInfo1 = IRQ_INFO2_VALID|IRQ_LEVEL_ID;
-+	if (irq_list_count > 0) {
-+		for (i = 0; (i < irq_list_count) && (irq_list[i] > 0); i++)
-+			p_dev->irq.IRQInfo2 |= 1 << irq_list[i];
-+	} else {
-+		for (i = 0; (i < irq_list_count) && (default_irq_list[i] > 0); i++)
-+			p_dev->irq.IRQInfo2 |= 1 << default_irq_list[i];
-+	}
- #else
--    link->irq.IRQInfo1 = IRQ_LEVEL_ID;
-+	p_dev->irq.IRQInfo1 = IRQ_LEVEL_ID;
- #endif
-     
--    /* General socket configuration */
--    link->conf.Attributes = CONF_ENABLE_IRQ;
--    link->conf.Vcc = 50;
--    link->conf.IntType = INT_MEMORY_AND_IO;
--    link->conf.ConfigIndex = 1;
--    link->conf.Present = PRESENT_OPTION;
--
--    /* Allocate space for private device-specific data */
--    local = kmalloc(sizeof(local_info_t), GFP_KERNEL);
--    if (!local)
--        goto err_kfree;
--    memset(local, 0, sizeof(local_info_t));
--    link->priv = local;
--    
--#ifdef NEW_PCMCIA_DRV
--    link->handle = p_dev;
--    p_dev->instance = link;
--    link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
--    cs_config(link);
--    return 0;
--#else
--    /* Register with Card Services */
--    link->next = dev_list;
--    dev_list = link;
--    client_reg.dev_info = &dev_info;
--#if 0
--    client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
--    client_reg.EventMask =
--	CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
--	CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
--	CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME;
--    client_reg.event_handler = &cs_event;
--#endif
--    client_reg.Version = 0x0210;
--    client_reg.event_callback_args.client_data = link;
--    ret = pcmcia_register_client(&link->handle, &client_reg);
--    if (ret != 0) {
--	cs_error(link->handle, RegisterClient, ret);
--	cs_detach(link);
--	goto err;
--    }
--    return link;
--#endif
-- err_kfree:
--    kfree(link);
-- err:
--#ifdef NEW_PCMCIA_DRV
--    return -EINVAL;
--#else
--    return NULL;
--#endif
-+	/* General socket configuration */
-+	p_dev->conf.Attributes = CONF_ENABLE_IRQ;
-+	p_dev->conf.IntType = INT_MEMORY_AND_IO;
-+	p_dev->conf.ConfigIndex = 1;
-+	p_dev->conf.Present = PRESENT_OPTION;
-+
-+	/* Allocate space for private device-specific data */
-+	local = kmalloc(sizeof(local_info_t), GFP_KERNEL);
-+	if (!local)
-+	 	goto err_kfree;
-+	memset(local, 0, sizeof(local_info_t));
-+	p_dev->priv = local;
-+	return cs_config(p_dev);
-+
-+err_kfree:
-+	return -ENOMEM;
- } /* cs_attach */
- 
- /*======================================================================
-@@ -286,47 +217,12 @@
-     when the device is released.
- 
- ======================================================================*/
--#ifdef NEW_PCMCIA_DRV
--static void cs_detach(struct pcmcia_device *p_dev)
--{
--    dev_link_t *link = dev_to_instance(p_dev);
- 
--    if (link->state & DEV_CONFIG)
--    	cs_release(link);
--#else
--static void cs_detach(dev_link_t *link)
-+static void cs_detach(struct pcmcia_device *link)
- {
--    dev_link_t **linkp;
--
--    NOTE("Detaching device...\n");
--
--    /* Locate device structure */
--    for (linkp = &dev_list; *linkp; linkp = &(*linkp)->next)
--	if (*linkp == link) break;
--    if (*linkp == NULL)
--	return;
--
--    /*
--       If the device is currently configured and active, we won't
--       actually delete it yet.  Instead, it is marked so that when
--       the release() function is called, that will trigger a proper
--       detach().
--    */
--    if (link->state & DEV_CONFIG) {
--	link->state |= DEV_STALE_LINK;
--	return;
--    }
--
--    /* Break the link with Card Services */
--    if (link->handle)
--	pcmcia_deregister_client(link->handle);
--    
--    /* Unlink device structure, free pieces */
--    *linkp = link->next;
--#endif
--    kfree(link->priv);
--    kfree(link);
--} /* cs_detach */
-+	cs_release(link);
-+	kfree(link->priv);
-+}
- 
- /*======================================================================
- 
-@@ -336,14 +232,15 @@
-     
- ======================================================================*/
- 
--static int get_tuple(client_handle_t handle, tuple_t *tuple, cisparse_t *parse)
-+static int get_tuple(struct pcmcia_device *handle, tuple_t *tuple,
-+                     cisparse_t *parse)
- {
-     int i = pcmcia_get_tuple_data(handle, tuple);
-     if (i != CS_SUCCESS) return i;
-     return pcmcia_parse_tuple(handle, tuple, parse);
- }
- 
--static int first_tuple(client_handle_t handle, tuple_t *tuple,
-+static int first_tuple(struct pcmcia_device *handle, tuple_t *tuple,
- 		     cisparse_t *parse)
- {
-     int i = pcmcia_get_first_tuple(handle, tuple);
-@@ -351,7 +248,7 @@
-     return get_tuple(handle, tuple, parse);
- }
- 
--static int next_tuple(client_handle_t handle, tuple_t *tuple,
-+static int next_tuple(struct pcmcia_device *handle, tuple_t *tuple,
- 		     cisparse_t *parse)
- {
-     int i = pcmcia_get_next_tuple(handle, tuple);
-@@ -359,9 +256,8 @@
-     return get_tuple(handle, tuple, parse);
- }
- 
--static void cs_config(dev_link_t *link)
-+static int cs_config(struct pcmcia_device *link)
- {
--    client_handle_t handle;
-     tuple_t tuple;
-     cisparse_t parse;
-     cistpl_cftable_entry_t *cf = &parse.cftable_entry;
-@@ -369,7 +265,6 @@
-     int i;
-     u_char buf[64];
-     char devname[128];
--    handle = link->handle;
-     dev = link->priv;
- 
-     /*
-@@ -378,25 +273,21 @@
-     */
-     do {
- 	tuple.DesiredTuple = CISTPL_CONFIG;
--	i = pcmcia_get_first_tuple(handle, &tuple);
-+	i = pcmcia_get_first_tuple(link, &tuple);
- 	if (i != CS_SUCCESS) break;
- 	tuple.TupleData = buf;
- 	tuple.TupleDataMax = 64;
- 	tuple.TupleOffset = 0;
--	i = pcmcia_get_tuple_data(handle, &tuple);
-+	i = pcmcia_get_tuple_data(link, &tuple);
- 	if (i != CS_SUCCESS) break;
--	i = pcmcia_parse_tuple(handle, &tuple, &parse);
-+	i = pcmcia_parse_tuple(link, &tuple, &parse);
- 	if (i != CS_SUCCESS) break;
- 	link->conf.ConfigBase = parse.config.base;
-     } while (0);
-     if (i != CS_SUCCESS) {
--	cs_error(link->handle, ParseTuple, i);
--	link->state &= ~DEV_CONFIG_PENDING;
--	return;
-+	cs_error(link, ParseTuple, i);
-+        return -ENODEV;
-     }
--    
--    /* Configure card */
--    link->state |= DEV_CONFIG;
- 
-     do {
- 
-@@ -407,7 +298,7 @@
- 	tuple.DesiredTuple = CISTPL_VERS_1;
- 
- 	devname[0] = 0;
--	if( !first_tuple(handle, &tuple, &parse) && parse.version_1.ns > 1 ) {
-+	if( !first_tuple(link, &tuple, &parse) && parse.version_1.ns > 1 ) {
- 	    strlcpy(devname,parse.version_1.str + parse.version_1.ofs[1], 
- 			sizeof(devname));
- 	}
-@@ -418,7 +309,7 @@
- 	tuple.TupleOffset = 0; tuple.TupleDataMax = 255;
- 	tuple.Attributes = 0;
- 	tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
--	i = first_tuple(handle, &tuple, &parse);
-+	i = first_tuple(link, &tuple, &parse);
- 	while (i == CS_SUCCESS) {
- 	    if (cf->io.nwin > 0) {
- 		link->conf.ConfigIndex = cf->index;
-@@ -428,36 +319,36 @@
-                 NOTE("testing i/o %#x-%#x\n",
- 			link->io.BasePort1,
- 		        link->io.BasePort1+link->io.NumPorts1-1);
--		i = pcmcia_request_io(link->handle, &link->io);
-+		i = pcmcia_request_io(link, &link->io);
- 		if (i == CS_SUCCESS) goto found_port;
- 	    }
--	    i = next_tuple(handle, &tuple, &parse);
-+	    i = next_tuple(link, &tuple, &parse);
- 	}
- 
- found_port:
- 	if (i != CS_SUCCESS) {
--	    cs_error(link->handle, RequestIO, i);
-+	    cs_error(link, RequestIO, i);
- 	    break;
- 	}
- 	
- 	/*
- 	 * allocate an interrupt line
- 	 */
--	i = pcmcia_request_irq(link->handle, &link->irq);
-+	i = pcmcia_request_irq(link, &link->irq);
- 	if (i != CS_SUCCESS) {
--	    cs_error(link->handle, RequestIRQ, i);
--	    pcmcia_release_io(link->handle, &link->io);
-+	    cs_error(link, RequestIRQ, i);
-+            /* undo */
-+            pcmcia_disable_device(link);
- 	    break;
- 	}
- 	
- 	/*
-          * configure the PCMCIA socket
- 	  */
--	i = pcmcia_request_configuration(link->handle, &link->conf);
-+	i = pcmcia_request_configuration(link, &link->conf);
- 	if (i != CS_SUCCESS) {
--	    cs_error(link->handle, RequestConfiguration, i);
--	    pcmcia_release_io(link->handle, &link->io);
--	    pcmcia_release_irq(link->handle, &link->irq);
-+	    cs_error(link, RequestConfiguration, i);
-+            pcmcia_disable_device(link);
- 	    break;
- 	}
- 
-@@ -469,14 +360,13 @@
-     strcpy(dev->node.dev_name, "A1");
-     dev->node.major = 64;
-     dev->node.minor = 0;
--    link->dev = &dev->node;
--    
--    link->state &= ~DEV_CONFIG_PENDING;
-+
-+    link->dev_node = &dev->node;
-     /* If any step failed, release any partially configured state */
-     if (i != 0) {
-         ERROR("Failed to setup controller, releasing link...\n");
- 	cs_release(link);
--	return;
-+	return -ENODEV;
-     }
-     NOTE("Ready to call card driver for '%s'...\n", devname);
- 
-@@ -488,7 +378,7 @@
- 		link->irq.AssignedIRQ
- 	);
- 	cs_release(link);
--	return;
-+	return -ENODEV;
-     }
-     dev->node.minor = i;
- 
-@@ -498,6 +388,7 @@
- 	link->io.BasePort1, 
- 	link->irq.AssignedIRQ
-     );
-+    return 0;
- } /* cs_config */
- 
- /*======================================================================
-@@ -508,96 +399,13 @@
-     
- ======================================================================*/
- 
--static void cs_release(dev_link_t *link)
-+static void cs_release(struct pcmcia_device *link)
- {
-     fcpcmcia_delcard(link->io.BasePort1, link->irq.AssignedIRQ);
- 
--    /* Unlink the device chain */
--    link->dev = NULL;
--    
--    /* Don't bother checking to see if these succeed or not */
--    pcmcia_release_configuration(link->handle);
--    pcmcia_release_io(link->handle, &link->io);
--    pcmcia_release_irq(link->handle, &link->irq);
--    link->state &= ~DEV_CONFIG;
--    
--#ifndef NEW_PCMCIA_DRV
--    if (link->state & DEV_STALE_LINK)
--	cs_detach(link);
--#endif
-+    pcmcia_disable_device(link);
- } /* cs_release */
- 
--#ifdef NEW_PCMCIA_DRV
--static int cs_suspend(struct pcmcia_device *dev)
--{
--	dev_link_t *link = dev_to_instance(dev);
--
--	link->state |= DEV_SUSPEND;
--	if (link->state & DEV_CONFIG)
--		pcmcia_release_configuration(link->handle);
--
--	return 0;
--}
--
--static int cs_resume(struct pcmcia_device *dev)
--{
--	dev_link_t *link = dev_to_instance(dev);
--
--	link->state &= ~DEV_SUSPEND;
--	if (link->state & DEV_CONFIG)
--		pcmcia_request_configuration(link->handle, &link->conf);
--
--	return 0;
--}
--#else
--/*======================================================================
--
--    The card status event handler.  Mostly, this schedules other
--    stuff to run after an event is received.  A CARD_REMOVAL event
--    also sets some flags to discourage the net drivers from trying
--    to talk to the card any more.
--
--    When a CARD_REMOVAL event is received, we immediately set a flag
--    to block future accesses to this device.  All the functions that
--    actually access the device should check this flag to make sure
--    the card is still present.
--    
--======================================================================*/
--
--static int cs_event(event_t event, int priority, event_callback_args_t *args)
--{
--    dev_link_t *link = args->client_data;
--
--    LOG("Card service event: %x\n", event);
--    switch (event) {
--    case CS_EVENT_CARD_REMOVAL:
--	link->state &= ~DEV_PRESENT;
--	if (link->state & DEV_CONFIG)
--		cs_release(link);
--	break;
--    case CS_EVENT_CARD_INSERTION:
--	link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
--	cs_config(link);
--	break;
--    case CS_EVENT_PM_SUSPEND:
--	link->state |= DEV_SUSPEND;
--	/* Fall through... */
--    case CS_EVENT_RESET_PHYSICAL:
--	if (link->state & DEV_CONFIG)
--	    pcmcia_release_configuration(link->handle);
--	break;
--    case CS_EVENT_PM_RESUME:
--	link->state &= ~DEV_SUSPEND;
--	/* Fall through... */
--    case CS_EVENT_CARD_RESET:
--	if (link->state & DEV_CONFIG)
--	    pcmcia_request_configuration(link->handle, &link->conf);
--	break;
--    }
--    return 0;
--} /* cs_event */
--#endif
--
- static struct pcmcia_device_id fcpcmcia_ids[] = {
- 	PCMCIA_DEVICE_PROD_ID12("AVM", "ISDN A", 0x95d42008, 0xadc9d4bb),
- 	PCMCIA_DEVICE_PROD_ID12("ISDN", "CARD", 0x8d9761c8, 0x01c5aa7b),
-@@ -610,17 +418,10 @@
- 	.drv	= {
- 		.name	= "fcpcmcia_cs",
- 	},
--#ifdef NEW_PCMCIA_DRV
--	.probe = cs_attach,
--	.remove = cs_detach,
--	.suspend= cs_suspend,
--	.resume = cs_resume,
--#else
--	.attach	= cs_attach,
--	.detach	= cs_detach,
--	.event	= cs_event,
--#endif
--	.id_table = fcpcmcia_ids, 
-+	.probe	= cs_probe,
-+	.remove	= cs_detach,
-+	.id_table = fcpcmcia_ids,
-+
- };
- 
- static int __init cs_init(void)
-@@ -631,6 +432,7 @@
- static void __exit cs_exit(void)
- {
- 	pcmcia_unregister_driver(&cs_driver);
-+
- }
- 
- module_init(cs_init);
-diff -ur usr.orig/src/kernel-modules/fritzcapi/fritz.pcmcia/src/main.c usr/src/kernel-modules/fritzcapi/fritz.pcmcia/src/main.c
---- usr.orig/src/kernel-modules/fritzcapi/fritz.pcmcia/src/main.c	2005-07-07 00:00:00.000000000 +0200
-+++ usr/src/kernel-modules/fritzcapi/fritz.pcmcia/src/main.c	2007-01-25 11:39:11.000000000 +0100
-@@ -22,7 +22,6 @@
- 
- #include <stdarg.h>
- #include <asm/uaccess.h>
--#include <linux/config.h>
- #include <linux/version.h>
- #include <linux/kernel.h>
- #include <linux/module.h>
-diff -ur usr.orig/src/kernel-modules/fritzcapi/fritz.pcmcia/src/tools.h usr/src/kernel-modules/fritzcapi/fritz.pcmcia/src/tools.h
---- usr.orig/src/kernel-modules/fritzcapi/fritz.pcmcia/src/tools.h	2006-01-30 17:09:05.000000000 +0100
-+++ usr/src/kernel-modules/fritzcapi/fritz.pcmcia/src/tools.h	2007-01-25 11:38:56.000000000 +0100
-@@ -69,16 +69,8 @@
- extern void lprintf  (const char *, const char *, ...);
- extern void vlprintf (const char *, const char *, va_list);
- 
--/*---------------------------------------------------------------------------*\
--\*---------------------------------------------------------------------------*/
--#ifndef atomic_xchg
--static inline unsigned long atomic_xchg (
--	volatile atomic_t *	v, 
--	unsigned		value
--) {
--	return __xchg (value, &v->counter, sizeof (unsigned));
--} /* atomic_xchg */
--#endif
-+
-+
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
- #ifndef NDEBUG
diff --git a/net-dialup/fritzcapi/files/2.6.43-linux-2.6.19-irq_handler.amd64.patch b/net-dialup/fritzcapi/files/2.6.43-linux-2.6.19-irq_handler.amd64.patch
deleted file mode 100644
index bec428318a0d..000000000000
--- a/net-dialup/fritzcapi/files/2.6.43-linux-2.6.19-irq_handler.amd64.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-irq_handler_t has changed type in 2.6.19 due to commit
-7d12e780e003f93433d49ce78cfedf4b4c52adc5 by David Howells,
-for details see git diff at http://tinyurl.com/2xpdy7
-
-As the third argument was never used by the drivers, I simply wrapped every
-occurrence of it in a condition for kernel version prior to 2.6.19.
-2007-01-13 Martin von Gagern <Martin.vGagern@gmx.net>
-
-diff -ur usr.orig/src/kernel-modules/fritzcapi/fritz.pci/src/driver.c usr/src/kernel-modules/fritzcapi/fritz.pci/src/driver.c
---- usr.orig/src/kernel-modules/fritzcapi/fritz.pci/src/driver.c	2007-01-22 23:36:39.000000000 +0100
-+++ usr/src/kernel-modules/fritzcapi/fritz.pci/src/driver.c	2007-01-23 00:07:18.000000000 +0100
-@@ -107,7 +107,11 @@
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
- static void scheduler (unsigned long data);
--static irqreturn_t irq_handler (int irq, void * args, struct pt_regs * regs);
-+static irqreturn_t irq_handler (int irq, void * args
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
-+				, struct pt_regs * regs
-+#endif
-+				);
- 
- static DECLARE_TASKLET_DISABLED (scheduler_tasklet, scheduler, 0);
- 
-@@ -836,11 +840,17 @@
- 
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
--static irqreturn_t irq_handler (int irq, void * args, struct pt_regs * regs) {
-+static irqreturn_t irq_handler (int irq, void * args
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
-+				, struct pt_regs * regs
-+#endif
-+				) {
- 	int	res	= IRQ_NONE;
- 	
- 	UNUSED_ARG (irq);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
- 	UNUSED_ARG (regs);
-+#endif
- 	if (args != NULL) {
- 		assert (capi_lib->cm_handle_events != NULL);
- 		if (atomic_read (&scheduler_id) == smp_processor_id ()) {
-diff -ur usr.orig/src/kernel-modules/fritzcapi/fritz.pcmcia/src/driver.c usr/src/kernel-modules/fritzcapi/fritz.pcmcia/src/driver.c
---- usr.orig/src/kernel-modules/fritzcapi/fritz.pcmcia/src/driver.c	2007-01-22 23:36:39.000000000 +0100
-+++ usr/src/kernel-modules/fritzcapi/fritz.pcmcia/src/driver.c	2007-01-23 00:07:18.000000000 +0100
-@@ -107,7 +107,11 @@
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
- static void scheduler (unsigned long data);
--static irqreturn_t irq_handler (int irq, void * args, struct pt_regs * regs);
-+static irqreturn_t irq_handler (int irq, void * args
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
-+				, struct pt_regs * regs
-+#endif
-+				);
- 
- static DECLARE_TASKLET_DISABLED (scheduler_tasklet, scheduler, 0);
- 
-@@ -836,11 +840,17 @@
- 
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
--static irqreturn_t irq_handler (int irq, void * args, struct pt_regs * regs) {
-+static irqreturn_t irq_handler (int irq, void * args
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
-+				, struct pt_regs * regs
-+#endif
-+				) {
- 	int	res	= IRQ_NONE;
- 	
- 	UNUSED_ARG (irq);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
- 	UNUSED_ARG (regs);
-+#endif
- 	if (args != NULL) {
- 		assert (capi_lib->cm_handle_events != NULL);
- 		if (atomic_read (&scheduler_id) == smp_processor_id ()) {
diff --git a/net-dialup/fritzcapi/files/2.6.43-linux-2.6.19-irq_handler.patch b/net-dialup/fritzcapi/files/2.6.43-linux-2.6.19-irq_handler.patch
deleted file mode 100644
index 0e203196909a..000000000000
--- a/net-dialup/fritzcapi/files/2.6.43-linux-2.6.19-irq_handler.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-irq_handler_t has changed type in 2.6.19 due to commit
-7d12e780e003f93433d49ce78cfedf4b4c52adc5 by David Howells,
-for details see git diff at http://tinyurl.com/2xpdy7
-
-As the third argument was never used by the drivers, I simply wrapped every
-occurrence of it in a condition for kernel version prior to 2.6.19.
-2007-01-13 Martin von Gagern <Martin.vGagern@gmx.net>
-
-diff -ur usr.orig/src/kernel-modules/fritzcapi/fritz.classic/src/driver.c usr/src/kernel-modules/fritzcapi/fritz.classic/src/driver.c
---- usr.orig/src/kernel-modules/fritzcapi/fritz.classic/src/driver.c	2007-01-22 23:36:39.000000000 +0100
-+++ usr/src/kernel-modules/fritzcapi/fritz.classic/src/driver.c	2007-01-23 00:04:30.000000000 +0100
-@@ -107,7 +107,11 @@
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
- static void scheduler (unsigned long data);
--static irqreturn_t irq_handler (int irq, void * args, struct pt_regs * regs);
-+static irqreturn_t irq_handler (int irq, void * args
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
-+				, struct pt_regs * regs
-+#endif
-+				);
- 
- static DECLARE_TASKLET_DISABLED (scheduler_tasklet, scheduler, 0);
- 
-@@ -805,11 +809,17 @@
- 
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
--static irqreturn_t irq_handler (int irq, void * args, struct pt_regs * regs) {
-+static irqreturn_t irq_handler (int irq, void * args
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
-+				, struct pt_regs * regs
-+#endif
-+				) {
- 	int	res	= IRQ_NONE;
- 	
- 	UNUSED_ARG (irq);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
- 	UNUSED_ARG (regs);
-+#endif
- 	if (args != NULL) {
- 		assert (capi_lib->cm_handle_events != NULL);
- 		if (atomic_read (&scheduler_id) == smp_processor_id ()) {
-diff -ur usr.orig/src/kernel-modules/fritzcapi/fritz.pci/src/driver.c usr/src/kernel-modules/fritzcapi/fritz.pci/src/driver.c
---- usr.orig/src/kernel-modules/fritzcapi/fritz.pci/src/driver.c	2007-01-22 23:36:39.000000000 +0100
-+++ usr/src/kernel-modules/fritzcapi/fritz.pci/src/driver.c	2007-01-23 00:07:18.000000000 +0100
-@@ -107,7 +107,11 @@
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
- static void scheduler (unsigned long data);
--static irqreturn_t irq_handler (int irq, void * args, struct pt_regs * regs);
-+static irqreturn_t irq_handler (int irq, void * args
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
-+				, struct pt_regs * regs
-+#endif
-+				);
- 
- static DECLARE_TASKLET_DISABLED (scheduler_tasklet, scheduler, 0);
- 
-@@ -836,11 +840,17 @@
- 
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
--static irqreturn_t irq_handler (int irq, void * args, struct pt_regs * regs) {
-+static irqreturn_t irq_handler (int irq, void * args
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
-+				, struct pt_regs * regs
-+#endif
-+				) {
- 	int	res	= IRQ_NONE;
- 	
- 	UNUSED_ARG (irq);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
- 	UNUSED_ARG (regs);
-+#endif
- 	if (args != NULL) {
- 		assert (capi_lib->cm_handle_events != NULL);
- 		if (atomic_read (&scheduler_id) == smp_processor_id ()) {
-diff -ur usr.orig/src/kernel-modules/fritzcapi/fritz.pcmcia/src/driver.c usr/src/kernel-modules/fritzcapi/fritz.pcmcia/src/driver.c
---- usr.orig/src/kernel-modules/fritzcapi/fritz.pcmcia/src/driver.c	2007-01-22 23:36:39.000000000 +0100
-+++ usr/src/kernel-modules/fritzcapi/fritz.pcmcia/src/driver.c	2007-01-23 00:07:18.000000000 +0100
-@@ -107,7 +107,11 @@
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
- static void scheduler (unsigned long data);
--static irqreturn_t irq_handler (int irq, void * args, struct pt_regs * regs);
-+static irqreturn_t irq_handler (int irq, void * args
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
-+				, struct pt_regs * regs
-+#endif
-+				);
- 
- static DECLARE_TASKLET_DISABLED (scheduler_tasklet, scheduler, 0);
- 
-@@ -836,11 +840,17 @@
- 
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
--static irqreturn_t irq_handler (int irq, void * args, struct pt_regs * regs) {
-+static irqreturn_t irq_handler (int irq, void * args
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
-+				, struct pt_regs * regs
-+#endif
-+				) {
- 	int	res	= IRQ_NONE;
- 	
- 	UNUSED_ARG (irq);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
- 	UNUSED_ARG (regs);
-+#endif
- 	if (args != NULL) {
- 		assert (capi_lib->cm_handle_events != NULL);
- 		if (atomic_read (&scheduler_id) == smp_processor_id ()) {
-diff -ur usr.orig/src/kernel-modules/fritzcapi/fritz.pnp/src/driver.c usr/src/kernel-modules/fritzcapi/fritz.pnp/src/driver.c
---- usr.orig/src/kernel-modules/fritzcapi/fritz.pnp/src/driver.c	2007-01-22 23:36:39.000000000 +0100
-+++ usr/src/kernel-modules/fritzcapi/fritz.pnp/src/driver.c	2007-01-23 00:04:52.000000000 +0100
-@@ -107,7 +107,11 @@
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
- static void scheduler (unsigned long data);
--static irqreturn_t irq_handler (int irq, void * args, struct pt_regs * regs);
-+static irqreturn_t irq_handler (int irq, void * args
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
-+				, struct pt_regs * regs
-+#endif
-+				);
- 
- static DECLARE_TASKLET_DISABLED (scheduler_tasklet, scheduler, 0);
- 
-@@ -805,11 +809,17 @@
- 
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
--static irqreturn_t irq_handler (int irq, void * args, struct pt_regs * regs) {
-+static irqreturn_t irq_handler (int irq, void * args
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
-+				, struct pt_regs * regs
-+#endif
-+				) {
- 	int	res	= IRQ_NONE;
- 	
- 	UNUSED_ARG (irq);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
- 	UNUSED_ARG (regs);
-+#endif
- 	if (args != NULL) {
- 		assert (capi_lib->cm_handle_events != NULL);
- 		if (atomic_read (&scheduler_id) == smp_processor_id ()) {
diff --git a/net-dialup/fritzcapi/files/2.6.43-linux-2.6.22-pci_module_init.patch b/net-dialup/fritzcapi/files/2.6.43-linux-2.6.22-pci_module_init.patch
deleted file mode 100644
index 6624e327ec9f..000000000000
--- a/net-dialup/fritzcapi/files/2.6.43-linux-2.6.22-pci_module_init.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur usr.orig/src/kernel-modules/fritzcapi/fritz.pci/src/main.c usr/src/kernel-modules/fritzcapi/fritz.pci/src/main.c
---- usr.orig/src/kernel-modules/fritzcapi/fritz.pci/src/main.c	2007-08-25 09:54:42.000000000 +0200
-+++ usr/src/kernel-modules/fritzcapi/fritz.pci/src/main.c	2007-08-25 09:55:02.000000000 +0200
-@@ -364,7 +364,7 @@
- #endif
- 
- #if defined (__fcpci__)	
--	if (0 == (err = pci_module_init (&fcpci_driver))) {
-+	if (0 == (err = pci_register_driver (&fcpci_driver))) {
- 		LOG("PCI driver registered.\n");
- 		register_capi_driver (&fritz_capi_driver);
- 		LOG("CAPI driver registered.\n");
diff --git a/net-dialup/fritzcapi/files/fcusb2-2.6.19.patch b/net-dialup/fritzcapi/files/fcusb2-2.6.19.patch
deleted file mode 100644
index 5ab67c105088..000000000000
--- a/net-dialup/fritzcapi/files/fcusb2-2.6.19.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/main.c.orig	2006-12-13 15:41:52.000000000 +0100
-+++ src/main.c	2006-12-13 15:43:02.000000000 +0100
-@@ -81,14 +81,7 @@
- } ;
- 
- 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 --git a/net-dialup/fritzcapi/files/fritzcapi-2.6.20.amd64.patch b/net-dialup/fritzcapi/files/fritzcapi-2.6.20.amd64.patch
deleted file mode 100644
index 14508988b825..000000000000
--- a/net-dialup/fritzcapi/files/fritzcapi-2.6.20.amd64.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN usr.orig/src/kernel-modules/fritzcapi/fritz.usb2/src/driver.c usr/src/kernel-modules/fritzcapi/fritz.usb2/src/driver.c
---- usr.orig/src/kernel-modules/fritzcapi/fritz.usb2/src/driver.c	2007-02-06 00:41:17.000000000 +0100
-+++ usr/src/kernel-modules/fritzcapi/fritz.usb2/src/driver.c	2007-02-06 00:46:06.000000000 +0100
-@@ -789,7 +789,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 --git a/net-dialup/fritzcapi/files/fritzcapi-2.6.20.patch b/net-dialup/fritzcapi/files/fritzcapi-2.6.20.patch
deleted file mode 100644
index 6531099d8cd7..000000000000
--- a/net-dialup/fritzcapi/files/fritzcapi-2.6.20.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -urN usr.orig/src/kernel-modules/fritzcapi/e2220pc/src/driver.c usr/src/kernel-modules/fritzcapi/e2220pc/src/driver.c
---- usr.orig/src/kernel-modules/fritzcapi/e2220pc/src/driver.c	2007-02-06 00:41:17.000000000 +0100
-+++ usr/src/kernel-modules/fritzcapi/e2220pc/src/driver.c	2007-02-06 00:42:57.000000000 +0100
-@@ -756,7 +756,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 -urN usr.orig/src/kernel-modules/fritzcapi/e5520pc/src/driver.c usr/src/kernel-modules/fritzcapi/e5520pc/src/driver.c
---- usr.orig/src/kernel-modules/fritzcapi/e5520pc/src/driver.c	2007-02-06 00:41:17.000000000 +0100
-+++ usr/src/kernel-modules/fritzcapi/e5520pc/src/driver.c	2007-02-06 00:43:12.000000000 +0100
-@@ -756,7 +756,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 -urN usr.orig/src/kernel-modules/fritzcapi/fritz.usb/src/driver.c usr/src/kernel-modules/fritzcapi/fritz.usb/src/driver.c
---- usr.orig/src/kernel-modules/fritzcapi/fritz.usb/src/driver.c	2007-02-06 00:41:17.000000000 +0100
-+++ usr/src/kernel-modules/fritzcapi/fritz.usb/src/driver.c	2007-02-06 00:43:33.000000000 +0100
-@@ -789,7 +789,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 -urN usr.orig/src/kernel-modules/fritzcapi/fritz.usb2/src/driver.c usr/src/kernel-modules/fritzcapi/fritz.usb2/src/driver.c
---- usr.orig/src/kernel-modules/fritzcapi/fritz.usb2/src/driver.c	2007-02-06 00:41:17.000000000 +0100
-+++ usr/src/kernel-modules/fritzcapi/fritz.usb2/src/driver.c	2007-02-06 00:46:06.000000000 +0100
-@@ -789,7 +789,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 -urN usr.orig/src/kernel-modules/fritzcapi/fritz.xusb/src/driver.c usr/src/kernel-modules/fritzcapi/fritz.xusb/src/driver.c
---- usr.orig/src/kernel-modules/fritzcapi/fritz.xusb/src/driver.c	2007-02-06 00:41:17.000000000 +0100
-+++ usr/src/kernel-modules/fritzcapi/fritz.xusb/src/driver.c	2007-02-06 00:43:48.000000000 +0100
-@@ -789,7 +789,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 -urN usr.orig/src/kernel-modules/fritzcapi/fritz.xusb_CZ/src/driver.c usr/src/kernel-modules/fritzcapi/fritz.xusb_CZ/src/driver.c
---- usr.orig/src/kernel-modules/fritzcapi/fritz.xusb_CZ/src/driver.c	2007-02-06 00:41:17.000000000 +0100
-+++ usr/src/kernel-modules/fritzcapi/fritz.xusb_CZ/src/driver.c	2007-02-06 00:45:52.000000000 +0100
-@@ -789,7 +789,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 --git a/net-dialup/fritzcapi/files/fritzcapi-2.6.22.patch b/net-dialup/fritzcapi/files/fritzcapi-2.6.22.patch
deleted file mode 100644
index 7ef955ed3aba..000000000000
--- a/net-dialup/fritzcapi/files/fritzcapi-2.6.22.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -ur usr.orig/src/kernel-modules/fritzcapi/fritz.classic/src/main.c usr/src/kernel-modules/fritzcapi/fritz.classic/src/main.c
---- usr.orig/src/kernel-modules/fritzcapi/fritz.classic/src/main.c	2007-07-11 08:09:35.000000000 +0200
-+++ usr/src/kernel-modules/fritzcapi/fritz.classic/src/main.c	2007-07-11 08:18:31.000000000 +0200
-@@ -374,7 +374,7 @@
- 	}
- 
- #if defined (__fcpci__)	
--	if (0 == (err = pci_module_init (&fcpci_driver))) {
-+	if (0 == (err = pci_register_driver (&fcpci_driver))) {
- 		LOG("PCI driver registered.\n");
- 		register_capi_driver (&fritz_capi_driver);
- 		LOG("CAPI driver registered.\n");
-diff -ur usr.orig/src/kernel-modules/fritzcapi/fritz.pci/src/main.c usr/src/kernel-modules/fritzcapi/fritz.pci/src/main.c
---- usr.orig/src/kernel-modules/fritzcapi/fritz.pci/src/main.c	2007-07-11 08:09:35.000000000 +0200
-+++ usr/src/kernel-modules/fritzcapi/fritz.pci/src/main.c	2007-07-11 08:18:31.000000000 +0200
-@@ -364,7 +364,7 @@
- #endif
- 
- #if defined (__fcpci__)	
--	if (0 == (err = pci_module_init (&fcpci_driver))) {
-+	if (0 == (err = pci_register_driver (&fcpci_driver))) {
- 		LOG("PCI driver registered.\n");
- 		register_capi_driver (&fritz_capi_driver);
- 		LOG("CAPI driver registered.\n");
-diff -ur usr.orig/src/kernel-modules/fritzcapi/fritz.pcmcia/src/main.c usr/src/kernel-modules/fritzcapi/fritz.pcmcia/src/main.c
---- usr.orig/src/kernel-modules/fritzcapi/fritz.pcmcia/src/main.c	2007-07-11 08:09:35.000000000 +0200
-+++ usr/src/kernel-modules/fritzcapi/fritz.pcmcia/src/main.c	2007-07-11 08:18:31.000000000 +0200
-@@ -363,7 +363,7 @@
- #endif
- 
- #if defined (__fcpci__)	
--	if (0 == (err = pci_module_init (&fcpci_driver))) {
-+	if (0 == (err = pci_register_driver (&fcpci_driver))) {
- 		LOG("PCI driver registered.\n");
- 		register_capi_driver (&fritz_capi_driver);
- 		LOG("CAPI driver registered.\n");
-diff -ur usr.orig/src/kernel-modules/fritzcapi/fritz.pnp/src/main.c usr/src/kernel-modules/fritzcapi/fritz.pnp/src/main.c
---- usr.orig/src/kernel-modules/fritzcapi/fritz.pnp/src/main.c	2007-07-11 08:09:35.000000000 +0200
-+++ usr/src/kernel-modules/fritzcapi/fritz.pnp/src/main.c	2007-07-11 08:18:31.000000000 +0200
-@@ -375,7 +375,7 @@
- 	}
- 
- #if defined (__fcpci__)	
--	if (0 == (err = pci_module_init (&fcpci_driver))) {
-+	if (0 == (err = pci_register_driver (&fcpci_driver))) {
- 		LOG("PCI driver registered.\n");
- 		register_capi_driver (&fritz_capi_driver);
- 		LOG("CAPI driver registered.\n");
diff --git a/net-dialup/fritzcapi/fritzcapi-2.6.43.ebuild b/net-dialup/fritzcapi/fritzcapi-2.6.43.ebuild
deleted file mode 100644
index 85831423322e..000000000000
--- a/net-dialup/fritzcapi/fritzcapi-2.6.43.ebuild
+++ /dev/null
@@ -1,155 +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/fritzcapi/fritzcapi-2.6.43.ebuild,v 1.16 2007/08/29 18:45:40 genstef Exp $
-
-inherit linux-mod rpm eutils
-
-DESCRIPTION="SuSE's 2.6 AVM kernel modules for fcclassic, fcpci, fcpcmcia, fcpnp, fcusb, fcusb2, fxusb_CZ, fxusb, e2220pc and e5520pc"
-HOMEPAGE="http://www.avm.de/"
-
-SRC_URI="!amd64? ( ftp://ftp.suse.com/pub/suse/i386/10.1/SUSE-Linux10.1-Beta3-Extra/suse/i586/km_${P/2.6./2.6-}.i586.rpm )
-	amd64? ( ftp://ftp.suse.com/pub/suse/i386/10.1/SUSE-Linux10.1-Beta3-Extra/suse/x86_64/km_${P/2.6./2.6-}.x86_64.rpm )"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE="pcmcia usb"
-
-DEPEND="net-dialup/capi4k-utils"
-
-S="${WORKDIR}/usr/src/kernel-modules/fritzcapi"
-
-get_card_module_name() {
-	local CARD=$1
-	echo "${FRITZCAPI_MODULES[CARD]}(extra:${S}/${FRITZCAPI_TARGETS[CARD]}/src)"
-	if [ "${FRITZCAPI_MODULES[CARD]/pcmcia/}" != ${FRITZCAPI_MODULES[CARD]} ]; then
-		#PCMCIA have also a *_cs module
-		echo "${FRITZCAPI_MODULES[CARD]}_cs(extra:${S}/${FRITZCAPI_TARGETS[CARD]}/src)"
-	fi
-}
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	if ! kernel_is 2 6; then
-		die "This package works only with 2.6 kernel!"
-	fi
-	if ! linux_chkconfig_present ISDN_CAPI_CAPI20; then
-		die "For using the driver you need a kernel with enabled CAPI support."
-	fi
-
-	local USERCARD CARD
-	FRITZCAPI_BUILD_CARDS=""
-	FRITZCAPI_BUILD_TARGETS=""
-	MODULE_NAMES=""
-	BUILD_PARAMS="KDIR='${KV_DIR}' LIBDIR='${WORKDIR}'/var/lib/fritz"
-	BUILD_TARGETS="all"
-
-	if ! use amd64; then
-		FRITZCAPI_MODULES=("fcpci" "fcpcmcia" "fcusb" "fcusb2" "fxusb" "fcclassic"
-			"fcpnp" "fxusb_CZ" "e2220pc" "e5520pc")
-		FRITZCAPI_TARGETS=("fritz.pci" "fritz.pcmcia" "fritz.usb" "fritz.usb2"
-			"fritz.xusb" "fritz.classic" "fritz.pnp" "fritz.xusb_CZ" "e2220pc" "e5520pc")
-	else
-		FRITZCAPI_MODULES=("fcpci" "fcpcmcia" "fcusb2")
-		FRITZCAPI_TARGETS=("fritz.pci" "fritz.pcmcia" "fritz.usb2")
-	fi
-
-	if [ -n "${FRITZCAPI_CARDS}" ]; then
-		#Check existence of user selected cards
-		for USERCARD in ${FRITZCAPI_CARDS} ; do
-			for ((CARD=0; CARD < ${#FRITZCAPI_MODULES[*]}; CARD++)); do
-				if [ "${USERCARD}" = "${FRITZCAPI_MODULES[CARD]}" ]; then
-					FRITZCAPI_BUILD_CARDS="${FRITZCAPI_BUILD_CARDS} ${FRITZCAPI_MODULES[CARD]}"
-					FRITZCAPI_BUILD_TARGETS="${FRITZCAPI_BUILD_TARGETS} ${FRITZCAPI_TARGETS[CARD]}"
-					MODULE_NAMES="${MODULE_NAMES} `get_card_module_name ${CARD}`"
-					continue 2
-				fi
-			done
-			die "Module ${USERCARD} not present in ${P}"
-		done
-	else
-		elog
-		elog "You can control the modules which are built with the variable"
-		elog "FRITZCAPI_CARDS which should contain a blank separated list"
-		elog "of a selection from the following cards:"
-		elog "   ${FRITZCAPI_MODULES[*]}"
-		elog
-		ewarn "I give you the chance of hitting Ctrl-C and make the necessary"
-		ewarn "adjustments in /etc/make.conf."
-		ebeep
-
-		#Filter build targets by USE
-		for ((CARD=0; CARD < ${#FRITZCAPI_MODULES[*]}; CARD++)); do
-			if [ "${FRITZCAPI_MODULES[CARD]/pcmcia/}" != ${FRITZCAPI_MODULES[CARD]} ] && (! use pcmcia || kernel_is ge 2 6 17); then
-				continue
-			fi
-			if [ "${FRITZCAPI_MODULES[CARD]/usb/}" != ${FRITZCAPI_MODULES[CARD]} ] && ! use usb; then
-				continue
-			fi
-			FRITZCAPI_BUILD_CARDS="${FRITZCAPI_BUILD_CARDS} ${FRITZCAPI_MODULES[CARD]}"
-			FRITZCAPI_BUILD_TARGETS="${FRITZCAPI_BUILD_TARGETS} ${FRITZCAPI_TARGETS[CARD]}"
-			MODULE_NAMES="${MODULE_NAMES} `get_card_module_name ${CARD}`"
-		done
-	fi
-
-	elog "Selected cards: ${FRITZCAPI_BUILD_CARDS}"
-}
-
-src_unpack() {
-	rpm_unpack "${DISTDIR}/${A}" || die "failed to unpack ${A} file"
-
-	cd "${S}"
-	mkdir -p "${WORKDIR}/var/lib/fritz"
-	ln fritz.*/lib/*-lib.o "${WORKDIR}/var/lib/fritz"
-	for i in $(find . -name Makefile); do
-		sed -i 's:-C \$(KDIR) SUBDIRS=:-C $(KDIR) $(if $(KBUILD_OUTPUT),O=$(KBUILD_OUTPUT)) SUBDIRS=:' ${i}
-		sed -i 's:$(PWD)/../lib/$(CARD)-lib.o:$(LIBDIR)/$(CARD)-lib.o:' ${i}
-		sed -i "s:@cp -f ../lib/\$(CARD)-lib.o \$(LIBDIR)::" ${i}
-		sed -i "s:\$(PWD)/../lib/driver-lib.o:${S}/e2220pc/lib/driver-lib.o:" ${i}
-		convert_to_m ${i}
-	done
-	if [ -e fritz.usb2 ]; then
-		cd fritz.usb2; epatch ${FILESDIR}/fcusb2-2.6.19.patch; cd ..
-	fi
-	if ! use amd64; then
-	  epatch ${FILESDIR}/2.6.43-linux-2.6.19-irq_handler.patch
-	  kernel_is ge 2 6 17 && epatch ${FILESDIR}/2.6.43-fcpcmcia.patch
-	  kernel_is ge 2 6 20 && epatch ${FILESDIR}/fritzcapi-2.6.20.patch
-	  kernel_is ge 2 6 22 && epatch ${FILESDIR}/fritzcapi-2.6.22.patch
-	else
-	  epatch ${FILESDIR}/2.6.43-linux-2.6.19-irq_handler.amd64.patch
-	  kernel_is ge 2 6 17 && epatch ${FILESDIR}/2.6.43-fcpcmcia.amd64.patch
-	  kernel_is ge 2 6 20 && epatch ${FILESDIR}/fritzcapi-2.6.20.amd64.patch
-	  kernel_is ge 2 6 22 && epatch ${FILESDIR}/2.6.43-linux-2.6.22-pci_module_init.patch
-	fi
-	find -name \*.[hc] -print0 | xargs -0 sed -i '
-		s:#include <linux/config\.h>:#include <linux/autoconf.h>:;
-		s/driver_init/fc_driver_init/g; s/driver_exit/fc_driver_exit/;'
-}
-
-src_install() {
-	linux-mod_src_install
-
-	keepdir /lib/firmware
-
-	[ "${FRITZCAPI_BUILD_TARGETS/xusb_CZ/}" != "${FRITZCAPI_BUILD_TARGETS}" ] && \
-		dodoc "${S}/fritz.xusb_CZ/README.fxusb_CZ"
-
-	[ "${FRITZCAPI_BUILD_TARGETS/usb2/}" != "${FRITZCAPI_BUILD_TARGETS}" ] && (
-		insinto /lib/firmware
-		insopts -m0644
-		doins "${S}"/fritz.usb2/*.frm
-	)
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	elog "If your device needs a firmware, you should edit copy the firmware files"
-	elog "in /lib/firmware and edit /etc/capi.conf."
-	elog
-	[ "${FRITZCAPI_BUILD_TARGETS/usb2/}" != "${FRITZCAPI_BUILD_TARGETS}" ] && (
-		elog "Note: This ebuild has already installed firmware files necessary for following modules:"
-		elog "   fcusb2"
-	)
-}
diff --git a/net-dialup/fritzcapi/metadata.xml b/net-dialup/fritzcapi/metadata.xml
deleted file mode 100644
index b5b1a576e9ab..000000000000
--- a/net-dialup/fritzcapi/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>net-dialup</herd>
-<longdescription>SuSE's 2.6 AVM kernel modules for fcclassic, fcpci, fcpcmcia, fcpnp, fcusb, fcusb2, fxusb_CZ, fxusb, e2220pc and e5520pc</longdescription>
-</pkgmetadata>