On 2010-11-10 3:20 AM, Arnaud Lacombe wrote: > Signed-off-by: Arnaud Lacombe <lacombar@xxxxxxxxx> > --- > include/linux/pm_qos_params.h | 7 +++---- > include/linux/tracepoint.h | 14 +++++++------- > include/net/net_namespace.h | 14 +++++++------- > include/trace/define_trace.h | 5 ----- > 4 files changed, 17 insertions(+), 23 deletions(-) > > diff --git a/include/linux/pm_qos_params.h b/include/linux/pm_qos_params.h > index e1f083c..8c69ab2 100644 > --- a/include/linux/pm_qos_params.h > +++ b/include/linux/pm_qos_params.h > @@ -1,8 +1,7 @@ > #include <linux/version.h> > > -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)) > -#include_next <linux/pm_qos_params.h> > -#else > +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)) > + > /* interface for the pm_qos_power infrastructure of the linux kernel. > * > * Mark Gross <mgross@xxxxxxxxxxxxxxx> > @@ -28,5 +27,5 @@ int pm_qos_requirement(int qos); > > int pm_qos_add_notifier(int qos, struct notifier_block *notifier); > int pm_qos_remove_notifier(int qos, struct notifier_block *notifier); > -#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)) */ > > +#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)) */ With #include_next gone, how would the compiler find the other header file for version >= 2.6.25? - Felix -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
