summaryrefslogtreecommitdiff
path: root/backport/compat/compat-2.6.28.c
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-08-24 16:28:59 +0200
committerLuis R. Rodriguez <mcgrof@do-not-panic.com>2013-08-27 12:02:30 -0700
commit168beb7a3dad933d29f8e0dabd37db8cf189a4c7 (patch)
treed72b21238060426c26ed4bff96664becd1848e99 /backport/compat/compat-2.6.28.c
parent551f46cb4472f03bea0df808ef892ea8eb49a2af (diff)
backports: do not depend on PCI functions when PCI is disabled in the kernel
This should prevent some compile errors when backports is used with a kernel without PCI support. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Diffstat (limited to 'backport/compat/compat-2.6.28.c')
-rw-r--r--backport/compat/compat-2.6.28.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/backport/compat/compat-2.6.28.c b/backport/compat/compat-2.6.28.c
index 2ff6b1ee..e38004f1 100644
--- a/backport/compat/compat-2.6.28.c
+++ b/backport/compat/compat-2.6.28.c
@@ -239,6 +239,7 @@ EXPORT_SYMBOL_GPL(usb_anchor_empty);
#endif /* CONFIG_USB */
#endif
+#ifdef CONFIG_PCI
void __iomem *pci_ioremap_bar(struct pci_dev *pdev, int bar)
{
/*
@@ -252,6 +253,7 @@ void __iomem *pci_ioremap_bar(struct pci_dev *pdev, int bar)
pci_resource_len(pdev, bar));
}
EXPORT_SYMBOL_GPL(pci_ioremap_bar);
+#endif
static unsigned long round_jiffies_common(unsigned long j, int cpu,
bool force_up)
@@ -442,6 +444,7 @@ int n_tty_ioctl_helper(struct tty_struct *tty, struct file *file,
}
EXPORT_SYMBOL_GPL(n_tty_ioctl_helper);
+#ifdef CONFIG_PCI
/**
* pci_wake_from_d3 - enable/disable device to wake up from D3_hot or D3_cold
* @dev: PCI device to prepare
@@ -463,4 +466,5 @@ int pci_wake_from_d3(struct pci_dev *dev, bool enable)
pci_enable_wake(dev, PCI_D3hot, enable);
}
EXPORT_SYMBOL_GPL(pci_wake_from_d3);
+#endif