aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2007-01-06 21:48:41 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2007-02-07 15:50:06 -0800
commit8255cf35d503db7c1b26ae53b6b7f23ada82316f (patch)
treebe008a902beb853782622a2cc116f1f9c68ac042
parent1863100a0244828f78e5e47b22b93ca912e80963 (diff)
downloadkernel_samsung_crespo-8255cf35d503db7c1b26ae53b6b7f23ada82316f.zip
kernel_samsung_crespo-8255cf35d503db7c1b26ae53b6b7f23ada82316f.tar.gz
kernel_samsung_crespo-8255cf35d503db7c1b26ae53b6b7f23ada82316f.tar.bz2
PCI: make isa_bridge Alpha-only
Since isa_bridge is neither assigned any value !NULL nor used on !Alpha, there's no reason for providing it. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--arch/alpha/kernel/pci.c4
-rw-r--r--drivers/pci/pci.c6
-rw-r--r--include/asm-alpha/pci.h2
-rw-r--r--include/linux/pci.h6
4 files changed, 6 insertions, 12 deletions
diff --git a/arch/alpha/kernel/pci.c b/arch/alpha/kernel/pci.c
index 3c10b9a..ab642a4 100644
--- a/arch/alpha/kernel/pci.c
+++ b/arch/alpha/kernel/pci.c
@@ -575,3 +575,7 @@ void pci_iounmap(struct pci_dev *dev, void __iomem * addr)
EXPORT_SYMBOL(pci_iomap);
EXPORT_SYMBOL(pci_iounmap);
+
+/* FIXME: Some boxes have multiple ISA bridges! */
+struct pci_dev *isa_bridge;
+EXPORT_SYMBOL(isa_bridge);
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index caeeacc..e91dcc0 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -1224,12 +1224,6 @@ early_param("pci", pci_setup);
device_initcall(pci_init);
-#if defined(CONFIG_ISA) || defined(CONFIG_EISA)
-/* FIXME: Some boxes have multiple ISA bridges! */
-struct pci_dev *isa_bridge;
-EXPORT_SYMBOL(isa_bridge);
-#endif
-
EXPORT_SYMBOL_GPL(pci_restore_bars);
EXPORT_SYMBOL(pci_enable_device_bars);
EXPORT_SYMBOL(pci_enable_device);
diff --git a/include/asm-alpha/pci.h b/include/asm-alpha/pci.h
index 4e115f3..85aa112 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);
#define IOBASE_ROOT_BUS 5
#define IOBASE_FROM_HOSE 0x10000
+extern struct pci_dev *isa_bridge;
+
#endif /* __ALPHA_PCI_H */
diff --git a/include/linux/pci.h b/include/linux/pci.h
index cf2c8a3..d69dfd7 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -618,10 +618,6 @@ enum pci_dma_burst_strategy {
strategy_parameter byte boundaries */
};
-#if defined(CONFIG_ISA) || defined(CONFIG_EISA)
-extern struct pci_dev *isa_bridge;
-#endif
-
struct msix_entry {
u16 vector; /* kernel uses to write allocated vector */
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) {
static inline pci_power_t pci_choose_state(struct pci_dev *dev, pm_message_t state) { return PCI_D0; }
static inline int pci_enable_wake(struct pci_dev *dev, pci_power_t state, int enable) { return 0; }
-#define isa_bridge ((struct pci_dev *)NULL)
-
#define pci_dma_burst_advice(pdev, strat, strategy_parameter) do { } while (0)
static inline void pci_block_user_cfg_access(struct pci_dev *dev) { }