diff options
| author | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
|---|---|---|
| committer | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
| commit | 342045a35b1981a89e4bc80842b10c065e1050da (patch) | |
| tree | 4140720b20e8d641c11da882010d6130a75fef21 /target/linux/adm5120/files/drivers/net/adm5120sw.c | |
| parent | 7338133dde8238afce34676214b494c8db96689b (diff) | |
| parent | 1a116ce7818ecee5d167a9c0ebb1a0feca9120e6 (diff) | |
Merge trunk into realtek-unstable
Conflicts:
Config.in
feeds.conf.default
package/base-files/files/etc/hotplug2-common.rules
package/network/config/netifd/files/etc/init.d/network
Diffstat (limited to 'target/linux/adm5120/files/drivers/net/adm5120sw.c')
| -rw-r--r-- | target/linux/adm5120/files/drivers/net/adm5120sw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/adm5120/files/drivers/net/adm5120sw.c b/target/linux/adm5120/files/drivers/net/adm5120sw.c index d80a6a3a1..7fbabb00e 100644 --- a/target/linux/adm5120/files/drivers/net/adm5120sw.c +++ b/target/linux/adm5120/files/drivers/net/adm5120sw.c @@ -1083,7 +1083,7 @@ static void adm5120_switch_cleanup(void) adm5120_switch_rx_ring_free(); } -static int __devinit adm5120_switch_probe(struct platform_device *pdev) +static int adm5120_switch_probe(struct platform_device *pdev) { u32 t; int i, err; |