Patched in Tegra support.

25 files changed, 151 insertions, 72 deletions

diff --git a/drivers/net/wan/Kconfig b/drivers/net/wan/Kconfig
index d58431e99f7..423eb26386c 100644
--- a/drivers/net/wan/Kconfig
+++ b/drivers/net/wan/Kconfig
@@ -203,6 +203,37 @@ config WANXL_BUILD_FIRMWARE
 
           You should never need this option, say N.
 
+config PC300
+        tristate "Cyclades-PC300 support (RS-232/V.35, X.21, T1/E1 boards)"
+        depends on HDLC && PCI && BROKEN
+        ---help---
+          This driver is broken because of struct tty_driver change.
+
+          Driver for the Cyclades-PC300 synchronous communication boards.
+
+          These boards provide synchronous serial interfaces to your
+          Linux box (interfaces currently available are RS-232/V.35, X.21 and
+          T1/E1). If you wish to support Multilink PPP, please select the
+          option later and read the file README.mlppp provided by PC300
+          package.
+
+          To compile this as a module, choose M here: the module
+          will be called pc300.
+
+          If unsure, say N.
+
+config PC300_MLPPP
+        bool "Cyclades-PC300 MLPPP support"
+        depends on PC300 && PPP_MULTILINK && PPP_SYNC_TTY && HDLC_PPP
+        help
+          Multilink PPP over the PC300 synchronous communication boards.
+
+comment "Cyclades-PC300 MLPPP support is disabled."
+        depends on HDLC && PC300 && (PPP=n || !PPP_MULTILINK || PPP_SYNC_TTY=n || !HDLC_PPP)
+
+comment "Refer to the file README.mlppp, provided by PC300 package."
+        depends on HDLC && PC300 && (PPP=n || !PPP_MULTILINK || PPP_SYNC_TTY=n || !HDLC_PPP)
+
 config PC300TOO
         tristate "Cyclades PC300 RSV/X21 alternative support"
         depends on HDLC && PCI
@@ -259,8 +290,8 @@ config FARSYNC
           Frame Relay or X.25/LAPB.
 
           If you want the module to be automatically loaded when the interface
-          is referenced then you should add "alias hdlcX farsync" to a file
-          in /etc/modprobe.d/ for each interface, where X is 0, 1, 2, ..., or
+          is referenced then you should add "alias hdlcX farsync" to
+          /etc/modprobe.conf for each interface, where X is 0, 1, 2, ..., or
           simply use "alias hdlc* farsync" to indicate all of them.
 
           To compile this driver as a module, choose M here: the
diff --git a/drivers/net/wan/Makefile b/drivers/net/wan/Makefile
index df70248e2fd..19d14bc2835 100644
--- a/drivers/net/wan/Makefile
+++ b/drivers/net/wan/Makefile
@@ -17,6 +17,10 @@ obj-$(CONFIG_HDLC_FR)		+= hdlc_fr.o
 obj-$(CONFIG_HDLC_PPP)          += hdlc_ppp.o
 obj-$(CONFIG_HDLC_X25)          += hdlc_x25.o
 
+pc300-y                         := pc300_drv.o
+pc300-$(CONFIG_PC300_MLPPP)     += pc300_tty.o
+pc300-objs                      := $(pc300-y)
+
 obj-$(CONFIG_HOSTESS_SV11)      += z85230.o     hostess_sv11.o
 obj-$(CONFIG_SEALEVEL_4021)     += z85230.o     sealevel.o
 obj-$(CONFIG_COSA)              += cosa.o
@@ -31,6 +35,7 @@ obj-$(CONFIG_SDLA)		+= sdla.o
 obj-$(CONFIG_CYCLADES_SYNC)     += cycx_drv.o cyclomx.o
 obj-$(CONFIG_LAPBETHER)         += lapbether.o
 obj-$(CONFIG_SBNI)              += sbni.o
+obj-$(CONFIG_PC300)             += pc300.o
 obj-$(CONFIG_N2)                += n2.o
 obj-$(CONFIG_C101)              += c101.o
 obj-$(CONFIG_WANXL)             += wanxl.o
@@ -52,9 +57,9 @@ endif
 
 quiet_cmd_build_wanxlfw = BLD FW  $@
       cmd_build_wanxlfw = \
