On Friday, May 31, 2013 3:06 PM, Yijing Wang wrote: > > Fix build error for il_pm_ops if CONFIG_PM is set > but CONFIG_PM_SLEEP is not set. > > ERROR: "il_pm_ops" [drivers/net/wireless/iwlegacy/iwl4965.ko] undefined! > ERROR: "il_pm_ops" [drivers/net/wireless/iwlegacy/iwl3945.ko] undefined! > make[1]: *** [__modpost] Error 1 > make: *** [modules] Error 2 > > Signed-off-by: Yijing Wang <wangyij...@huawei.com> > Cc: Stanislaw Gruszka <sgrus...@redhat.com> > Cc: "John W. Linville" <linvi...@tuxdriver.com> > Cc: net...@vger.kernel.org > Cc: linux-wirel...@vger.kernel.org > Cc: Jingoo Han <jg1....@samsung.com>
It looks good. As you did, 'struct dev_pm_ops il_pm_ops' should be protected by CONFIG_PM_SLEEP. Acked-by: Jingoo Han <jg1....@samsung.com> Best regards, Jingoo Han > --- > drivers/net/wireless/iwlegacy/common.h | 6 +++--- > 1 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/wireless/iwlegacy/common.h > b/drivers/net/wireless/iwlegacy/common.h > index f8246f2..4caaf52 100644 > --- a/drivers/net/wireless/iwlegacy/common.h > +++ b/drivers/net/wireless/iwlegacy/common.h > @@ -1832,16 +1832,16 @@ u32 il_usecs_to_beacons(struct il_priv *il, u32 usec, > u32 beacon_interval); > __le32 il_add_beacon_time(struct il_priv *il, u32 base, u32 addon, > u32 beacon_interval); > > -#ifdef CONFIG_PM > +#ifdef CONFIG_PM_SLEEP > extern const struct dev_pm_ops il_pm_ops; > > #define IL_LEGACY_PM_OPS (&il_pm_ops) > > -#else /* !CONFIG_PM */ > +#else /* !CONFIG_PM_SLEEP */ > > #define IL_LEGACY_PM_OPS NULL > > -#endif /* !CONFIG_PM */ > +#endif /* !CONFIG_PM_SLEEP */ > > /***************************************************** > * Error Handling Debugging > -- > 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
