Patched in Tegra support.

7 files changed, 22 insertions, 15 deletions

diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c
index 1450e33fc25..2a5a34d2d67 100644
--- a/drivers/net/hamradio/6pack.c
+++ b/drivers/net/hamradio/6pack.c
@@ -13,6 +13,7 @@
  */
 
 #include <linux/module.h>
+#include <asm/system.h>
 #include <asm/uaccess.h>
 #include <linux/bitops.h>
 #include <linux/string.h>
@@ -811,9 +812,9 @@ static struct tty_ldisc_ops sp_ldisc = {
 
 /* Initialize 6pack control device -- register 6pack line discipline */
 
-static const char msg_banner[]  __initconst = KERN_INFO \
+static const char msg_banner[]  __initdata = KERN_INFO \
         "AX.25: 6pack driver, " SIXPACK_VERSION "\n";
-static const char msg_regfail[] __initconst = KERN_ERR  \
+static const char msg_regfail[] __initdata = KERN_ERR  \
         "6pack: can't register line discipline (err = %d)\n";
 
 static int __init sixpack_init_driver(void)
@@ -829,7 +830,7 @@ static int __init sixpack_init_driver(void)
         return status;
 }
 
-static const char msg_unregfail[] = KERN_ERR \
+static const char msg_unregfail[] __exitdata = KERN_ERR \
         "6pack: can't unregister line discipline (err = %d)\n";
 
 static void __exit sixpack_exit_driver(void)
diff --git a/drivers/net/hamradio/baycom_epp.c b/drivers/net/hamradio/baycom_epp.c
index 49b8b58fc5c..9537aaa50c2 100644
--- a/drivers/net/hamradio/baycom_epp.c
+++ b/drivers/net/hamradio/baycom_epp.c
@@ -1162,7 +1162,7 @@ static void baycom_probe(struct net_device *dev)
 /*
  * command line settable parameters
  */
-static char *mode[NR_PORTS] = { "", };
+static const char *mode[NR_PORTS] = { "", };
 static int iobase[NR_PORTS] = { 0x378, };
 
 module_param_array(mode, charp, NULL, 0);
diff --git a/drivers/net/hamradio/baycom_par.c b/drivers/net/hamradio/baycom_par.c
index acb636963e9..279d2296290 100644
--- a/drivers/net/hamradio/baycom_par.c
+++ b/drivers/net/hamradio/baycom_par.c
@@ -86,6 +86,7 @@
 #include <linux/bitops.h>
 #include <linux/jiffies.h>
 
+#include <asm/system.h>
 #include <asm/uaccess.h>
 
 /* --------------------------------------------------------------------- */
@@ -476,7 +477,7 @@ static int baycom_ioctl(struct net_device *dev, struct ifreq *ifr,
 /*
  * command line settable parameters
  */
-static char *mode[NR_PORTS] = { "picpar", };
+static const char *mode[NR_PORTS] = { "picpar", };
 static int iobase[NR_PORTS] = { 0x378, };
 
 module_param_array(mode, charp, NULL, 0);
diff --git a/drivers/net/hamradio/bpqether.c b/drivers/net/hamradio/bpqether.c
index c2e5497397d..18d8affecd1 100644
--- a/drivers/net/hamradio/bpqether.c
+++ b/drivers/net/hamradio/bpqether.c
@@ -69,6 +69,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>
@@ -87,7 +88,7 @@
 
 #include <linux/bpqether.h>
 
-static const char banner[] __initconst = KERN_INFO \
+static const char banner[] __initdata = KERN_INFO \
         "AX.25: bpqether driver version 004\n";
 
 static char bcast_addr[6]={0xFF,0xFF,0xFF,0xFF,0xFF,0xFF};
diff --git a/drivers/net/hamradio/mkiss.c b/drivers/net/hamradio/mkiss.c
index 8e01c457015..bc02968cee1 100644
--- a/drivers/net/hamradio/mkiss.c
+++ b/drivers/net/hamradio/mkiss.c
@@ -17,6 +17,7 @@
  * Copyright (C) 2004, 05 Thomas Osterried DL9SAU <thomas@x-berg.in-berlin.de>
  */
 #include <linux/module.h>
+#include <asm/system.h>
 #include <linux/bitops.h>
 #include <asm/uaccess.h>
 #include <linux/crc16.h>
@@ -485,7 +486,7 @@ static void ax_encaps(struct net_device *dev, unsigned char *icp, int len)
 
                         return;
                 default:
-                        count = kiss_esc(p, ax->xbuff, len);
+                        count = kiss_esc(p, (unsigned char *)ax->xbuff, len);
                 }
         } else {
                 unsigned short crc;
@@ -497,7 +498,7 @@ static void ax_encaps(struct net_device *dev, unsigned char *icp, int len)
                 case CRC_MODE_SMACK:
                         *p |= 0x80;
                         crc = swab16(crc16(0, p, len));
-                        count = kiss_esc_crc(p, ax->xbuff, crc, len+2);
+                        count = kiss_esc_crc(p, (unsigned char *)ax->xbuff, crc, len+2);
                         break;
                 case CRC_MODE_FLEX_TEST:
                         ax->crcmode = CRC_MODE_NONE;
@@ -506,11 +507,11 @@ static void ax_encaps(struct net_device *dev, unsigned char *icp, int len)
                 case CRC_MODE_FLEX:
                         *p |= 0x20;
                         crc = calc_crc_flex(p, len);
-                        count = kiss_esc_crc(p, ax->xbuff, crc, len+2);
+                        count = kiss_esc_crc(p, (unsigned char *)ax->xbuff, crc, len+2);
                         break;
 
                 default:
-                        count = kiss_esc(p, ax->xbuff, len);
+                        count = kiss_esc(p, (unsigned char *)ax->xbuff, len);
                 }
         }
         spin_unlock_bh(&ax->buflock);