-        $(CPP) -D__ASSEMBLY__ -Wp,-MD,$(depfile) -I$(srctree)/include/uapi $< | $(AS68K) -m68360 -o $(obj)/wanxlfw.o; \
+        $(CPP) -Wp,-MD,$(depfile) -I$(srctree)/include $< | $(AS68K) -m68360 -o $(obj)/wanxlfw.o; \
         $(LD68K) --oformat binary -Ttext 0x1000 $(obj)/wanxlfw.o -o $(obj)/wanxlfw.bin; \
-        hexdump -ve '"\n" 16/1 "0x%02X,"' $(obj)/wanxlfw.bin | sed 's/0x  ,//g;1s/^/static const u8 firmware[]={/;$$s/,$$/\n};\n/' >$(obj)/wanxlfw.inc; \
+        hexdump -ve '"\n" 16/1 "0x%02X,"' $(obj)/wanxlfw.bin | sed 's/0x  ,//g;1s/^/static u8 firmware[]={/;$$s/,$$/\n};\n/' >$(obj)/wanxlfw.inc; \
         rm -f $(obj)/wanxlfw.bin $(obj)/wanxlfw.o
 
 $(obj)/wanxlfw.inc:     $(src)/wanxlfw.S
diff --git a/drivers/net/wan/c101.c b/drivers/net/wan/c101.c
index 09a50751763..54f995f4a5a 100644
--- a/drivers/net/wan/c101.c
+++ b/drivers/net/wan/c101.c
@@ -325,8 +325,10 @@ static int __init c101_run(unsigned long irq, unsigned long winbase)
         }
 
         card = kzalloc(sizeof(card_t), GFP_KERNEL);
-        if (card == NULL)
+        if (card == NULL) {
+                pr_err("unable to allocate memory\n");
                 return -ENOBUFS;
+        }
 
         card->dev = alloc_hdlcdev(card);
         if (!card->dev) {
diff --git a/drivers/net/wan/dlci.c b/drivers/net/wan/dlci.c
index 147614ed86a..48ab38a34c5 100644
--- a/drivers/net/wan/dlci.c
+++ b/drivers/net/wan/dlci.c
@@ -50,6 +50,7 @@
 
 #include <net/sock.h>
 
+#include <asm/system.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 #include <asm/uaccess.h>
diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c
index 851dc7b7e8b..058e1697c17 100644
--- a/drivers/net/wan/dscc4.c
+++ b/drivers/net/wan/dscc4.c
@@ -93,6 +93,7 @@
 #include <linux/mm.h>
 #include <linux/slab.h>
 
+#include <asm/system.h>
 #include <asm/cache.h>
 #include <asm/byteorder.h>
 #include <asm/uaccess.h>
@@ -707,7 +708,8 @@ static void dscc4_free1(struct pci_dev *pdev)
         kfree(ppriv);
 }
 
-static int dscc4_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
+static int __devinit dscc4_init_one(struct pci_dev *pdev,
+                                  const struct pci_device_id *ent)
 {
         struct dscc4_pci_priv *priv;
         struct dscc4_dev_priv *dpriv;
@@ -773,15 +775,14 @@ static int dscc4_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         }
         /* Global interrupt queue */
         writel((u32)(((IRQ_RING_SIZE >> 5) - 1) << 20), ioaddr + IQLENR1);
-
-        rc = -ENOMEM;
-
         priv->iqcfg = (__le32 *) pci_alloc_consistent(pdev,
                 IRQ_RING_SIZE*sizeof(__le32), &priv->iqcfg_dma);
         if (!priv->iqcfg)
                 goto err_free_irq_5;
         writel(priv->iqcfg_dma, ioaddr + IQCFG);
 
