Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (21 commits)
  MIPS: Alchemy: PB1200: use SMC91X platform data.
  MIPS: Alchemy: MIPS hazard workarounds are not required.
  MIPS: Alchemy: provide cpu feature overrides.
  MIPS: Alchemy: unify CPU model constants.
  MIPS: Make a needlessly global symbol static in arch/mips/kernel/smp.c
  MIPS: Fix global namespace pollution in arch/mips/kernel/smp-up.c
  MIPS: Malta: make a needlessly global integer variable static
  MIPS: Use BUG_ON() where possible.
  MIPS: Convert obsolete irq_desc_t to struct irq_desc
  MIPS: Enable GENERIC_HARDIRQS_NO__DO_IRQ for all platforms
  MIPS: EMMA2RH: Set UART mapbase
  MIPS: EMMA2RH: Use set_irq_chip_and_handler_name
  MIPS: EMMA2RH: Use handle_edge_irq() handler for GPIO interrupts
  MIPS: Mark Eins: Fix cascading interrupt dispatcher
  MIPS: Au1000: convert to using gpiolib
  MIPS: Stop using <asm-generic/int-l64.h>.
  MIPS: Cavium: Add -Werror
  MIPS: Makefile: Add simple make install target.
  MIPS: Compat: Zero upper 32-bit of offset_high and offset_low.
  MIPS: __raw_spin_lock() may spin forever on ticket wrap.
  ...

2 files changed, 1 insertions, 33 deletions

diff --git a/drivers/net/meth.c b/drivers/net/meth.c
index c336a1f42510..aa08987f6e81 100644
--- a/drivers/net/meth.c
+++ b/drivers/net/meth.c
@@ -398,7 +398,7 @@ static void meth_rx(struct net_device* dev, unsigned long int_status)
                         int len = (status & 0xffff) - 4; /* omit CRC */
                         /* length sanity check */
                         if (len < 60 || len > 1518) {
-                                printk(KERN_DEBUG "%s: bogus packet size: %ld, status=%#2lx.\n",
+                                printk(KERN_DEBUG "%s: bogus packet size: %ld, status=%#2Lx.\n",
                                        dev->name, priv->rx_write,
                                        priv->rx_ring[priv->rx_write]->status.raw);
                                 dev->stats.rx_errors++;
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h
index 6c44f86ae3fd..912308eec865 100644
--- a/drivers/net/smc91x.h
+++ b/drivers/net/smc91x.h
@@ -346,38 +346,6 @@ static inline void LPD7_SMC_outsw (unsigned char* a, int r,
 #define RPC_LSA_DEFAULT         RPC_LED_TX_RX
 #define RPC_LSB_DEFAULT         RPC_LED_100_10
 
-#elif defined(CONFIG_SOC_AU1X00)
-
-#include <au1xxx.h>
-
-/* We can only do 16-bit reads and writes in the static memory space. */
-#define SMC_CAN_USE_8BIT        0
-#define SMC_CAN_USE_16BIT       1
-#define SMC_CAN_USE_32BIT       0
-#define SMC_IO_SHIFT            0
-#define SMC_NOWAIT              1
-
-#define SMC_inw(a, r)           au_readw((unsigned long)((a) + (r)))
-#define SMC_insw(a, r, p, l)    \
-        do {    \
-                unsigned long _a = (unsigned long)((a) + (r)); \
-                int _l = (l); \
-                u16 *_p = (u16 *)(p); \
-                while (_l-- > 0) \
-                        *_p++ = au_readw(_a); \
-        } while(0)
-#define SMC_outw(v, a, r)       au_writew(v, (unsigned long)((a) + (r)))
-#define SMC_outsw(a, r, p, l)   \
-        do {    \
-                unsigned long _a = (unsigned long)((a) + (r)); \
-                int _l = (l); \
-                const u16 *_p = (const u16 *)(p); \
-                while (_l-- > 0) \
-                        au_writew(*_p++ , _a); \
-        } while(0)
-
-#define SMC_IRQ_FLAGS           (0)
-
 #elif   defined(CONFIG_ARCH_VERSATILE)
 
 #define SMC_CAN_USE_8BIT        1