Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 39892
b: refs/heads/master
c: 3ec6a8d
h: refs/heads/master
v: v3
  • Loading branch information
Andrew Morton authored and Greg Kroah-Hartman committed Oct 18, 2006
1 parent 8c6e705 commit 832f34d
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 09d6029f43ebbe7307854abdae204c25d711ff94
refs/heads/master: 3ec6a8d02efd54a66640bd85afa8c162647b56c3
4 changes: 3 additions & 1 deletion trunk/drivers/pci/pcie/portdrv.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
#ifndef _PORTDRV_H_
#define _PORTDRV_H_

#include <linux/compiler.h>

#if !defined(PCI_CAP_ID_PME)
#define PCI_CAP_ID_PME 1
#endif
Expand Down Expand Up @@ -39,7 +41,7 @@ extern int pcie_port_device_suspend(struct pci_dev *dev, pm_message_t state);
extern int pcie_port_device_resume(struct pci_dev *dev);
#endif
extern void pcie_port_device_remove(struct pci_dev *dev);
extern int pcie_port_bus_register(void);
extern int __must_check pcie_port_bus_register(void);
extern void pcie_port_bus_unregister(void);

#endif /* _PORTDRV_H_ */
3 changes: 1 addition & 2 deletions trunk/drivers/pci/pcie/portdrv_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
* Copyright (C) Tom Long Nguyen (tom.l.nguyen@intel.com)
*/

#include <linux/compiler.h>
#include <linux/module.h>
#include <linux/pci.h>
#include <linux/kernel.h>
Expand Down Expand Up @@ -401,7 +400,7 @@ void pcie_port_device_remove(struct pci_dev *dev)
pci_disable_msi(dev);
}

int __must_check pcie_port_bus_register(void)
int pcie_port_bus_register(void)
{
return bus_register(&pcie_port_bus_type);
}
Expand Down

0 comments on commit 832f34d

Please sign in to comment.