diff options
| author | Jeff Garzik <jgarzik@pretzel.yyz.us> | 2005-06-26 23:42:30 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-26 23:42:30 -0400 |
| commit | f45727d52d1581e9ff4df9d1a12a60789ad2d1eb (patch) | |
| tree | 773ae25f98542e6d382c688f7e85e8137d065614 /drivers/ide/ide-disk.c | |
| parent | 4c925f452cfd16c690209e96821ee094e09a2404 (diff) | |
| parent | 5696c1944a33b4434a9a1ebb6383b906afd43a10 (diff) | |
Merge /spare/repo/netdev-2.6/ branch 'ieee80211'
Diffstat (limited to 'drivers/ide/ide-disk.c')
| -rw-r--r-- | drivers/ide/ide-disk.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c index 3302cd8eab4c..d6f934886b04 100644 --- a/drivers/ide/ide-disk.c +++ b/drivers/ide/ide-disk.c | |||
| @@ -1215,7 +1215,8 @@ static int ide_disk_probe(struct device *dev) | |||
| 1215 | if (!idkp) | 1215 | if (!idkp) |
| 1216 | goto failed; | 1216 | goto failed; |
| 1217 | 1217 | ||
| 1218 | g = alloc_disk(1 << PARTN_BITS); | 1218 | g = alloc_disk_node(1 << PARTN_BITS, |
| 1219 | pcibus_to_node(drive->hwif->pci_dev->bus)); | ||
| 1219 | if (!g) | 1220 | if (!g) |
| 1220 | goto out_free_idkp; | 1221 | goto out_free_idkp; |
| 1221 | 1222 | ||