/* indexed by board_t, above */
-static const struct {
+static struct {
const char *name;
u32 hw_flags;
} board_info[] __devinitdata = {
No extra delay is needed with 33Mhz PCI, but 66Mhz may change this.
*/
-#define eeprom_delay() (void)RTL_R32(Cfg9346)
+#define eeprom_delay() RTL_R32(Cfg9346)
/* The EEPROM commands include the alway-set leading bit. */
#define EE_WRITE_CMD (5)
#define mdio_delay() RTL_R8(Config4)
-static const char mii_2_8139_map[8] = {
+static char mii_2_8139_map[8] = {
BasicModeCtrl,
BasicModeStatus,
0,
if (tp->watchdog_fired) {
tp->watchdog_fired = 0;
rtl8139_tx_timeout_task(_data);
- } else if (rtnl_trylock()) {
+ } else if (rtnl_shlock_nowait() == 0) {
rtl8139_thread_iter (dev, tp, tp->mmio_addr);
rtnl_unlock ();
} else {