diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/net/appletalk | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'drivers/net/appletalk')
| -rw-r--r-- | drivers/net/appletalk/cops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/appletalk/cops.c b/drivers/net/appletalk/cops.c index b5dc7f550725..9d828aed968a 100644 --- a/drivers/net/appletalk/cops.c +++ b/drivers/net/appletalk/cops.c | |||
| @@ -120,7 +120,7 @@ static int irq = 5; /* Default IRQ */ | |||
| 120 | * DAYNA driver mode: | 120 | * DAYNA driver mode: |
| 121 | * Dayna DL2000/DaynaTalk PC (Half Length), COPS LT-95, | 121 | * Dayna DL2000/DaynaTalk PC (Half Length), COPS LT-95, |
| 122 | * Farallon PhoneNET PC III, Farallon PhoneNET PC II | 122 | * Farallon PhoneNET PC III, Farallon PhoneNET PC II |
| 123 | * Other cards possibly supported mode unkown though: | 123 | * Other cards possibly supported mode unknown though: |
| 124 | * Dayna DL2000 (Full length), COPS LT/M (Micro-Channel) | 124 | * Dayna DL2000 (Full length), COPS LT/M (Micro-Channel) |
| 125 | * | 125 | * |
| 126 | * Cards NOT supported by this driver but supported by the ltpc.c | 126 | * Cards NOT supported by this driver but supported by the ltpc.c |