From: Johannes Berg <johannes.berg@xxxxxxxxx> Just use #else instead of two conditionals. Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx> --- backport/backport-include/linux/pci-aspm.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/backport/backport-include/linux/pci-aspm.h b/backport/backport-include/linux/pci-aspm.h index 367112e..d072677 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 -- 1.8.4.rc3 -- To unsubscribe from this list: send the line "unsubscribe backports" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
