diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-12-07 15:14:12 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-12-07 15:14:18 +0300 |
| commit | f3d607c6b39bd9cb5000e03e2c0dc2afe1241374 (patch) | |
| tree | 885b5e0b5bb3d87efc4bfbde69feff2ece32ecac /drivers/ata/pata_sc1200.c | |
| parent | 8055039c2a2454c7159dcbde3161943b757a6e0e (diff) | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| download | linux-f3d607c6b39bd9cb5000e03e2c0dc2afe1241374.tar.xz | |
Merge branch 'linus' into x86/urgent
Merge reason: we want to queue up a dependent fix.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/ata/pata_sc1200.c')
| -rw-r--r-- | drivers/ata/pata_sc1200.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/ata/pata_sc1200.c b/drivers/ata/pata_sc1200.c index f49814d6fd2e..3bbed8322ecf 100644 --- a/drivers/ata/pata_sc1200.c +++ b/drivers/ata/pata_sc1200.c @@ -235,8 +235,7 @@ static int sc1200_init_one(struct pci_dev *dev, const struct pci_device_id *id) .udma_mask = ATA_UDMA2, .port_ops = &sc1200_port_ops }; - /* Can't enable port 2 yet, see top comments */ - const struct ata_port_info *ppi[] = { &info, }; + const struct ata_port_info *ppi[] = { &info, NULL }; return ata_pci_sff_init_one(dev, ppi, &sc1200_sht, NULL); } |