@@ -997,9 +998,9 @@ static struct tty_ldisc_ops ax_ldisc = {
         .write_wakeup   = mkiss_write_wakeup
 };
 
-static const char banner[] __initconst = KERN_INFO \
+static const char banner[] __initdata = KERN_INFO \
         "mkiss: AX.25 Multikiss, Hans Albas PE1AYX\n";
-static const char msg_regfail[] __initconst = KERN_ERR \
+static const char msg_regfail[] __initdata = KERN_ERR \
         "mkiss: can't register line discipline (err = %d)\n";
 
 static int __init mkiss_init_driver(void)
@@ -1015,7 +1016,7 @@ static int __init mkiss_init_driver(void)
         return status;
 }
 
-static const char msg_unregfail[] = KERN_ERR \
+static const char msg_unregfail[] __exitdata = KERN_ERR \
         "mkiss: can't unregister line discipline (err = %d)\n";
 
 static void __exit mkiss_exit_driver(void)
diff --git a/drivers/net/hamradio/scc.c b/drivers/net/hamradio/scc.c
index 1b4a47bd32b..33655814448 100644
--- a/drivers/net/hamradio/scc.c
+++ b/drivers/net/hamradio/scc.c
@@ -177,12 +177,13 @@
 #include <net/ax25.h>
 
 #include <asm/irq.h>
+#include <asm/system.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
 
 #include "z8530.h"
 
-static const char banner[] __initconst = KERN_INFO \
+static const char banner[] __initdata = KERN_INFO \
         "AX.25: Z8530 SCC driver version "VERSION".dl1bke\n";
 
 static void t_dwait(unsigned long);
diff --git a/drivers/net/hamradio/yam.c b/drivers/net/hamradio/yam.c
index c6645f1017a..96a98d2ff15 100644
--- a/drivers/net/hamradio/yam.c
+++ b/drivers/net/hamradio/yam.c
@@ -52,6 +52,7 @@
 #include <linux/bitops.h>
 #include <linux/random.h>
 #include <asm/io.h>
+#include <asm/system.h>
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/firmware.h>
@@ -76,7 +77,7 @@
 /* --------------------------------------------------------------------- */
 
 static const char yam_drvname[] = "yam";
-static const char yam_drvinfo[] __initconst = KERN_INFO \
+static const char yam_drvinfo[] __initdata = KERN_INFO \
         "YAM driver version 0.8 by F1OAT/F6FBB\n";
 
 /* --------------------------------------------------------------------- */
@@ -402,6 +403,7 @@ static unsigned char *add_mcs(unsigned char *bits, int bitrate,
 
         /* Allocate a new mcs */
         if ((p = kmalloc(sizeof(struct yam_mcs), GFP_KERNEL)) == NULL) {
+                printk(KERN_WARNING "YAM: no memory to allocate mcs\n");
                 release_firmware(fw);
                 return NULL;
         }