cleanup buildsystem

This commit is contained in:
Karsten Keil 2004-01-25 19:22:53 +00:00
parent 2131b51111
commit 2726e72877
15 changed files with 22 additions and 23 deletions

View File

@ -4,8 +4,8 @@
menu "ISDN subsystem"
config ISDN_BOOL
bool "ISDN support"
config ISDN
tristate "ISDN support"
depends on NET
---help---
ISDN ("Integrated Services Digital Networks", called RNIS in France)
@ -22,9 +22,9 @@ config ISDN_BOOL
menu "Old ISDN4Linux"
depends on NET && ISDN_BOOL
depends on NET && ISDN
config ISDN
config ISDN_I4L
tristate "Old ISDN4Linux (obsolete)"
---help---
This driver allows you to use an ISDN-card for networking
@ -41,18 +41,18 @@ config ISDN
Therefore the old ISDN4Linux layer is becoming obsolete. It is
still usable, though, if you select this option.
if ISDN
if ISDN_I4L
source "drivers/isdn/i4l/Kconfig"
endif
endmenu
comment "CAPI subsystem"
depends on NET && ISDN_BOOL
depends on NET && ISDN
config ISDN_CAPI
tristate "CAPI2.0 support"
depends on ISDN_BOOL
depends on ISDN
help
This provides the CAPI (Common ISDN Application Programming
Interface, a standard making it easy for programs to access ISDN

View File

@ -2,7 +2,7 @@
# Object files in subdirectories
obj-$(CONFIG_ISDN) += i4l/
obj-$(CONFIG_ISDN_I4L) += i4l/
obj-$(CONFIG_ISDN_CAPI) += capi/
obj-$(CONFIG_ISDN_CAPI) += hardware/
obj-$(CONFIG_ISDN_DIVERSION) += divert/

View File

@ -3,7 +3,7 @@
#
config ISDN_DRV_ACT2000
tristate "IBM Active 2000 support"
depends on ISDN && ISA
depends on ISDN_I4L && ISA
help
Say Y here if you have an IBM Active 2000 ISDN card. In order to use
this card, additional firmware is necessary, which has to be loaded

View File

@ -44,7 +44,7 @@ config ISDN_CAPI_CAPIFS
config ISDN_CAPI_CAPIDRV
tristate "CAPI2.0 capidrv interface support"
depends on ISDN_CAPI && ISDN
depends on ISDN_CAPI && ISDN_I4L
help
This option provides the glue code to hook up CAPI driven cards to
the legacy isdn4linux link layer. If you have a card which is

View File

@ -2,11 +2,9 @@
# ISDN hardware drivers
#
comment "CAPI hardware drivers"
depends on NET && ISDN_BOOL && ISDN_CAPI
depends on NET && ISDN && ISDN_CAPI
source "drivers/isdn/hardware/avm/Kconfig"
source "drivers/isdn/hardware/eicon/Kconfig"
# source "drivers/isdn/hardware/mISDN/Kconfig"

View File

@ -3,7 +3,7 @@
#
menu "Active AVM cards"
depends on NET && ISDN_BOOL && ISDN_CAPI!=n
depends on NET && ISDN && ISDN_CAPI!=n
config CAPI_AVM
bool "Support AVM cards"

View File

@ -3,7 +3,7 @@
#
menu "Active Eicon DIVA Server cards"
depends on NET && ISDN_BOOL && ISDN_CAPI!=n
depends on NET && ISDN && ISDN_CAPI!=n
config CAPI_EICON
bool "Support Eicon cards"

View File

@ -1,6 +1,6 @@
menu "Passive cards"
depends on ISDN
depends on ISDN_I4L
config ISDN_DRV_HISAX
tristate "HiSax SiemensChipSet driver support"

View File

@ -107,13 +107,13 @@ config ISDN_DIVERSION
endmenu
comment "ISDN4Linux hardware drivers"
depends on NET && ISDN_BOOL && ISDN
depends on NET && ISDN && ISDN_I4L
source "drivers/isdn/hisax/Kconfig"
menu "Active cards"
depends on NET && ISDN_BOOL && ISDN!=n
depends on NET && ISDN && ISDN_I4L!=n
source "drivers/isdn/icn/Kconfig"

View File

@ -2,7 +2,7 @@
# Each configuration option enables a list of files.
obj-$(CONFIG_ISDN) += isdn.o
obj-$(CONFIG_ISDN_I4L) += isdn.o
obj-$(CONFIG_ISDN_PPP_BSDCOMP) += isdn_bsdcomp.o
# Multipart objects.

View File

@ -3,7 +3,7 @@
#
config ISDN_DRV_ICN
tristate "ICN 2B and 4B support"
depends on ISDN && ISA
depends on ISDN_I4L && ISA
help
This enables support for two kinds of ISDN-cards made by a German
company called ICN. 2B is the standard version for a single ISDN

View File

@ -3,7 +3,7 @@
#
config ISDN_DRV_PCBIT
tristate "PCBIT-D support"
depends on ISDN && ISA
depends on ISDN_I4L && ISA
help
This enables support for the PCBIT ISDN-card. This card is
manufactured in Portugal by Octal. For running this card,

View File

@ -3,7 +3,7 @@
#
config ISDN_DRV_SC
tristate "Spellcaster support"
depends on ISDN && ISA
depends on ISDN_I4L && ISA
help
This enables support for the Spellcaster BRI ISDN boards. This
driver currently builds only in a modularized version.

View File

@ -3,7 +3,7 @@
#
config ISDN_DRV_TPAM
tristate "Auvertech TurboPAM support (EXPERIMENTAL)"
depends on EXPERIMENTAL && ISDN && PCI
depends on EXPERIMENTAL && ISDN_I4L && PCI
help
This enables support for the Auvertech TurboPAM ISDN-card.
For running this card, additional firmware is necessary, which has

View File

@ -115,6 +115,7 @@ struct isdn_ppp_resetparams {
*/
struct isdn_ppp_compressor {
struct isdn_ppp_compressor *next, *prev;
struct module *owner;
int num; /* CCP compression protocol number */
void *(*alloc) (struct isdn_ppp_comp_data *);