← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to drivers/net/zorro8390.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/net/zorro8390.c
126
126
 
127
127
    board = z->resource.start;
128
128
    ioaddr = board+cards[i].offset;
129
 
    dev = alloc_ei_netdev();
 
129
    dev = ____alloc_ei_netdev(0);
130
130
    if (!dev)
131
131
        return -ENOMEM;
132
132
    if (!request_mem_region(ioaddr, NE_IO_EXTENT*2, DRV_NAME)) {
146
146
static const struct net_device_ops zorro8390_netdev_ops = {
147
147
        .ndo_open               = zorro8390_open,
148
148
        .ndo_stop               = zorro8390_close,
149
 
        .ndo_start_xmit         = ei_start_xmit,
150
 
        .ndo_tx_timeout         = ei_tx_timeout,
151
 
        .ndo_get_stats          = ei_get_stats,
152
 
        .ndo_set_multicast_list = ei_set_multicast_list,
 
149
        .ndo_start_xmit         = __ei_start_xmit,
 
150
        .ndo_tx_timeout         = __ei_tx_timeout,
 
151
        .ndo_get_stats          = __ei_get_stats,
 
152
        .ndo_set_multicast_list = __ei_set_multicast_list,
153
153
        .ndo_validate_addr      = eth_validate_addr,
154
154
        .ndo_set_mac_address    = eth_mac_addr,
155
155
        .ndo_change_mtu         = eth_change_mtu,
156
156
#ifdef CONFIG_NET_POLL_CONTROLLER
157
 
        .ndo_poll_controller    = ei_poll,
 
157
        .ndo_poll_controller    = __ei_poll,
158
158
#endif
159
159
};
160
160