Commit 0634ba8e authored by Kai Germaschewski's avatar Kai Germaschewski

ISDN/HiSax: Remove unused ISDN_CHIP_* macros

They were only defined, never used.
parent a7813e6a
...@@ -1072,141 +1072,92 @@ hisax_release_resources(struct IsdnCardState *cs); ...@@ -1072,141 +1072,92 @@ hisax_release_resources(struct IsdnCardState *cs);
#define ISDN_CTYPE_COUNT 41 #define ISDN_CTYPE_COUNT 41
#ifdef ISDN_CHIP_ISAC
#undef ISDN_CHIP_ISAC
#endif
#ifdef CONFIG_HISAX_16_0 #ifdef CONFIG_HISAX_16_0
#define CARD_TELES0 1 #define CARD_TELES0 1
#ifndef ISDN_CHIP_ISAC
#define ISDN_CHIP_ISAC 1
#endif
#else #else
#define CARD_TELES0 0 #define CARD_TELES0 0
#endif #endif
#ifdef CONFIG_HISAX_16_3 #ifdef CONFIG_HISAX_16_3
#define CARD_TELES3 1 #define CARD_TELES3 1
#ifndef ISDN_CHIP_ISAC
#define ISDN_CHIP_ISAC 1
#endif
#else #else
#define CARD_TELES3 0 #define CARD_TELES3 0
#endif #endif
#ifdef CONFIG_HISAX_TELESPCI #ifdef CONFIG_HISAX_TELESPCI
#define CARD_TELESPCI 1 #define CARD_TELESPCI 1
#ifndef ISDN_CHIP_ISAC
#define ISDN_CHIP_ISAC 1
#endif
#else #else
#define CARD_TELESPCI 0 #define CARD_TELESPCI 0
#endif #endif
#ifdef CONFIG_HISAX_AVM_A1 #ifdef CONFIG_HISAX_AVM_A1
#define CARD_AVM_A1 1 #define CARD_AVM_A1 1
#ifndef ISDN_CHIP_ISAC
#define ISDN_CHIP_ISAC 1
#endif
#else #else
#define CARD_AVM_A1 0 #define CARD_AVM_A1 0
#endif #endif
#ifdef CONFIG_HISAX_AVM_A1_PCMCIA #ifdef CONFIG_HISAX_AVM_A1_PCMCIA
#define CARD_AVM_A1_PCMCIA 1 #define CARD_AVM_A1_PCMCIA 1
#ifndef ISDN_CHIP_ISAC
#define ISDN_CHIP_ISAC 1
#endif
#else #else
#define CARD_AVM_A1_PCMCIA 0 #define CARD_AVM_A1_PCMCIA 0
#endif #endif
#ifdef CONFIG_HISAX_FRITZPCI #ifdef CONFIG_HISAX_FRITZPCI
#define CARD_FRITZPCI 1 #define CARD_FRITZPCI 1
#ifndef ISDN_CHIP_ISAC
#define ISDN_CHIP_ISAC 1
#endif
#else #else
#define CARD_FRITZPCI 0 #define CARD_FRITZPCI 0
#endif #endif
#ifdef CONFIG_HISAX_ELSA #ifdef CONFIG_HISAX_ELSA
#define CARD_ELSA 1 #define CARD_ELSA 1
#ifndef ISDN_CHIP_ISAC
#define ISDN_CHIP_ISAC 1
#endif
#else #else
#define CARD_ELSA 0 #define CARD_ELSA 0
#endif #endif
#ifdef CONFIG_HISAX_IX1MICROR2 #ifdef CONFIG_HISAX_IX1MICROR2
#define CARD_IX1MICROR2 1 #define CARD_IX1MICROR2 1
#ifndef ISDN_CHIP_ISAC
#define ISDN_CHIP_ISAC 1
#endif
#else #else
#define CARD_IX1MICROR2 0 #define CARD_IX1MICROR2 0
#endif #endif
#ifdef CONFIG_HISAX_DIEHLDIVA #ifdef CONFIG_HISAX_DIEHLDIVA
#define CARD_DIEHLDIVA 1 #define CARD_DIEHLDIVA 1
#ifndef ISDN_CHIP_ISAC
#define ISDN_CHIP_ISAC 1
#endif
#else #else
#define CARD_DIEHLDIVA 0 #define CARD_DIEHLDIVA 0
#endif #endif
#ifdef CONFIG_HISAX_ASUSCOM #ifdef CONFIG_HISAX_ASUSCOM
#define CARD_ASUSCOM 1 #define CARD_ASUSCOM 1
#ifndef ISDN_CHIP_ISAC
#define ISDN_CHIP_ISAC 1
#endif
#else #else
#define CARD_ASUSCOM 0 #define CARD_ASUSCOM 0
#endif #endif
#ifdef CONFIG_HISAX_TELEINT #ifdef CONFIG_HISAX_TELEINT
#define CARD_TELEINT 1 #define CARD_TELEINT 1
#ifndef ISDN_CHIP_ISAC
#define ISDN_CHIP_ISAC 1
#endif
#else #else
#define CARD_TELEINT 0 #define CARD_TELEINT 0
#endif #endif
#ifdef CONFIG_HISAX_SEDLBAUER #ifdef CONFIG_HISAX_SEDLBAUER
#define CARD_SEDLBAUER 1 #define CARD_SEDLBAUER 1
#ifndef ISDN_CHIP_ISAC
#define ISDN_CHIP_ISAC 1
#endif
#else #else
#define CARD_SEDLBAUER 0 #define CARD_SEDLBAUER 0
#endif #endif
#ifdef CONFIG_HISAX_SPORTSTER #ifdef CONFIG_HISAX_SPORTSTER
#define CARD_SPORTSTER 1 #define CARD_SPORTSTER 1
#ifndef ISDN_CHIP_ISAC
#define ISDN_CHIP_ISAC 1
#endif
#else #else
#define CARD_SPORTSTER 0 #define CARD_SPORTSTER 0
#endif #endif
#ifdef CONFIG_HISAX_MIC #ifdef CONFIG_HISAX_MIC
#define CARD_MIC 1 #define CARD_MIC 1
#ifndef ISDN_CHIP_ISAC
#define ISDN_CHIP_ISAC 1
#endif
#else #else
#define CARD_MIC 0 #define CARD_MIC 0
#endif #endif
#ifdef CONFIG_HISAX_NETJET #ifdef CONFIG_HISAX_NETJET
#define CARD_NETJET_S 1 #define CARD_NETJET_S 1
#ifndef ISDN_CHIP_ISAC
#define ISDN_CHIP_ISAC 1
#endif
#else #else
#define CARD_NETJET_S 0 #define CARD_NETJET_S 0
#endif #endif
...@@ -1237,36 +1188,24 @@ hisax_release_resources(struct IsdnCardState *cs); ...@@ -1237,36 +1188,24 @@ hisax_release_resources(struct IsdnCardState *cs);
#ifdef CONFIG_HISAX_NICCY #ifdef CONFIG_HISAX_NICCY
#define CARD_NICCY 1 #define CARD_NICCY 1
#ifndef ISDN_CHIP_ISAC
#define ISDN_CHIP_ISAC 1
#endif
#else #else
#define CARD_NICCY 0 #define CARD_NICCY 0
#endif #endif
#ifdef CONFIG_HISAX_ISURF #ifdef CONFIG_HISAX_ISURF
#define CARD_ISURF 1 #define CARD_ISURF 1
#ifndef ISDN_CHIP_ISAC
#define ISDN_CHIP_ISAC 1
#endif
#else #else
#define CARD_ISURF 0 #define CARD_ISURF 0
#endif #endif
#ifdef CONFIG_HISAX_S0BOX #ifdef CONFIG_HISAX_S0BOX
#define CARD_S0BOX 1 #define CARD_S0BOX 1
#ifndef ISDN_CHIP_ISAC
#define ISDN_CHIP_ISAC 1
#endif
#else #else
#define CARD_S0BOX 0 #define CARD_S0BOX 0
#endif #endif
#ifdef CONFIG_HISAX_HSTSAPHIR #ifdef CONFIG_HISAX_HSTSAPHIR
#define CARD_HSTSAPHIR 1 #define CARD_HSTSAPHIR 1
#ifndef ISDN_CHIP_ISAC
#define ISDN_CHIP_ISAC 1
#endif
#else #else
#define CARD_HSTSAPHIR 0 #define CARD_HSTSAPHIR 0
#endif #endif
...@@ -1282,45 +1221,30 @@ hisax_release_resources(struct IsdnCardState *cs); ...@@ -1282,45 +1221,30 @@ hisax_release_resources(struct IsdnCardState *cs);
#ifdef CONFIG_HISAX_BKM_A4T #ifdef CONFIG_HISAX_BKM_A4T
#define CARD_BKM_A4T 1 #define CARD_BKM_A4T 1
#ifndef ISDN_CHIP_ISAC
#define ISDN_CHIP_ISAC 1
#endif
#else #else
#define CARD_BKM_A4T 0 #define CARD_BKM_A4T 0
#endif #endif
#ifdef CONFIG_HISAX_SCT_QUADRO #ifdef CONFIG_HISAX_SCT_QUADRO
#define CARD_SCT_QUADRO 1 #define CARD_SCT_QUADRO 1
#ifndef ISDN_CHIP_ISAC
#define ISDN_CHIP_ISAC 1
#endif
#else #else
#define CARD_SCT_QUADRO 0 #define CARD_SCT_QUADRO 0
#endif #endif
#ifdef CONFIG_HISAX_GAZEL #ifdef CONFIG_HISAX_GAZEL
#define CARD_GAZEL 1 #define CARD_GAZEL 1
#ifndef ISDN_CHIP_ISAC
#define ISDN_CHIP_ISAC 1
#endif
#else #else
#define CARD_GAZEL 0 #define CARD_GAZEL 0
#endif #endif
#ifdef CONFIG_HISAX_W6692 #ifdef CONFIG_HISAX_W6692
#define CARD_W6692 1 #define CARD_W6692 1
#ifndef ISDN_CHIP_W6692
#define ISDN_CHIP_W6692 1
#endif
#else #else
#define CARD_W6692 0 #define CARD_W6692 0
#endif #endif
#ifdef CONFIG_HISAX_NETJET_U #ifdef CONFIG_HISAX_NETJET_U
#define CARD_NETJET_U 1 #define CARD_NETJET_U 1
#ifndef ISDN_CHIP_ICC
#define ISDN_CHIP_ICC 1
#endif
#ifndef HISAX_UINTERFACE #ifndef HISAX_UINTERFACE
#define HISAX_UINTERFACE 1 #define HISAX_UINTERFACE 1
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment