diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-09 16:34:25 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-09 16:34:25 -0400 |
| commit | f974a8ec96571535ee07880a023bcce0e3f2c76b (patch) | |
| tree | 5cf09207b1ad292a55275cd0b24999fa29b9dfe8 /drivers/ata/pata_at32.c | |
| parent | c0b8556f2f8146bd38324b14b1ce00f249ba8ed9 (diff) | |
| parent | 4ed47896935573c8423d05bddda3f269d6e6c613 (diff) | |
Merge branch 'machtypes' into pxa-palm
Diffstat (limited to 'drivers/ata/pata_at32.c')
| -rw-r--r-- | drivers/ata/pata_at32.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/ata/pata_at32.c b/drivers/ata/pata_at32.c index 5e104385d6a3..82fb6e273169 100644 --- a/drivers/ata/pata_at32.c +++ b/drivers/ata/pata_at32.c | |||
| @@ -291,8 +291,6 @@ static int __init pata_at32_probe(struct platform_device *pdev) | |||
| 291 | if (!info) | 291 | if (!info) |
| 292 | return -ENOMEM; | 292 | return -ENOMEM; |
| 293 | 293 | ||
| 294 | memset(info, 0, sizeof(struct at32_ide_info)); | ||
| 295 | |||
| 296 | info->irq = irq; | 294 | info->irq = irq; |
| 297 | info->cs = board->cs; | 295 | info->cs = board->cs; |
| 298 | 296 | ||