]>
Commit | Line | Data |
---|---|---|
1 | --- r8168-8.035.00/src/r8168_n.c.orig 2012-12-19 11:38:56.000000000 +0100 | |
2 | +++ r8168-8.035.00/src/r8168_n.c 2013-06-04 13:10:37.691818331 +0200 | |
3 | @@ -14541,7 +14541,11 @@ | |
4 | spin_unlock_irqrestore(&tp->phy_lock, flags); | |
5 | } | |
6 | ||
7 | +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0) | |
8 | static int __devinit | |
9 | +#else | |
10 | +static int | |
11 | +#endif | |
12 | rtl8168_init_board(struct pci_dev *pdev, | |
13 | struct net_device **dev_out, | |
14 | void __iomem **ioaddr_out) | |
15 | @@ -14711,7 +14711,11 @@ | |
16 | goto out; | |
17 | } | |
18 | ||
19 | +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0) | |
20 | static void __devinit | |
21 | +#else | |
22 | +static void | |
23 | +#endif | |
24 | rtl8168_init_sequence(struct rtl8168_private *tp) | |
25 | { | |
26 | void __iomem *ioaddr = tp->mmio_addr; | |
27 | @@ -14964,7 +14964,11 @@ | |
28 | }; | |
29 | #endif | |
30 | ||
31 | +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0) | |
32 | static int __devinit | |
33 | +#else | |
34 | +static int | |
35 | +#endif | |
36 | rtl8168_init_one(struct pci_dev *pdev, | |
37 | const struct pci_device_id *ent) | |
38 | { | |
39 | @@ -15128,7 +15128,11 @@ | |
40 | return 0; | |
41 | } | |
42 | ||
43 | +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0) | |
44 | static void __devexit | |
45 | +#else | |
46 | +static void | |
47 | +#endif | |
48 | rtl8168_remove_one(struct pci_dev *pdev) | |
49 | { | |
50 | struct net_device *dev = pci_get_drvdata(pdev); | |
51 | @@ -17649,7 +17649,11 @@ | |
52 | .name = MODULENAME, | |
53 | .id_table = rtl8168_pci_tbl, | |
54 | .probe = rtl8168_init_one, | |
55 | +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0) | |
56 | .remove = __devexit_p(rtl8168_remove_one), | |
57 | +#else | |
58 | + .remove = rtl8168_remove_one, | |
59 | +#endif | |
60 | #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,11) | |
61 | .shutdown = rtl8168_shutdown, | |
62 | #endif |