+        rc = -ENOMEM;
+
         /*
          * SCC 0-3 private rx/tx irq structures
          * IQRX/TXi needs to be set soon. Learned it the hard way...
@@ -902,8 +903,10 @@ static int dscc4_found1(struct pci_dev *pdev, void __iomem *ioaddr)
         int i, ret = -ENOMEM;
 
         root = kcalloc(dev_per_card, sizeof(*root), GFP_KERNEL);
-        if (!root)
+        if (!root) {
+                pr_err("can't allocate data\n");
                 goto err_out;
+        }
 
         for (i = 0; i < dev_per_card; i++) {
                 root[i].dev = alloc_hdlcdev(root + i);
@@ -912,8 +915,10 @@ static int dscc4_found1(struct pci_dev *pdev, void __iomem *ioaddr)
         }
 
         ppriv = kzalloc(sizeof(*ppriv), GFP_KERNEL);
-        if (!ppriv)
+        if (!ppriv) {
+                pr_err("can't allocate private data\n");
                 goto err_free_dev;
+        }
 
         ppriv->root = root;
         spin_lock_init(&ppriv->lock);
@@ -1967,7 +1972,7 @@ err_out:
         return -ENOMEM;
 }
 
-static void dscc4_remove_one(struct pci_dev *pdev)
+static void __devexit dscc4_remove_one(struct pci_dev *pdev)
 {
         struct dscc4_pci_priv *ppriv;
         struct dscc4_dev_priv *root;
@@ -2052,7 +2057,18 @@ static struct pci_driver dscc4_driver = {
         .name           = DRV_NAME,
         .id_table       = dscc4_pci_tbl,
         .probe          = dscc4_init_one,
-        .remove         = dscc4_remove_one,
+        .remove         = __devexit_p(dscc4_remove_one),
 };
 
-module_pci_driver(dscc4_driver);
+static int __init dscc4_init_module(void)
+{
+        return pci_register_driver(&dscc4_driver);
+}
+
+static void __exit dscc4_cleanup_module(void)
+{
+        pci_unregister_driver(&dscc4_driver);
+}
+
+module_init(dscc4_init_module);
+module_exit(dscc4_cleanup_module);
diff --git a/drivers/net/wan/farsync.c b/drivers/net/wan/farsync.c
index 56941d6547e..ebb9f24eefb 100644
--- a/drivers/net/wan/farsync.c
+++ b/drivers/net/wan/farsync.c
@@ -597,7 +597,7 @@ fst_q_work_item(u64 * queue, int card_index)
          * bottom half for the card.  Note the limitation of 64 cards.
          * That ought to be enough
          */
-        mask = (u64)1 << card_index;
+        mask = 1 << card_index;
         *queue |= mask;
         spin_unlock_irqrestore(&fst_work_q_lock, flags);
 }
@@ -2361,7 +2361,7 @@ fst_start_xmit(struct sk_buff *skb, struct net_device *dev)
  *      via a printk and leave the corresponding interface and all that follow
  *      disabled.
  */
