diff options
| author | James Morris <jmorris@namei.org> | 2009-06-30 09:10:35 +1000 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-06-30 09:10:35 +1000 |
| commit | ac7242142b03421c96b0a2f8d99f146d075614c2 (patch) | |
| tree | b0b2ead65858c7a343d38affed86fe815e37e7e9 /drivers/net/ps3_gelic_wireless.c | |
| parent | 89c86576ecde504da1eeb4f4882b2189ac2f9c4a (diff) | |
| parent | 2bfdd79eaa0043346e773ba5f6cfd811ea31b73d (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'drivers/net/ps3_gelic_wireless.c')
| -rw-r--r-- | drivers/net/ps3_gelic_wireless.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ps3_gelic_wireless.c b/drivers/net/ps3_gelic_wireless.c index 4f3ada622f9..b6b3ca9bdb2 100644 --- a/drivers/net/ps3_gelic_wireless.c +++ b/drivers/net/ps3_gelic_wireless.c @@ -2442,7 +2442,7 @@ static const struct iw_handler_def gelic_wl_wext_handler_def = { #endif }; -static struct net_device *gelic_wl_alloc(struct gelic_card *card) +static struct net_device * __devinit gelic_wl_alloc(struct gelic_card *card) { struct net_device *netdev; struct gelic_port *port; @@ -2722,7 +2722,7 @@ static struct ethtool_ops gelic_wl_ethtool_ops = { .set_rx_csum = gelic_net_set_rx_csum, }; -static void gelic_wl_setup_netdev_ops(struct net_device *netdev) +static void __devinit gelic_wl_setup_netdev_ops(struct net_device *netdev) { struct gelic_wl_info *wl; wl = port_wl(netdev_priv(netdev)); @@ -2738,7 +2738,7 @@ static void gelic_wl_setup_netdev_ops(struct net_device *netdev) /* * driver probe/remove */ -int gelic_wl_driver_probe(struct gelic_card *card) +int __devinit gelic_wl_driver_probe(struct gelic_card *card) { int ret; struct net_device *netdev; |