leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] i4l: remove the broken HISAX_AMD7930 option

Browse Source 
HISAX_AMD7930 was never anywhere near to being working, and this doesn't
seem to change in the forseeable future.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Acked-by: Karsten Keil <kkeil@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Adrian Bunk 2006-12-08 02:39:36 -08:00 committed by Linus Torvalds
parent 41f96935b4
commit 281f15e6d9
3 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/isdn/hisax/Kconfig
View File

@ -349,13 +349,6 @@ config HISAX_ENTERNOW_PCI
This enables HiSax support for the Formula-n enter:now PCI This enables HiSax support for the Formula-n enter:now PCI
ISDN card. ISDN card.
config HISAX_AMD7930
bool "Am7930 (EXPERIMENTAL)"
depends on EXPERIMENTAL && SPARC && BROKEN
help
This enables HiSax support for the AMD7930 chips on some SPARCs.
This code is not finished yet.
endif endif
if ISDN_DRV_HISAX if ISDN_DRV_HISAX

18
drivers/isdn/hisax/config.c
View File

@ -227,14 +227,6 @@ const char *CardType[] = {
#define DEFAULT_CFG {5,0x2E0,0,0} #define DEFAULT_CFG {5,0x2E0,0,0}
#endif #endif
#ifdef CONFIG_HISAX_AMD7930
#undef DEFAULT_CARD
#undef DEFAULT_CFG
#define DEFAULT_CARD ISDN_CTYPE_AMD7930
#define DEFAULT_CFG {12,0x3e0,0,0}
#endif
#ifdef CONFIG_HISAX_NICCY #ifdef CONFIG_HISAX_NICCY
#undef DEFAULT_CARD #undef DEFAULT_CARD
#undef DEFAULT_CFG #undef DEFAULT_CFG
@ -545,10 +537,6 @@ extern int setup_hfcpci(struct IsdnCard *card);
extern int setup_hfcsx(struct IsdnCard *card); extern int setup_hfcsx(struct IsdnCard *card);
#endif #endif
#if CARD_AMD7930
extern int setup_amd7930(struct IsdnCard *card);
#endif
#if CARD_NICCY #if CARD_NICCY
extern int setup_niccy(struct IsdnCard *card); extern int setup_niccy(struct IsdnCard *card);
#endif #endif
@ -1063,11 +1051,6 @@ static int checkcard(int cardnr, char *id, int *busy_flag, struct module *lockow
ret = setup_niccy(card); ret = setup_niccy(card);
break; break;
#endif #endif
#if CARD_AMD7930
case ISDN_CTYPE_AMD7930:
ret = setup_amd7930(card);
break;
#endif
#if CARD_ISURF #if CARD_ISURF
case ISDN_CTYPE_ISURF: case ISDN_CTYPE_ISURF:
ret = setup_isurf(card); ret = setup_isurf(card);
@ -1436,7 +1419,6 @@ static int __init HiSax_init(void)
break; break;
case ISDN_CTYPE_ELSA_PCI: case ISDN_CTYPE_ELSA_PCI:
case ISDN_CTYPE_NETJET_S: case ISDN_CTYPE_NETJET_S:
case ISDN_CTYPE_AMD7930:
case ISDN_CTYPE_TELESPCI: case ISDN_CTYPE_TELESPCI:
case ISDN_CTYPE_W6692: case ISDN_CTYPE_W6692:
case ISDN_CTYPE_NETJET_U: case ISDN_CTYPE_NETJET_U:

6
drivers/isdn/hisax/hisax.h
View File

@ -1139,12 +1139,6 @@ struct IsdnCardState {
#define CARD_HFC_SX 0 #define CARD_HFC_SX 0
#endif #endif
#ifdef CONFIG_HISAX_AMD7930
#define CARD_AMD7930 1
#else
#define CARD_AMD7930 0
#endif
#ifdef CONFIG_HISAX_NICCY #ifdef CONFIG_HISAX_NICCY
#define CARD_NICCY 1 #define CARD_NICCY 1
#ifndef ISDN_CHIP_ISAC #ifndef ISDN_CHIP_ISAC