diff options
| author | David S. Miller <davem@davemloft.net> | 2010-08-23 07:37:04 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-08-23 07:37:04 +0200 |
| commit | 2d4833aae65589ba4317dd325fe20c8b25c14173 (patch) | |
| tree | 231672eb67197387f94bfda9a0995ddd002dbfbd /drivers/isdn | |
| parent | mlx4: remove num_lro parameter (diff) | |
| parent | isdn/avm: fix build when PCMCIA is not enabled (diff) | |
| download | linux-2d4833aae65589ba4317dd325fe20c8b25c14173.tar.xz linux-2d4833aae65589ba4317dd325fe20c8b25c14173.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
include/linux/if_pppox.h
Fix conflict between Changli's __packed header file fixes and
the new PPTP driver.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/isdn')
| -rw-r--r-- | drivers/isdn/hardware/avm/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/isdn/hardware/avm/Kconfig b/drivers/isdn/hardware/avm/Kconfig index 5dbcbe3a54a6..b99b906ea9b1 100644 --- a/drivers/isdn/hardware/avm/Kconfig +++ b/drivers/isdn/hardware/avm/Kconfig @@ -36,12 +36,13 @@ config ISDN_DRV_AVMB1_T1ISA config ISDN_DRV_AVMB1_B1PCMCIA tristate "AVM B1/M1/M2 PCMCIA support" + depends on PCMCIA help Enable support for the PCMCIA version of the AVM B1 card. config ISDN_DRV_AVMB1_AVM_CS tristate "AVM B1/M1/M2 PCMCIA cs module" - depends on ISDN_DRV_AVMB1_B1PCMCIA && PCMCIA + depends on ISDN_DRV_AVMB1_B1PCMCIA help Enable the PCMCIA client driver for the AVM B1/M1/M2 PCMCIA cards. |