3 files changed, 5 insertions, 4 deletions

diff --git a/drivers/atm/.gitignore b/drivers/atm/.gitignore
index a165b7167714..fc0ae5eb05d8 100644
--- a/drivers/atm/.gitignore
+++ b/drivers/atm/.gitignore
@@ -2,4 +2,4 @@
 fore200e_mkfirm
 fore200e_pca_fw.c
 pca200e.bin
-
+pca200e_ecd.bin2
diff --git a/drivers/net/hamradio/baycom_epp.c b/drivers/net/hamradio/baycom_epp.c
index 8a83db0fb3b7..153b6dc80af4 100644
--- a/drivers/net/hamradio/baycom_epp.c
+++ b/drivers/net/hamradio/baycom_epp.c
@@ -1177,7 +1177,7 @@ static void baycom_probe(struct net_device *dev)
         dev->mtu = AX25_DEF_PACLEN;        /* eth_mtu is the default */
         dev->addr_len = AX25_ADDR_LEN;     /* sizeof an ax.25 address */
         memcpy(dev->broadcast, &ax25_bcast, AX25_ADDR_LEN);
-        memcpy(dev->dev_addr, &ax25_nocall, AX25_ADDR_LEN);
+        memcpy(dev->dev_addr, &null_ax25_address, AX25_ADDR_LEN);
         dev->tx_queue_len = 16;
 
         /* New style flags */
diff --git a/drivers/net/wan/Kconfig b/drivers/net/wan/Kconfig
index d5ab9cf13257..21f76f51c95e 100644
--- a/drivers/net/wan/Kconfig
+++ b/drivers/net/wan/Kconfig
@@ -382,7 +382,7 @@ config SDLA
 
 # Wan router core.
 config WAN_ROUTER_DRIVERS
-        bool "WAN router drivers"
+        tristate "WAN router drivers"
         depends on WAN && WAN_ROUTER
         ---help---
           Connect LAN to WAN via Linux box.
@@ -393,7 +393,8 @@ config WAN_ROUTER_DRIVERS
           <file:Documentation/networking/wan-router.txt>.
 
           Note that the answer to this question won't directly affect the
-          kernel: saying N will just cause the configurator to skip all
+          kernel except for how subordinate drivers may be built:
+          saying N will just cause the configurator to skip all
           the questions about WAN router drivers.
 
           If unsure, say N.