Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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>

authored by

Adrian Bunk and committed by
Linus Torvalds
281f15e6 41f96935

-31
-7
drivers/isdn/hisax/Kconfig
··· 349 349 This enables HiSax support for the Formula-n enter:now PCI 350 350 ISDN card. 351 351 352 - config 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 - 359 352 endif 360 353 361 354 if ISDN_DRV_HISAX
-18
drivers/isdn/hisax/config.c
··· 227 227 #define DEFAULT_CFG {5,0x2E0,0,0} 228 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 230 #ifdef CONFIG_HISAX_NICCY 239 231 #undef DEFAULT_CARD 240 232 #undef DEFAULT_CFG ··· 535 543 536 544 #if CARD_HFC_SX 537 545 extern int setup_hfcsx(struct IsdnCard *card); 538 - #endif 539 - 540 - #if CARD_AMD7930 541 - extern int setup_amd7930(struct IsdnCard *card); 542 546 #endif 543 547 544 548 #if CARD_NICCY ··· 1051 1063 ret = setup_niccy(card); 1052 1064 break; 1053 1065 #endif 1054 - #if CARD_AMD7930 1055 - case ISDN_CTYPE_AMD7930: 1056 - ret = setup_amd7930(card); 1057 - break; 1058 - #endif 1059 1066 #if CARD_ISURF 1060 1067 case ISDN_CTYPE_ISURF: 1061 1068 ret = setup_isurf(card); ··· 1419 1436 break; 1420 1437 case ISDN_CTYPE_ELSA_PCI: 1421 1438 case ISDN_CTYPE_NETJET_S: 1422 - case ISDN_CTYPE_AMD7930: 1423 1439 case ISDN_CTYPE_TELESPCI: 1424 1440 case ISDN_CTYPE_W6692: 1425 1441 case ISDN_CTYPE_NETJET_U:
-6
drivers/isdn/hisax/hisax.h
··· 1139 1139 #define CARD_HFC_SX 0 1140 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 1142 #ifdef CONFIG_HISAX_NICCY 1149 1143 #define CARD_NICCY 1 1150 1144 #ifndef ISDN_CHIP_ISAC