diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/net/tokenring/proteon.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/net/tokenring/proteon.c')
| -rw-r--r-- | drivers/net/tokenring/proteon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tokenring/proteon.c b/drivers/net/tokenring/proteon.c index 16e8783ee9cd..8d362e64a40e 100644 --- a/drivers/net/tokenring/proteon.c +++ b/drivers/net/tokenring/proteon.c | |||
| @@ -110,7 +110,7 @@ static int __init proteon_probe1(struct net_device *dev, int ioaddr) | |||
| 110 | } | 110 | } |
| 111 | 111 | ||
| 112 | dev->base_addr = ioaddr; | 112 | dev->base_addr = ioaddr; |
| 113 | return (0); | 113 | return 0; |
| 114 | nodev: | 114 | nodev: |
| 115 | release_region(ioaddr, PROTEON_IO_EXTENT); | 115 | release_region(ioaddr, PROTEON_IO_EXTENT); |
| 116 | return -ENODEV; | 116 | return -ENODEV; |