From b8668a2a42c90dd1c57201d8a07643a77afbb5c6 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 30 Jan 2008 15:21:33 -0800 Subject: [PATCH] --- yaml --- r: 82359 b: refs/heads/master c: 367b09fec4e01571a3aab996be086072cf5517eb h: refs/heads/master i: 82357: 6e7567084d04bef8ef4adfed146020a38fe5fba1 82355: 1e99b816d8be13f3bca385e1f83df852e9d5f6f6 82351: b2f759f386faa54703e1f653d59958d60ef9ab96 v: v3 --- [refs] | 2 +- trunk/drivers/pci/pci.h | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 4d4c31287807..48750b384f81 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6c723d5bd89f03fc3ef627d50f89ade054d2ee3b +refs/heads/master: 367b09fec4e01571a3aab996be086072cf5517eb diff --git a/trunk/drivers/pci/pci.h b/trunk/drivers/pci/pci.h index 4c4613387786..79887efbd986 100644 --- a/trunk/drivers/pci/pci.h +++ b/trunk/drivers/pci/pci.h @@ -6,8 +6,10 @@ extern void pci_remove_sysfs_dev_files(struct pci_dev *pdev); extern void pci_cleanup_rom(struct pci_dev *dev); /* Firmware callbacks */ -extern pci_power_t (*platform_pci_choose_state)(struct pci_dev *dev, pm_message_t state); -extern int (*platform_pci_set_power_state)(struct pci_dev *dev, pci_power_t state); +extern pci_power_t (*platform_pci_choose_state)(struct pci_dev *dev, + pm_message_t state); +extern int (*platform_pci_set_power_state)(struct pci_dev *dev, + pci_power_t state); extern int pci_user_read_config_byte(struct pci_dev *dev, int where, u8 *val); extern int pci_user_read_config_word(struct pci_dev *dev, int where, u16 *val); @@ -69,7 +71,7 @@ extern struct class_device_attribute class_device_attr_cpuaffinity; * PCI device id structure * @id: single PCI device id structure to match * @dev: the PCI device structure to match against - * + * * Returns the matching pci_device_id structure or %NULL if there is no match. */ static inline const struct pci_device_id *