diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/net/smc-mca.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
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 */ |