Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

[karo-tx-linux.git] / drivers / atm / Kconfig

diff --git a/drivers/atm/Kconfig b/drivers/atm/Kconfig
index f1a0a00b3b07c8f8563f1cbac1304f9fd8a5f5b3..31c60101a69a42ddef0f58bab569c2e052cb1fbe 100644 (file)
--- a/drivers/atm/Kconfig
+++ b/drivers/atm/Kconfig
@@ -177,7 +177,7 @@ config ATM_ZATM_DEBUG
 
 config ATM_NICSTAR
        tristate "IDT 77201 (NICStAR) (ForeRunnerLE)"
-       depends on PCI && !64BIT && VIRT_TO_BUS
+       depends on PCI
        help
          The NICStAR chipset family is used in a large number of ATM NICs for
          25 and for 155 Mbps, including IDT cards and the Fore ForeRunnerLE
@@ -301,7 +301,7 @@ config ATM_IA
          control memory (128K-1KVC, 512K-4KVC), the size of the packet
          memory (128K, 512K, 1M), and the PHY type (Single/Multi mode OC3,
          UTP155, UTP25, DS3 and E3). Go to:
-               <http://www.iphase.com/products/ClassSheet.cfm?ClassID=ATM>
+               <http://www.iphase.com/>
          for more info about the cards. Say Y (or M to compile as a module
          named iphase) here if you have one of these cards.