diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2012-02-24 14:25:33 -0800 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2012-02-24 14:25:33 -0800 |
| commit | ecd58d667a6ac4350d2f67b9accaadf575bae4b0 (patch) | |
| tree | 5209771a0a1f61820171e444d3e4a580ecf3955f /arch/powerpc/include/asm/ppc-pci.h | |
| parent | b07f2ebc109b607789f648dedcff4b125f9afec6 (diff) | |
| parent | fb127cb9de791d62fb393d6e65fa9869bddd2460 (diff) | |
Merge branch 'pci-next+probe_only+bus2res-fb127cb' of git://github.com/bjorn-helgaas/linux into linux-next
Diffstat (limited to 'arch/powerpc/include/asm/ppc-pci.h')
| -rw-r--r-- | arch/powerpc/include/asm/ppc-pci.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/powerpc/include/asm/ppc-pci.h b/arch/powerpc/include/asm/ppc-pci.h index 43268f15004e..f4f7ad89c5a8 100644 --- a/arch/powerpc/include/asm/ppc-pci.h +++ b/arch/powerpc/include/asm/ppc-pci.h @@ -45,8 +45,6 @@ extern void init_pci_config_tokens (void); extern unsigned long get_phb_buid (struct device_node *); extern int rtas_setup_phb(struct pci_controller *phb); -extern unsigned long pci_probe_only; - /* ---- EEH internal-use-only related routines ---- */ #ifdef CONFIG_EEH |