From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Fri, 16 Jan 2009 20:50:00 +0000 (+0100)
Subject: Fix for kernel 2.6.28. pci_ioremap_bar is defined in include/linux/pci.h
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=54f8b5601a0ac8f0ce853fcf813b28302e9f7750;p=openwrt%2Fstaging%2Fblogic.git

Fix for kernel 2.6.28. pci_ioremap_bar is defined in include/linux/pci.h
---

diff --git a/compat/compat.c b/compat/compat.c
index a3d44d700331..585c0706b79e 100644
--- a/compat/compat.c
+++ b/compat/compat.c
@@ -15,12 +15,6 @@
 
 /* 2.6.27 compat code goes here */
 
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28) */
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29))
-
-/* 2.6.28 compat code goes here */
-
 void __iomem *pci_ioremap_bar(struct pci_dev *pdev, int bar)
 {
 	/*
@@ -35,5 +29,11 @@ void __iomem *pci_ioremap_bar(struct pci_dev *pdev, int bar)
 }
 EXPORT_SYMBOL_GPL(pci_ioremap_bar);
 
+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28) */
+
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29))
+
+/* 2.6.28 compat code goes here */
+
 #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29) */
 
diff --git a/compat/compat.h b/compat/compat.h
index 876c318c58cb..1165f2837ba2 100644
--- a/compat/compat.h
+++ b/compat/compat.h
@@ -11,14 +11,15 @@
 #ifndef ETH_P_PAE
 #define ETH_P_PAE 0x888E      /* Port Access Entity (IEEE 802.1X) */
 #endif
-#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)) */
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29))
 
 #include <linux/pci.h>
 
 void __iomem *pci_ioremap_bar(struct pci_dev *pdev, int bar);
 
+#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)) */
+
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29))
+
 #endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)) */
 
 #endif /* LINUX_26_COMPAT_H */