diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-01-23 18:07:21 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-01-23 18:07:21 -0500 |
| commit | 9156ad48338e0306e508ead5c0d9986050744475 (patch) | |
| tree | 37f3a90e38190052ecf3cdf9171dfdddd37b56fd /drivers/atm/suni.c | |
| parent | fa28237cfcc5827553044cbd6ee52e33692b0faa (diff) | |
| parent | 8f7b3d156d348b6766833cd4e272d0d19b501e64 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/atm/suni.c')
| -rw-r--r-- | drivers/atm/suni.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/atm/suni.c b/drivers/atm/suni.c index f04f39c00833..b1d063cc4fbe 100644 --- a/drivers/atm/suni.c +++ b/drivers/atm/suni.c | |||
| @@ -289,7 +289,7 @@ static const struct atmphy_ops suni_ops = { | |||
| 289 | }; | 289 | }; |
| 290 | 290 | ||
| 291 | 291 | ||
| 292 | int __devinit suni_init(struct atm_dev *dev) | 292 | int suni_init(struct atm_dev *dev) |
| 293 | { | 293 | { |
| 294 | unsigned char mri; | 294 | unsigned char mri; |
| 295 | 295 | ||