aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/asm-alpha/pci.h2
-rw-r--r--include/linux/pci.h6
2 files changed, 2 insertions, 6 deletions
diff --git a/include/asm-alpha/pci.h b/include/asm-alpha/pci.h
index 4e115f368d5f..85aa1127c903 100644
--- a/include/asm-alpha/pci.h
+++ b/include/asm-alpha/pci.h
@@ -293,4 +293,6 @@ struct pci_dev *alpha_gendev_to_pci(struct device *dev);
293#define IOBASE_ROOT_BUS 5 293#define IOBASE_ROOT_BUS 5
294#define IOBASE_FROM_HOSE 0x10000 294#define IOBASE_FROM_HOSE 0x10000
295 295
296extern struct pci_dev *isa_bridge;
297
296#endif /* __ALPHA_PCI_H */ 298#endif /* __ALPHA_PCI_H */
diff --git a/include/linux/pci.h b/include/linux/pci.h
index cf2c8a35a1df..d69dfd7d0e0b 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -618,10 +618,6 @@ enum pci_dma_burst_strategy {
618 strategy_parameter byte boundaries */ 618 strategy_parameter byte boundaries */
619}; 619};
620 620
621#if defined(CONFIG_ISA) || defined(CONFIG_EISA)
622extern struct pci_dev *isa_bridge;
623#endif
624
625struct msix_entry { 621struct msix_entry {
626 u16 vector; /* kernel uses to write allocated vector */ 622 u16 vector; /* kernel uses to write allocated vector */
627 u16 entry; /* driver uses to specify entry, OS writes */ 623 u16 entry; /* driver uses to specify entry, OS writes */
@@ -729,8 +725,6 @@ static inline int pci_set_power_state(struct pci_dev *dev, pci_power_t state) {
729static inline pci_power_t pci_choose_state(struct pci_dev *dev, pm_message_t state) { return PCI_D0; } 725static inline pci_power_t pci_choose_state(struct pci_dev *dev, pm_message_t state) { return PCI_D0; }
730static inline int pci_enable_wake(struct pci_dev *dev, pci_power_t state, int enable) { return 0; } 726static inline int pci_enable_wake(struct pci_dev *dev, pci_power_t state, int enable) { return 0; }
731 727
732#define isa_bridge ((struct pci_dev *)NULL)
733
734#define pci_dma_burst_advice(pdev, strat, strategy_parameter) do { } while (0) 728#define pci_dma_burst_advice(pdev, strat, strategy_parameter) do { } while (0)
735 729
736static inline void pci_block_user_cfg_access(struct pci_dev *dev) { } 730static inline void pci_block_user_cfg_access(struct pci_dev *dev) { }