diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-02-20 19:45:52 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-02-20 19:45:52 +0100 |
| commit | 1339730e73f14673ad55bddda119982504633da9 (patch) | |
| tree | 56306454f0cf7152e60dac6030afe07ed667c574 /drivers/net/wan/pc300too.c | |
| parent | i7core_edac: fix kernel crash on unloading i7core_edac. (diff) | |
| parent | Linux 3.8-rc7 (diff) | |
| download | linux-1339730e73f14673ad55bddda119982504633da9.tar.xz linux-1339730e73f14673ad55bddda119982504633da9.zip | |
Merge tag 'v3.8-rc7' into next
Linux 3.8-rc7
* tag 'v3.8-rc7': (12052 commits)
Linux 3.8-rc7
net: sctp: sctp_endpoint_free: zero out secret key data
net: sctp: sctp_setsockopt_auth_key: use kzfree instead of kfree
atm/iphase: rename fregt_t -> ffreg_t
ARM: 7641/1: memory: fix broken mmap by ensuring TASK_UNMAPPED_BASE is aligned
ARM: DMA mapping: fix bad atomic test
ARM: realview: ensure that we have sufficient IRQs available
ARM: GIC: fix GIC cpumask initialization
net: usb: fix regression from FLAG_NOARP code
l2tp: dont play with skb->truesize
net: sctp: sctp_auth_key_put: use kzfree instead of kfree
netback: correct netbk_tx_err to handle wrap around.
xen/netback: free already allocated memory on failure in xen_netbk_get_requests
xen/netback: don't leak pages on failure in xen_netbk_tx_check_gop.
xen/netback: shutdown the ring if it contains garbage.
drm/ttm: fix fence locking in ttm_buffer_object_transfer, 2nd try
virtio_console: Don't access uninitialized data.
net: qmi_wwan: add more Huawei devices, including E320
net: cdc_ncm: add another Huawei vendor specific device
ipv6/ip6_gre: fix error case handling in ip6gre_tunnel_xmit()
...
Diffstat (limited to 'drivers/net/wan/pc300too.c')
| -rw-r--r-- | drivers/net/wan/pc300too.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wan/pc300too.c b/drivers/net/wan/pc300too.c index 5fe246e060d7..53efc57fcace 100644 --- a/drivers/net/wan/pc300too.c +++ b/drivers/net/wan/pc300too.c @@ -297,8 +297,8 @@ static const struct net_device_ops pc300_ops = { .ndo_do_ioctl = pc300_ioctl, }; -static int __devinit pc300_pci_init_one(struct pci_dev *pdev, - const struct pci_device_id *ent) +static int pc300_pci_init_one(struct pci_dev *pdev, + const struct pci_device_id *ent) { card_t *card; u32 __iomem *p; |