diff options
| author | Tejun Heo <tj@kernel.org> | 2010-02-02 00:38:15 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2010-02-02 00:38:15 -0500 |
| commit | ab386128f20c44c458a90039ab1bdc265ac474c9 (patch) | |
| tree | 2ad188744922b1bb951fd10ff50dc04c83acce22 /arch/mn10300/unit-asb2305/pci-asb2305.h | |
| parent | dbfc196a3cc1a2514ad0737a82f764de23bd65e6 (diff) | |
| parent | ab658321f32770b903a4426e2a6fae0392757755 (diff) | |
Merge branch 'master' into percpu
Diffstat (limited to 'arch/mn10300/unit-asb2305/pci-asb2305.h')
| -rw-r--r-- | arch/mn10300/unit-asb2305/pci-asb2305.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mn10300/unit-asb2305/pci-asb2305.h b/arch/mn10300/unit-asb2305/pci-asb2305.h index 9763d1ce343a..c3fa294b6e28 100644 --- a/arch/mn10300/unit-asb2305/pci-asb2305.h +++ b/arch/mn10300/unit-asb2305/pci-asb2305.h | |||
| @@ -34,7 +34,6 @@ extern unsigned int pci_probe; | |||
| 34 | extern unsigned int pcibios_max_latency; | 34 | extern unsigned int pcibios_max_latency; |
| 35 | 35 | ||
| 36 | extern void pcibios_resource_survey(void); | 36 | extern void pcibios_resource_survey(void); |
| 37 | extern int pcibios_enable_resources(struct pci_dev *dev, int mask); | ||
| 38 | 37 | ||
| 39 | /* pci.c */ | 38 | /* pci.c */ |
| 40 | 39 | ||