From: Johannes Berg <johannes.berg@intel.com>
Date: Tue, 27 Aug 2013 19:01:00 +0000 (+0200)
Subject: backport: simplify #ifdefs in pci-aspm.h
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b9aeaa7676bf67d06172c7db40b62d1cfc702933;p=openwrt%2Fstaging%2Fblogic.git

backport: simplify #ifdefs in pci-aspm.h

Just use #else instead of two conditionals.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
---

diff --git a/backport/backport-include/linux/pci-aspm.h b/backport/backport-include/linux/pci-aspm.h
index 367112ef3cc6..d0726776fb1f 100644
--- a/backport/backport-include/linux/pci-aspm.h
+++ b/backport/backport-include/linux/pci-aspm.h
@@ -1,10 +1,8 @@
 #include <linux/version.h>
 
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,25))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26))
 #include_next <linux/pci-aspm.h>
-#endif /* (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,25)) */
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)
+#else
 #define PCIE_LINK_STATE_L0S	1
 #define PCIE_LINK_STATE_L1	2
 #define PCIE_LINK_STATE_CLKPM	4