The patch titled bh1780gli-convert-to-dev-pm-ops-update has been added to the -mm tree. Its filename is bh1780gli-convert-to-dev-pm-ops-update.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: bh1780gli-convert-to-dev-pm-ops-update From: Shubhrajyoti D <shubhrajyoti@xxxxxx> Signed-off-by: Shubhrajyoti D <shubhrajyoti@xxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/misc/bh1780gli.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff -puN drivers/misc/bh1780gli.c~bh1780gli-convert-to-dev-pm-ops-update drivers/misc/bh1780gli.c --- a/drivers/misc/bh1780gli.c~bh1780gli-convert-to-dev-pm-ops-update +++ a/drivers/misc/bh1780gli.c @@ -235,6 +235,9 @@ static int bh1780_resume(struct device * return 0; } static SIMPLE_DEV_PM_OPS(bh1780_pm, bh1780_suspend, bh1780_resume); +#define BH1780_PMOPS (&bh1780_pm) +#else +#define BH1780_PMOPS NULL #endif /* CONFIG_PM */ static const struct i2c_device_id bh1780_id[] = { @@ -248,9 +251,7 @@ static struct i2c_driver bh1780_driver = .id_table = bh1780_id, .driver = { .name = "bh1780", -#ifdef CONFIG_PM - .pm = &bh1780_pm, -#endif + .pm = BH1780_PMOPS, }, }; _ Patches currently in -mm which might be from shubhrajyoti@xxxxxx are misc-bmp085-add-module_device_table.patch linux-next.patch bh1780gli-convert-to-dev-pm-ops.patch bh1780gli-convert-to-dev-pm-ops-update.patch drivers-misc-bmp085c-free-initmem-memory.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html