Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

Pull m68k updates from Geert Uytterhoeven.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Setup CROSS_COMPILE at the top
  m68k: Correct the Atari ALLOWINT definition
  m68k/video: Create <asm/vga.h>
  m68k: Make sure {read,write}s[bwl]() are always defined
  m68k/mm: Port OOM changes to do_page_fault()
  scsi/atari: Make more functions static
  scsi/atari: Revive "atascsi=" setup option
  net/ariadne: Improve debug prints
  m68k/atari: Change VME irq numbers from unsigned long to unsigned int
  m68k/amiga: Use arch_initcall() for registering platform devices
  m68k/amiga: Add error checks when registering platform devices
  m68k/amiga: Mark z_dev_present() __init
  m68k: Remove unused MAX_NOINT_IPL definition

2 files changed, 8 insertions, 11 deletions

diff --git a/drivers/net/ethernet/amd/ariadne.c b/drivers/net/ethernet/amd/ariadne.c
index f4c228e4d76c..f2958df9a1e4 100644
--- a/drivers/net/ethernet/amd/ariadne.c
+++ b/drivers/net/ethernet/amd/ariadne.c
@@ -213,10 +213,10 @@ static int ariadne_rx(struct net_device *dev)
                                                 (const void *)priv->rx_buff[entry],
                                                 pkt_len);
                         skb->protocol = eth_type_trans(skb, dev);
-                        netdev_dbg(dev, "RX pkt type 0x%04x from %pM to %pM data 0x%08x len %d\n",
+                        netdev_dbg(dev, "RX pkt type 0x%04x from %pM to %pM data %p len %u\n",
                                    ((u_short *)skb->data)[6],
                                    skb->data + 6, skb->data,
-                                   (int)skb->data, (int)skb->len);
+                                   skb->data, skb->len);
 
                         netif_rx(skb);
                         dev->stats.rx_packets++;
@@ -566,10 +566,10 @@ static netdev_tx_t ariadne_start_xmit(struct sk_buff *skb,
 
         /* Fill in a Tx ring entry */
 
-        netdev_dbg(dev, "TX pkt type 0x%04x from %pM to %pM data 0x%08x len %d\n",
+        netdev_dbg(dev, "TX pkt type 0x%04x from %pM to %pM data %p len %u\n",
                    ((u_short *)skb->data)[6],
                    skb->data + 6, skb->data,
-                   (int)skb->data, (int)skb->len);
+                   skb->data, skb->len);
 
         local_irq_save(flags);
 
diff --git a/drivers/net/ethernet/amd/atarilance.c b/drivers/net/ethernet/amd/atarilance.c
index 70ed79c46245..84219df72f51 100644
--- a/drivers/net/ethernet/amd/atarilance.c
+++ b/drivers/net/ethernet/amd/atarilance.c
@@ -558,21 +558,18 @@ static unsigned long __init lance_probe1( struct net_device *dev,
                         printk( "Lance: request for irq %d failed\n", IRQ_AUTO_5 );
                         return 0;
                 }
-                dev->irq = (unsigned short)IRQ_AUTO_5;
+                dev->irq = IRQ_AUTO_5;
         }
         else {
-                /* For VME-RieblCards, request a free VME int;
-                 * (This must be unsigned long, since dev->irq is short and the
-                 * IRQ_MACHSPEC bit would be cut off...)
-                 */
-                unsigned long irq = atari_register_vme_int();
+                /* For VME-RieblCards, request a free VME int */
+                unsigned int irq = atari_register_vme_int();
                 if (!irq) {
                         printk( "Lance: request for VME interrupt failed\n" );
                         return 0;
                 }
                 if (request_irq(irq, lance_interrupt, IRQ_TYPE_PRIO,
                             "Riebl-VME Ethernet", dev)) {
-                        printk( "Lance: request for irq %ld failed\n", irq );
+                        printk( "Lance: request for irq %u failed\n", irq );
                         return 0;
                 }
                 dev->irq = irq;