Return to hisax_cfg.h CVS log

Up to [Development] / linux-2.6-xfs / drivers / isdn / hisax

Update 2.6.x-xfs to 2.6.23-rc4.

Also update fs/xfs with external mainline changes.
There were 12 such missing commits that I detected:

--------
commit ad690ef9e690f6c31f7d310b09ef1314bcec9033
Author: Al Viro <viro@ftp.linux.org.uk>
    xfs ioctl __user annotations

commit 20c2df83d25c6a95affe6157a4c9cac4cf5ffaac
Author: Paul Mundt <lethal@linux-sh.org>
    mm: Remove slab destructors from kmem_cache_create().

commit d0217ac04ca6591841e5665f518e38064f4e65bd
Author: Nick Piggin <npiggin@suse.de>
    mm: fault feedback #1

commit 54cb8821de07f2ffcd28c380ce9b93d5784b40d7
Author: Nick Piggin <npiggin@suse.de>
    mm: merge populate and nopage into fault (fixes nonlinear)

commit d00806b183152af6d24f46f0c33f14162ca1262a
Author: Nick Piggin <npiggin@suse.de>
    mm: fix fault vs invalidate race for linear mappings

commit a569425512253992cc64ebf8b6d00a62f986db3e
Author: Christoph Hellwig <hch@infradead.org>
    knfsd: exportfs: add exportfs.h header

commit 831441862956fffa17b9801db37e6ea1650b0f69
Author: Rafael J. Wysocki <rjw@sisk.pl>
    Freezer: make kernel threads nonfreezable by default

commit 8e1f936b73150f5095448a0fee6d4f30a1f9001d
Author: Rusty Russell <rusty@rustcorp.com.au>
    mm: clean up and kernelify shrinker registration

commit 5ffc4ef45b3b0a57872f631b4e4ceb8ace0d7496
Author: Jens Axboe <jens.axboe@oracle.com>
    sendfile: remove .sendfile from filesystems that use generic_file_sendfile()

commit 8bb7844286fb8c9fce6f65d8288aeb09d03a5e0d
Author: Rafael J. Wysocki <rjw@sisk.pl>
    Add suspend-related notifications for CPU hotplug

commit 59c51591a0ac7568824f541f57de967e88adaa07
Author: Michael Opdenacker <michael@free-electrons.com>
    Fix occurrences of "the the "

commit 0ceb331433e8aad9c5f441a965d7c681f8b9046f
Author: Dmitriy Monakhov <dmonakhov@openvz.org>
    mm: move common segment checks to separate helper function
--------
Merge of 2.6.x-xfs-melb:linux:29656b by kenmcd.

/* $Id: hisax_cfg.h,v 1.15 2007/09/12 17:09:56 tes.longdrop.melbourne.sgi.com Exp $
 * define of the basic HiSax configuration structures
 * and pcmcia interface
 *
 * This software may be used and distributed according to the terms
 * of the GNU General Public License, incorporated herein by reference.
 *
 */

#define ISDN_CTYPE_16_0			1
#define ISDN_CTYPE_8_0			2
#define ISDN_CTYPE_16_3			3
#define ISDN_CTYPE_PNP			4
#define ISDN_CTYPE_A1			5
#define ISDN_CTYPE_ELSA			6
#define ISDN_CTYPE_ELSA_PNP		7
#define ISDN_CTYPE_TELESPCMCIA		8
#define ISDN_CTYPE_IX1MICROR2		9
#define ISDN_CTYPE_ELSA_PCMCIA		10
#define ISDN_CTYPE_DIEHLDIVA		11
#define ISDN_CTYPE_ASUSCOM		12
#define ISDN_CTYPE_TELEINT		13
#define ISDN_CTYPE_TELES3C		14
#define ISDN_CTYPE_SEDLBAUER		15
#define ISDN_CTYPE_SPORTSTER		16
#define ISDN_CTYPE_MIC			17
#define ISDN_CTYPE_ELSA_PCI		18
#define ISDN_CTYPE_COMPAQ_ISA		19
#define ISDN_CTYPE_NETJET_S		20
#define ISDN_CTYPE_TELESPCI		21
#define ISDN_CTYPE_SEDLBAUER_PCMCIA	22
#define ISDN_CTYPE_AMD7930		23
#define ISDN_CTYPE_NICCY		24
#define ISDN_CTYPE_S0BOX		25
#define ISDN_CTYPE_A1_PCMCIA		26
#define ISDN_CTYPE_FRITZPCI		27
#define ISDN_CTYPE_SEDLBAUER_FAX	28
#define ISDN_CTYPE_ISURF		29
#define ISDN_CTYPE_ACERP10		30
#define ISDN_CTYPE_HSTSAPHIR		31
#define	ISDN_CTYPE_BKM_A4T		32
#define	ISDN_CTYPE_SCT_QUADRO		33
#define ISDN_CTYPE_GAZEL		34
#define ISDN_CTYPE_HFC_PCI		35
#define ISDN_CTYPE_W6692		36
#define ISDN_CTYPE_HFC_SX		37
#define ISDN_CTYPE_NETJET_U		38
#define ISDN_CTYPE_HFC_SP_PCMCIA	39
#define ISDN_CTYPE_DYNAMIC		40
#define ISDN_CTYPE_ENTERNOW		41
#define ISDN_CTYPE_COUNT		41

typedef struct IsdnCardState	IsdnCardState_t;
typedef struct IsdnCard		IsdnCard_t;

struct IsdnCard {
	int		typ;
	int 		protocol;	/* EDSS1, 1TR6 or NI1 */
	unsigned long	para[4];
	IsdnCardState_t	*cs;
};

extern void	HiSax_closecard(int);
extern int	hisax_init_pcmcia(void *, int *, IsdnCard_t *);