diff --git a/[refs] b/[refs] index 6f7b1feed047..476b5ce94dd8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3d2a531804d16cd8df6dbbb0429c6f143e756049 +refs/heads/master: b879743f26cb029e41ffe865fb939cfc6fa9be88 diff --git a/trunk/drivers/pci/pci.h b/trunk/drivers/pci/pci.h index d930338e0922..95186caa1492 100644 --- a/trunk/drivers/pci/pci.h +++ b/trunk/drivers/pci/pci.h @@ -13,9 +13,9 @@ extern int pci_create_sysfs_dev_files(struct pci_dev *pdev); extern void pci_remove_sysfs_dev_files(struct pci_dev *pdev); #ifndef CONFIG_DMI static inline void pci_create_firmware_label_files(struct pci_dev *pdev) -{ return 0; } +{ return; } static inline void pci_remove_firmware_label_files(struct pci_dev *pdev) -{ return 0; } +{ return; } #else extern void pci_create_firmware_label_files(struct pci_dev *pdev); extern void pci_remove_firmware_label_files(struct pci_dev *pdev);