diff options
-rw-r--r-- | arch/mips/jmr3927/rbhma3100/setup.c | 4 | ||||
-rw-r--r-- | drivers/net/tc35815.c | 13 |
2 files changed, 0 insertions, 17 deletions
diff --git a/arch/mips/jmr3927/rbhma3100/setup.c b/arch/mips/jmr3927/rbhma3100/setup.c index 7ca3d6d07b34..ecabe5b08489 100644 --- a/arch/mips/jmr3927/rbhma3100/setup.c +++ b/arch/mips/jmr3927/rbhma3100/setup.c | |||
@@ -137,10 +137,6 @@ int jmr3927_ccfg_toeon = 0; | |||
137 | 137 | ||
138 | static inline void do_reset(void) | 138 | static inline void do_reset(void) |
139 | { | 139 | { |
140 | #ifdef CONFIG_TC35815 | ||
141 | extern void tc35815_killall(void); | ||
142 | tc35815_killall(); | ||
143 | #endif | ||
144 | #if 1 /* Resetting PCI bus */ | 140 | #if 1 /* Resetting PCI bus */ |
145 | jmr3927_ioc_reg_out(0, JMR3927_IOC_RESET_ADDR); | 141 | jmr3927_ioc_reg_out(0, JMR3927_IOC_RESET_ADDR); |
146 | jmr3927_ioc_reg_out(JMR3927_IOC_RESET_PCI, JMR3927_IOC_RESET_ADDR); | 142 | jmr3927_ioc_reg_out(JMR3927_IOC_RESET_PCI, JMR3927_IOC_RESET_ADDR); |
diff --git a/drivers/net/tc35815.c b/drivers/net/tc35815.c index eae2b63951f1..e3a7e3ceab77 100644 --- a/drivers/net/tc35815.c +++ b/drivers/net/tc35815.c | |||
@@ -1703,19 +1703,6 @@ static void tc35815_chip_init(struct net_device *dev) | |||
1703 | spin_unlock_irqrestore(&lp->lock, flags); | 1703 | spin_unlock_irqrestore(&lp->lock, flags); |
1704 | } | 1704 | } |
1705 | 1705 | ||
1706 | /* XXX */ | ||
1707 | void | ||
1708 | tc35815_killall(void) | ||
1709 | { | ||
1710 | struct net_device *dev; | ||
1711 | |||
1712 | for (dev = root_tc35815_dev; dev; dev = ((struct tc35815_local *)dev->priv)->next_module) { | ||
1713 | if (dev->flags&IFF_UP){ | ||
1714 | dev->stop(dev); | ||
1715 | } | ||
1716 | } | ||
1717 | } | ||
1718 | |||
1719 | static struct pci_driver tc35815_driver = { | 1706 | static struct pci_driver tc35815_driver = { |
1720 | .name = TC35815_MODULE_NAME, | 1707 | .name = TC35815_MODULE_NAME, |
1721 | .probe = tc35815_probe, | 1708 | .probe = tc35815_probe, |