aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2006-12-08 05:39:36 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-08 11:29:01 -0500
commit281f15e6d9bfe18f200119bf8ffcbc67e8a33718 (patch)
treef87d31803519649f2bd5077ee42e18726c304b25 /drivers
parent41f96935b4c41daea2c4dbbf137960375cf764c1 (diff)
[PATCH] i4l: remove the broken HISAX_AMD7930 option
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/isdn/hisax/Kconfig7
-rw-r--r--drivers/isdn/hisax/config.c18
-rw-r--r--drivers/isdn/hisax/hisax.h6
3 files changed, 0 insertions, 31 deletions
diff --git a/drivers/isdn/hisax/Kconfig b/drivers/isdn/hisax/Kconfig
index edf0e50990a7..6fa12cc8e4ff 100644
--- a/drivers/isdn/hisax/Kconfig
+++ b/drivers/isdn/hisax/Kconfig
@@ -349,13 +349,6 @@ config HISAX_ENTERNOW_PCI
349 This enables HiSax support for the Formula-n enter:now PCI 349 This enables HiSax support for the Formula-n enter:now PCI
350 ISDN card. 350 ISDN card.
351 351
352config HISAX_AMD7930
353 bool "Am7930 (EXPERIMENTAL)"
354 depends on EXPERIMENTAL && SPARC && BROKEN
355 help
356 This enables HiSax support for the AMD7930 chips on some SPARCs.
357 This code is not finished yet.
358
359endif 352endif
360 353
361if ISDN_DRV_HISAX 354if ISDN_DRV_HISAX
diff --git a/drivers/isdn/hisax/config.c b/drivers/isdn/hisax/config.c
index 9d6b7b0f6746..17ec0b70ba1d 100644
--- a/drivers/isdn/hisax/config.c
+++ b/drivers/isdn/hisax/config.c
@@ -227,14 +227,6 @@ const char *CardType[] = {
227#define DEFAULT_CFG {5,0x2E0,0,0} 227#define DEFAULT_CFG {5,0x2E0,0,0}
228#endif 228#endif
229 229
230
231#ifdef CONFIG_HISAX_AMD7930
232#undef DEFAULT_CARD
233#undef DEFAULT_CFG
234#define DEFAULT_CARD ISDN_CTYPE_AMD7930
235#define DEFAULT_CFG {12,0x3e0,0,0}
236#endif
237
238#ifdef CONFIG_HISAX_NICCY 230#ifdef CONFIG_HISAX_NICCY
239#undef DEFAULT_CARD 231#undef DEFAULT_CARD
240#undef DEFAULT_CFG 232#undef DEFAULT_CFG
@@ -545,10 +537,6 @@ extern int setup_hfcpci(struct IsdnCard *card);
545extern int setup_hfcsx(struct IsdnCard *card); 537extern int setup_hfcsx(struct IsdnCard *card);
546#endif 538#endif
547 539
548#if CARD_AMD7930
549extern int setup_amd7930(struct IsdnCard *card);
550#endif
551
552#if CARD_NICCY 540#if CARD_NICCY
553extern int setup_niccy(struct IsdnCard *card); 541extern int setup_niccy(struct IsdnCard *card);
554#endif 542#endif
@@ -1063,11 +1051,6 @@ static int checkcard(int cardnr, char *id, int *busy_flag, struct module *lockow
1063 ret = setup_niccy(card); 1051 ret = setup_niccy(card);
1064 break; 1052 break;
1065#endif 1053#endif
1066#if CARD_AMD7930
1067 case ISDN_CTYPE_AMD7930:
1068 ret = setup_amd7930(card);
1069 break;
1070#endif
1071#if CARD_ISURF 1054#if CARD_ISURF
1072 case ISDN_CTYPE_ISURF: 1055 case ISDN_CTYPE_ISURF:
1073 ret = setup_isurf(card); 1056 ret = setup_isurf(card);
@@ -1436,7 +1419,6 @@ static int __init HiSax_init(void)
1436 break; 1419 break;
1437 case ISDN_CTYPE_ELSA_PCI: 1420 case ISDN_CTYPE_ELSA_PCI:
1438 case ISDN_CTYPE_NETJET_S: 1421 case ISDN_CTYPE_NETJET_S:
1439 case ISDN_CTYPE_AMD7930:
1440 case ISDN_CTYPE_TELESPCI: 1422 case ISDN_CTYPE_TELESPCI:
1441 case ISDN_CTYPE_W6692: 1423 case ISDN_CTYPE_W6692:
1442 case ISDN_CTYPE_NETJET_U: 1424 case ISDN_CTYPE_NETJET_U:
diff --git a/drivers/isdn/hisax/hisax.h b/drivers/isdn/hisax/hisax.h
index 159c5896061e..3f1137e34678 100644
--- a/drivers/isdn/hisax/hisax.h
+++ b/drivers/isdn/hisax/hisax.h
@@ -1139,12 +1139,6 @@ struct IsdnCardState {
1139#define CARD_HFC_SX 0 1139#define CARD_HFC_SX 0
1140#endif 1140#endif
1141 1141
1142#ifdef CONFIG_HISAX_AMD7930
1143#define CARD_AMD7930 1
1144#else
1145#define CARD_AMD7930 0
1146#endif
1147
1148#ifdef CONFIG_HISAX_NICCY 1142#ifdef CONFIG_HISAX_NICCY
1149#define CARD_NICCY 1 1143#define CARD_NICCY 1
1150#ifndef ISDN_CHIP_ISAC 1144#ifndef ISDN_CHIP_ISAC