Merge ../linux-2.6

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c
index 2beac55b57d6..f5ee064ab6b2 100644
--- a/drivers/net/8139too.c
+++ b/drivers/net/8139too.c
@@ -229,7 +229,7 @@ typedef enum {
 
 
 /* indexed by board_t, above */
-static struct {
+static const struct {
         const char *name;
         u32 hw_flags;
 } board_info[] __devinitdata = {
@@ -1192,7 +1192,7 @@ static int __devinit read_eeprom (void __iomem *ioaddr, int location, int addr_l
 #define mdio_delay()    RTL_R8(Config4)
 
 
-static char mii_2_8139_map[8] = {
+static const char mii_2_8139_map[8] = {
         BasicModeCtrl,
         BasicModeStatus,
         0,
@@ -1605,7 +1605,7 @@ static void rtl8139_thread (void *_data)
         if (tp->watchdog_fired) {
                 tp->watchdog_fired = 0;
                 rtl8139_tx_timeout_task(_data);
-        } else if (rtnl_shlock_nowait() == 0) {
+        } else if (rtnl_trylock()) {
                 rtl8139_thread_iter (dev, tp, tp->mmio_addr);
                 rtnl_unlock ();
         } else {