diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /drivers/net/smc-mca.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'drivers/net/smc-mca.c')
| -rw-r--r-- | drivers/net/smc-mca.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/smc-mca.c b/drivers/net/smc-mca.c index c791ef76c1d6..a93f122e9a96 100644 --- a/drivers/net/smc-mca.c +++ b/drivers/net/smc-mca.c | |||
| @@ -268,9 +268,9 @@ static int __init ultramca_probe(struct device *gen_dev) | |||
| 268 | } | 268 | } |
| 269 | } | 269 | } |
| 270 | 270 | ||
| 271 | if(!tirq || !tbase | 271 | if(!tirq || !tbase || |
| 272 | || (irq && irq != tirq) | 272 | (irq && irq != tirq) || |
| 273 | || (base_addr && tbase != base_addr)) | 273 | (base_addr && tbase != base_addr)) |
| 274 | /* FIXME: we're trying to force the ordering of the | 274 | /* FIXME: we're trying to force the ordering of the |
| 275 | * devices here, there should be a way of getting this | 275 | * devices here, there should be a way of getting this |
| 276 | * to happen */ | 276 | * to happen */ |