diff --git a/[refs] b/[refs] index aa8df5897f22..68ac988146a5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a1aee8622293138867e7dbd1dd214dfb34cd89d2 +refs/heads/master: 96f80219b738f84f90e449385bdede90f2910521 diff --git a/trunk/include/linux/ide.h b/trunk/include/linux/ide.h index fee4b157c533..1524829f73f2 100644 --- a/trunk/include/linux/ide.h +++ b/trunk/include/linux/ide.h @@ -1448,8 +1448,7 @@ static inline void ide_dump_identify(u8 *id) static inline int hwif_to_node(ide_hwif_t *hwif) { - struct pci_dev *dev = to_pci_dev(hwif->dev); - return hwif->dev ? pcibus_to_node(dev->bus) : -1; + return hwif->dev ? dev_to_node(hwif->dev) : -1; } static inline ide_drive_t *ide_get_paired_drive(ide_drive_t *drive)