-static char *type_strings[] = {
+static char *type_strings[] __devinitdata = {
         "no hardware",          /* Should never be seen */
         "FarSync T2P",
         "FarSync T4P",
@@ -2371,7 +2371,7 @@ static char *type_strings[] = {
         "FarSync TE1"
 };
 
-static void
+static void __devinit
 fst_init_card(struct fst_card_info *card)
 {
         int i;
@@ -2415,7 +2415,7 @@ static const struct net_device_ops fst_ops = {
  *      Initialise card when detected.
  *      Returns 0 to indicate success, or errno otherwise.
  */
-static int
+static int __devinit
 fst_add_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
         static int no_of_cards_added = 0;
@@ -2483,7 +2483,6 @@ fst_add_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                 pr_err("Control memory remap failed\n");
                 pci_release_regions(pdev);
                 pci_disable_device(pdev);
-                iounmap(card->mem);
                 kfree(card);
                 return -ENODEV;
         }
@@ -2615,7 +2614,7 @@ fst_add_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 /*
  *      Cleanup and close down a card
  */
-static void
+static void __devexit
 fst_remove_one(struct pci_dev *pdev)
 {
         struct fst_card_info *card;
@@ -2652,7 +2651,7 @@ static struct pci_driver fst_driver = {
         .name           = FST_NAME,
         .id_table       = fst_pci_dev_id,
         .probe          = fst_add_one,
-        .remove = fst_remove_one,
+        .remove = __devexit_p(fst_remove_one),
         .suspend        = NULL,
         .resume = NULL,
 };
diff --git a/drivers/net/wan/hd64570.c b/drivers/net/wan/hd64570.c
index 62f01b74cbd..33b67d88fce 100644
--- a/drivers/net/wan/hd64570.c
+++ b/drivers/net/wan/hd64570.c
@@ -40,6 +40,7 @@
 #include <linux/string.h>
 #include <linux/types.h>
 #include <asm/io.h>
+#include <asm/system.h>
 #include <asm/uaccess.h>
 #include "hd64570.h"
 
@@ -676,7 +677,8 @@ static netdev_tx_t sca_xmit(struct sk_buff *skb, struct net_device *dev)
 
 
 #ifdef NEED_DETECT_RAM
-static u32 sca_detect_ram(card_t *card, u8 __iomem *rambase, u32 ramsize)
+static u32 __devinit sca_detect_ram(card_t *card, u8 __iomem *rambase,
+                                    u32 ramsize)
 {
         /* Round RAM size to 32 bits, fill from end to start */
         u32 i = ramsize &= ~3;
@@ -704,7 +706,7 @@ static u32 sca_detect_ram(card_t *card, u8 __iomem *rambase, u32 ramsize)
 #endif /* NEED_DETECT_RAM */
 
 
-static void sca_init(card_t *card, int wait_states)
+static void __devinit sca_init(card_t *card, int wait_states)
 {
         sca_out(wait_states, WCRL, card); /* Wait Control */
         sca_out(wait_states, WCRM, card);
diff --git a/drivers/net/wan/hd64572.c b/drivers/net/wan/hd64572.c
index 6269a09c736..efc0db10118 100644
--- a/drivers/net/wan/hd64572.c
+++ b/drivers/net/wan/hd64572.c
@@ -40,6 +40,7 @@
 #include <linux/string.h>
 #include <linux/types.h>
 #include <asm/io.h>
+#include <asm/system.h>
 #include <asm/uaccess.h>
 #include "hd64572.h"
 
@@ -605,7 +606,8 @@ static netdev_tx_t sca_xmit(struct sk_buff *skb, struct net_device *dev)
 }
 
 
-static u32 sca_detect_ram(card_t *card, u8 __iomem *rambase, u32 ramsize)
+static u32 __devinit sca_detect_ram(card_t *card, u8 __iomem *rambase,
+                                    u32 ramsize)
 {
         /* Round RAM size to 32 bits, fill from end to start */
         u32 i = ramsize &= ~3;
@@ -624,7 +626,7 @@ static u32 sca_detect_ram(card_t *card, u8 __iomem *rambase, u32 ramsize)
 }
 
 
-static void sca_init(card_t *card, int wait_states)
+static void __devinit sca_init(card_t *card, int wait_states)
 {
         sca_out(wait_states, WCRL, card); /* Wait Control */
         sca_out(wait_states, WCRM, card);
diff --git a/drivers/net/wan/hdlc_fr.c b/drivers/net/wan/hdlc_fr.c
index 7c6cb4f3179..eb2028187fb 100644
--- a/drivers/net/wan/hdlc_fr.c
+++ b/drivers/net/wan/hdlc_fr.c
@@ -1087,7 +1087,7 @@ static int fr_add_pvc(struct net_device *frad, unsigned int dlci, int type)
         }
 
         if (type == ARPHRD_ETHER)
-                eth_hw_addr_random(dev);
+                random_ether_addr(dev->dev_addr);
         else {
                 *(__be16*)dev->dev_addr = htons(dlci);
                 dlci_to_q922(dev->broadcast, dlci);
diff --git a/drivers/net/wan/hdlc_ppp.c b/drivers/net/wan/hdlc_ppp.c
index 0d7645581f9..055a918067e 100644
--- a/drivers/net/wan/hdlc_ppp.c
+++ b/drivers/net/wan/hdlc_ppp.c
@@ -515,37 +515,37 @@ static int ppp_rx(struct sk_buff *skb)
         switch (cp->code) {
         case CP_CONF_REQ:
                 ppp_cp_parse_cr(dev, pid, cp->id, len, skb->data);
-                break;
+                goto out;
 
         case CP_CONF_ACK:
                 if (cp->id == proto->cr_id)
                         ppp_cp_event(dev, pid, RCA, 0, 0, 0, NULL);
-                break;
+                goto out;
 
         case CP_CONF_REJ:
         case CP_CONF_NAK:
                 if (cp->id == proto->cr_id)
                         ppp_cp_event(dev, pid, RCN, 0, 0, 0, NULL);
-                break;
+                goto out;
 
         case CP_TERM_REQ:
                 ppp_cp_event(dev, pid, RTR, 0, cp->id, 0, NULL);
-                break;
+                goto out;
 
         case CP_TERM_ACK:
                 ppp_cp_event(dev, pid, RTA, 0, 0, 0, NULL);
-                break;
+                goto out;
 
         case CP_CODE_REJ:
                 ppp_cp_event(dev, pid, RXJ_BAD, 0, 0, 0, NULL);
-                break;
+                goto out;
 
         default:
                 len += sizeof(struct cp_header);
                 if (len > dev->mtu)
                         len = dev->mtu;
                 ppp_cp_event(dev, pid, RUC, 0, 0, len, cp);
-                break;
+                goto out;
         }
         goto out;
 
diff --git a/drivers/net/wan/hdlc_raw_eth.c b/drivers/net/wan/hdlc_raw_eth.c
index 3ab72b3082d..05c9b0b9623 100644
--- a/drivers/net/wan/hdlc_raw_eth.c
+++ b/drivers/net/wan/hdlc_raw_eth.c
@@ -101,7 +101,7 @@ static int raw_eth_ioctl(struct net_device *dev, struct ifreq *ifr)
                 old_qlen = dev->tx_queue_len;
                 ether_setup(dev);
                 dev->tx_queue_len = old_qlen;
-                eth_hw_addr_random(dev);
+                random_ether_addr(dev->dev_addr);
                 netif_dormant_off(dev);
                 return 0;
         }
diff --git a/drivers/net/wan/hdlc_x25.c b/drivers/net/wan/hdlc_x25.c
index a49aec5efd2..56aeb011cb3 100644
--- a/drivers/net/wan/hdlc_x25.c
+++ b/drivers/net/wan/hdlc_x25.c
@@ -134,15 +134,15 @@ static netdev_tx_t x25_xmit(struct sk_buff *skb, struct net_device *dev)
 
 static int x25_open(struct net_device *dev)
 {
+        struct lapb_register_struct cb;
         int result;
-        static const struct lapb_register_struct cb = {
-                .connect_confirmation = x25_connected,
-                .connect_indication = x25_connected,
-                .disconnect_confirmation = x25_disconnected,
-                .disconnect_indication = x25_disconnected,
-                .data_indication = x25_data_indication,
-                .data_transmit = x25_data_transmit,
-        };
+
+        cb.connect_confirmation = x25_connected;
+        cb.connect_indication = x25_connected;
+        cb.disconnect_confirmation = x25_disconnected;
+        cb.disconnect_indication = x25_disconnected;
+        cb.data_indication = x25_data_indication;
+        cb.data_transmit = x25_data_transmit;
 
         result = lapb_register(dev, &cb);
         if (result != LAPB_OK)
diff --git a/drivers/net/wan/ixp4xx_hss.c b/drivers/net/wan/ixp4xx_hss.c
index fc9d11d74d6..aaaca9aa229 100644
--- a/drivers/net/wan/ixp4xx_hss.c
+++ b/drivers/net/wan/ixp4xx_hss.c
@@ -10,7 +10,6 @@
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
-#include <linux/module.h>
 #include <linux/bitops.h>
 #include <linux/cdev.h>
 #include <linux/dma-mapping.h>
@@ -969,12 +968,10 @@ static int init_hdlc_queues(struct port *port)
 {
         int i;
 
-        if (!ports_open) {
-                dma_pool = dma_pool_create(DRV_NAME, &port->netdev->dev,
-                                           POOL_ALLOC_SIZE, 32, 0);
-                if (!dma_pool)
+        if (!ports_open)
+                if (!(dma_pool = dma_pool_create(DRV_NAME, NULL,
+                                                 POOL_ALLOC_SIZE, 32, 0)))
                         return -ENOMEM;
-        }
 
         if (!(port->desc_tab = dma_pool_alloc(dma_pool, GFP_KERNEL,
                                               &port->desc_tab_phys)))
@@ -1326,7 +1323,7 @@ static const struct net_device_ops hss_hdlc_ops = {
         .ndo_do_ioctl   = hss_hdlc_ioctl,
 };
 
-static int hss_init_one(struct platform_device *pdev)
+static int __devinit hss_init_one(struct platform_device *pdev)
 {
         struct port *port;
         struct net_device *dev;
@@ -1365,7 +1362,7 @@ static int hss_init_one(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, port);
 
-        netdev_info(dev, "initialized\n");
+        netdev_info(dev, "HSS-%i\n", port->id);
         return 0;
 
 err_free_netdev:
@@ -1377,7 +1374,7 @@ err_free:
         return err;
 }
 
-static int hss_remove_one(struct platform_device *pdev)
+static int __devexit hss_remove_one(struct platform_device *pdev)
 {
         struct port *port = platform_get_drvdata(pdev);
 
diff --git a/drivers/net/wan/lapbether.c b/drivers/net/wan/lapbether.c
index a73b49eb87e..a817081737a 100644
--- a/drivers/net/wan/lapbether.c
+++ b/drivers/net/wan/lapbether.c
@@ -35,6 +35,7 @@
 #include <linux/if_arp.h>
 #include <linux/skbuff.h>
 #include <net/sock.h>
+#include <asm/system.h>
 #include <asm/uaccess.h>
 #include <linux/mm.h>
 #include <linux/interrupt.h>
@@ -258,13 +259,14 @@ static int lapbeth_set_mac_address(struct net_device *dev, void *addr)
 }
 
 
-static const struct lapb_register_struct lapbeth_callbacks = {
+static struct lapb_register_struct lapbeth_callbacks = {
         .connect_confirmation    = lapbeth_connected,
         .connect_indication      = lapbeth_connected,
         .disconnect_confirmation = lapbeth_disconnected,
         .disconnect_indication   = lapbeth_disconnected,
         .data_indication         = lapbeth_data_indication,
         .data_transmit           = lapbeth_data_transmit,
+
 };
 
 /*
diff --git a/drivers/net/wan/lmc/lmc_main.c b/drivers/net/wan/lmc/lmc_main.c
index 7ef435bab42..b7f2358d23b 100644
--- a/drivers/net/wan/lmc/lmc_main.c
+++ b/drivers/net/wan/lmc/lmc_main.c
@@ -497,6 +497,7 @@ int lmc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/
 
                     data = kmalloc(xc.len, GFP_KERNEL);
                     if (!data) {
+                            printk(KERN_WARNING "%s: Failed to allocate memory for copy\n", dev->name);
                             ret = -ENOMEM;
                             break;
                     }
@@ -816,7 +817,8 @@ static const struct net_device_ops lmc_ops = {
         .ndo_get_stats  = lmc_get_stats,
 };
 
-static int lmc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
+static int __devinit lmc_init_one(struct pci_dev *pdev,
+                                  const struct pci_device_id *ent)
 {
         lmc_softc_t *sc;
         struct net_device *dev;
@@ -985,7 +987,7 @@ err_req_io:
 /*
  * Called from pci when removing module.
  */
-static void lmc_remove_one(struct pci_dev *pdev)
+static void __devexit lmc_remove_one(struct pci_dev *pdev)
 {
         struct net_device *dev = pci_get_drvdata(pdev);
 
@@ -1119,7 +1121,7 @@ static void lmc_running_reset (struct net_device *dev) /*fold00*/
 {
     lmc_softc_t *sc = dev_to_sc(dev);
 
-    lmc_trace(dev, "lmc_running_reset in");
+    lmc_trace(dev, "lmc_runnig_reset in");
 
     /* stop interrupts */
     /* Clear the interrupt mask */
@@ -1732,10 +1734,21 @@ static struct pci_driver lmc_driver = {
         .name           = "lmc",
         .id_table       = lmc_pci_tbl,
         .probe          = lmc_init_one,
-        .remove         = lmc_remove_one,
+        .remove         = __devexit_p(lmc_remove_one),
 };
 
-module_pci_driver(lmc_driver);
+static int __init init_lmc(void)
+{
+    return pci_register_driver(&lmc_driver);
+}
+
+static void __exit exit_lmc(void)
+{
+    pci_unregister_driver(&lmc_driver);
+}
+
+module_init(init_lmc);
+module_exit(exit_lmc);
 
 unsigned lmc_mii_readreg (lmc_softc_t * const sc, unsigned devaddr, unsigned regno) /*fold00*/
 {
diff --git a/drivers/net/wan/n2.c b/drivers/net/wan/n2.c
index 315bf09d6a2..5129ad514d2 100644
--- a/drivers/net/wan/n2.c
+++ b/drivers/net/wan/n2.c
@@ -358,8 +358,10 @@ static int __init n2_run(unsigned long io, unsigned long irq,
         }
 
         card = kzalloc(sizeof(card_t), GFP_KERNEL);
-        if (card == NULL)
+        if (card == NULL) {
+                pr_err("unable to allocate memory\n");
                 return -ENOBUFS;
+        }
 
         card->ports[0].dev = alloc_hdlcdev(&card->ports[0]);
         card->ports[1].dev = alloc_hdlcdev(&card->ports[1]);
diff --git a/drivers/net/wan/pc300too.c b/drivers/net/wan/pc300too.c
index 53efc57fcac..c49c1b3c7aa 100644
--- a/drivers/net/wan/pc300too.c
+++ b/drivers/net/wan/pc300too.c
@@ -297,8 +297,8 @@ static const struct net_device_ops pc300_ops = {
         .ndo_do_ioctl   = pc300_ioctl,
 };
 
-static int pc300_pci_init_one(struct pci_dev *pdev,
-                              const struct pci_device_id *ent)
+static int __devinit pc300_pci_init_one(struct pci_dev *pdev,
+                                        const struct pci_device_id *ent)
 {
         card_t *card;
         u32 __iomem *p;
@@ -320,6 +320,7 @@ static int pc300_pci_init_one(struct pci_dev *pdev,
 
         card = kzalloc(sizeof(card_t), GFP_KERNEL);
         if (card == NULL) {
+                pr_err("unable to allocate memory\n");
                 pci_release_regions(pdev);
                 pci_disable_device(pdev);
                 return -ENOBUFS;
diff --git a/drivers/net/wan/pci200syn.c b/drivers/net/wan/pci200syn.c
index ddbce54040e..1ce21163c77 100644
--- a/drivers/net/wan/pci200syn.c
+++ b/drivers/net/wan/pci200syn.c
@@ -276,8 +276,8 @@ static const struct net_device_ops pci200_ops = {
         .ndo_do_ioctl   = pci200_ioctl,
 };
 
-static int pci200_pci_init_one(struct pci_dev *pdev,
-                               const struct pci_device_id *ent)
+static int __devinit pci200_pci_init_one(struct pci_dev *pdev,
+                                         const struct pci_device_id *ent)
 {
         card_t *card;
         u32 __iomem *p;
@@ -299,6 +299,7 @@ static int pci200_pci_init_one(struct pci_dev *pdev,
 
         card = kzalloc(sizeof(card_t), GFP_KERNEL);
         if (card == NULL) {
+                pr_err("unable to allocate memory\n");
                 pci_release_regions(pdev);
                 pci_disable_device(pdev);
                 return -ENOBUFS;
diff --git a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c
index d43f4efd3e0..86127bcc9f7 100644
--- a/drivers/net/wan/sbni.c
+++ b/drivers/net/wan/sbni.c
@@ -155,7 +155,7 @@ static int  emancipate( struct net_device * );
 static const char  version[] =
         "Granch SBNI12 driver ver 5.0.1  Jun 22 2001  Denis I.Timofeev.\n";
 
-static bool skip_pci_probe      __initdata = false;
+static int  skip_pci_probe      __initdata = 0;
 static int  scandone    __initdata = 0;
 static int  num         __initdata = 0;
 
@@ -212,7 +212,7 @@ static const struct net_device_ops sbni_netdev_ops = {
         .ndo_open               = sbni_open,
         .ndo_stop               = sbni_close,
         .ndo_start_xmit         = sbni_start_xmit,
-        .ndo_set_rx_mode        = set_multicast_list,
+        .ndo_set_multicast_list = set_multicast_list,
         .ndo_do_ioctl           = sbni_ioctl,
         .ndo_change_mtu         = eth_change_mtu,
         .ndo_set_mac_address    = eth_mac_addr,
diff --git a/drivers/net/wan/sdla.c b/drivers/net/wan/sdla.c
index de3bbf43fc5..c8531612eea 100644
--- a/drivers/net/wan/sdla.c
+++ b/drivers/net/wan/sdla.c
@@ -54,6 +54,7 @@
 #include <linux/sdla.h>
 #include <linux/bitops.h>
 
+#include <asm/system.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 #include <asm/uaccess.h>
diff --git a/drivers/net/wan/sealevel.c b/drivers/net/wan/sealevel.c
index 4f774847898..0b4fd05e150 100644
--- a/drivers/net/wan/sealevel.c
+++ b/drivers/net/wan/sealevel.c
@@ -362,7 +362,7 @@ static int io=0x238;
 static int txdma=1;
 static int rxdma=3;
 static int irq=5;
-static bool slow=false;
+static int slow=0;
 
 module_param(io, int, 0);
 MODULE_PARM_DESC(io, "The I/O base of the Sealevel card");
diff --git a/drivers/net/wan/wanxl.c b/drivers/net/wan/wanxl.c
index 6a24a5a70cc..44b70719725 100644
--- a/drivers/net/wan/wanxl.c
+++ b/drivers/net/wan/wanxl.c
@@ -557,8 +557,8 @@ static const struct net_device_ops wanxl_ops = {
         .ndo_get_stats  = wanxl_get_stats,
 };
 
-static int wanxl_pci_init_one(struct pci_dev *pdev,
-                              const struct pci_device_id *ent)
+static int __devinit wanxl_pci_init_one(struct pci_dev *pdev,
+                                        const struct pci_device_id *ent)
 {
         card_t *card;
         u32 ramsize, stat;
@@ -604,6 +604,7 @@ static int wanxl_pci_init_one(struct pci_dev *pdev,
         alloc_size = sizeof(card_t) + ports * sizeof(port_t);
         card = kzalloc(alloc_size, GFP_KERNEL);
         if (card == NULL) {
+                pr_err("%s: unable to allocate memory\n", pci_name(pdev));
                 pci_release_regions(pdev);
                 pci_disable_device(pdev);
                 return -ENOBUFS;
diff --git a/drivers/net/wan/wanxlfw.S b/drivers/net/wan/wanxlfw.S
index 21565d59ec7..73aae2bf2f1 100644
--- a/drivers/net/wan/wanxlfw.S
+++ b/drivers/net/wan/wanxlfw.S
@@ -35,7 +35,6 @@
 */
 
 #include <linux/hdlc.h>
-#include <linux/hdlc/ioctl.h>
 #include "wanxl.h"
 
 /* memory addresses and offsets */
diff --git a/drivers/net/wan/x25_asy.c b/drivers/net/wan/x25_asy.c
index 44db8b75a53..46ceb3ae907 100644
--- a/drivers/net/wan/x25_asy.c
+++ b/drivers/net/wan/x25_asy.c
@@ -18,6 +18,7 @@
 
 #include <linux/module.h>
 
+#include <asm/system.h>
 #include <linux/uaccess.h>
 #include <linux/bitops.h>
 #include <linux/string.h>
@@ -231,7 +232,7 @@ static void x25_asy_encaps(struct x25_asy *sl, unsigned char *icp, int len)
         }
 
         p = icp;
-        count = x25_asy_esc(p, sl->xbuff, len);
+        count = x25_asy_esc(p, (unsigned char *) sl->xbuff, len);
 
         /* Order of next two lines is *very* important.
          * When we are sending a little amount of data,
@@ -433,13 +434,14 @@ static void x25_asy_disconnected(struct net_device *dev, int reason)
         netif_rx(skb);
 }
 
-static const struct lapb_register_struct x25_asy_callbacks = {
+static struct lapb_register_struct x25_asy_callbacks = {
         .connect_confirmation = x25_asy_connected,
         .connect_indication = x25_asy_connected,
         .disconnect_confirmation = x25_asy_disconnected,
         .disconnect_indication = x25_asy_disconnected,
         .data_indication = x25_asy_data_indication,
         .data_transmit = x25_asy_data_transmit,
+
 };
 
 
@@ -785,8 +787,10 @@ static int __init init_x25_asy(void)
 
         x25_asy_devs = kcalloc(x25_asy_maxdev, sizeof(struct net_device *),
                                 GFP_KERNEL);
-        if (!x25_asy_devs)
+        if (!x25_asy_devs) {
+                pr_warn("Can't allocate x25_asy_ctrls[] array! Uaargh! (-> No X.25 available)\n");
                 return -ENOMEM;
+        }
 
         return tty_register_ldisc(N_X25, &x25_ldisc);
 }
diff --git a/drivers/net/wan/z85230.c b/drivers/net/wan/z85230.c
index feacc3b994b..0e576906170 100644
--- a/drivers/net/wan/z85230.c
+++ b/drivers/net/wan/z85230.c
@@ -1775,7 +1775,7 @@ EXPORT_SYMBOL(z8530_queue_xmit);
 /*
  *      Module support
  */
-static const char banner[] __initconst =
+static const char banner[] __initdata =
         KERN_INFO "Generic Z85C30/Z85230 interface driver v0.02\n";
 
 static int __init z85230_init_driver(void)