The patch titled
hwmon: fix lis3-spi for CONFIG_PM=n
has been removed from the -mm tree. Its filename was
lis3-add-power-management-functions-fix.patch
This patch was dropped because it was folded into lis3-add-power-management-functions.patch
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: hwmon: fix lis3-spi for CONFIG_PM=n
From: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Fix build error when CONFIG_PM=n:
The suspend & resume function names are incorrect for the PM=n case.
Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Cc: Daniel Mack <daniel@xxxxxxxx>
Cc: Pavel Machek <pavel@xxxxxx>
Cc: Eric Piel <eric.piel@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/hwmon/lis3lv02d_spi.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -puN drivers/hwmon/lis3lv02d_spi.c~lis3-add-power-management-functions-fix drivers/hwmon/lis3lv02d_spi.c
--- a/drivers/hwmon/lis3lv02d_spi.c~lis3-add-power-management-functions-fix
+++ a/drivers/hwmon/lis3lv02d_spi.c
@@ -109,8 +109,8 @@ static int lis3lv02d_spi_resume(struct s
}
#else
-#define lis3_spi_suspend NULL
-#define lis3_spi_resume NULL
+#define lis3lv02d_spi_suspend NULL
+#define lis3lv02d_spi_resume NULL
#endif
static struct spi_driver lis302dl_spi_driver = {
_
Patches currently in -mm which might be from randy.dunlap@xxxxxxxxxx are
origin.patch
mm-make-swap-token-dummies-static-inlines.patch
page_alloc-fix-kernel-doc-warning.patch
ksm-add-some-documentation.patch
flex_array-add-missing-kerneldoc-annotations.patch
lis3-add-power-management-functions.patch
lis3-add-power-management-functions-fix.patch
procfs-provide-stack-information-for-threads-v011-fix.patch
kcore-register-vmemmap-range-fix.patch
spih-add-missing-kernel-doc-for-struct-spi_master.patch
gpiolib-allow-exported-gpio-nodes-to-be-named-using-sysfs-links-update-fix.patch
doc-filesystems-remove-smount-program.patch
doc-filesystems-more-mount-cleanups.patch
documentation-update-stale-definition-of-file-nr-in-fstxt.patch
includecheck-fix-documentation-cfag12864b-examplec.patch
docs-fix-various-documentation-paths-in-header-files.patch
reiser4-export-remove_from_page_cache-fix.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
