The patch titled acpi: fix build with CONFIG_PM_SLEEP=n has been added to the -mm tree. Its filename is acpi-fix-build-with-config_pm_sleep=n.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://www.zip.com.au/~akpm/linux/patches/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: acpi: fix build with CONFIG_PM_SLEEP=n From: David Howells <dhowells@xxxxxxxxxx> Fix acpi_pm_device_sleep_wake() by providing a stub for CONFIG_PM_SLEEP=n. Signed-off-by: David Howells <dhowells@xxxxxxxxxx> Cc: "Rafael J. Wysocki" <rjw@xxxxxxx> Cc: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx> Cc: Len Brown <lenb@xxxxxxxxxx> Cc: Andi Kleen <andi@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/acpi/acpi_bus.h | 4 ++++ 1 file changed, 4 insertions(+) diff -puN include/acpi/acpi_bus.h~acpi-fix-build-with-config_pm_sleep=n include/acpi/acpi_bus.h --- a/include/acpi/acpi_bus.h~acpi-fix-build-with-config_pm_sleep=n +++ a/include/acpi/acpi_bus.h @@ -384,6 +384,10 @@ static inline int acpi_pm_device_sleep_s *p = ACPI_STATE_D0; return ACPI_STATE_D3; } +static inline int acpi_pm_device_sleep_wake(struct device *dev, bool enable) +{ + return -ENODEV; +} #endif /* !CONFIG_PM_SLEEP */ #endif /* CONFIG_ACPI */ _ Patches currently in -mm which might be from dhowells@xxxxxxxxxx are linux-next.patch acpi-fix-a-cast-of-a-32-bit-int-to-a-pointer.patch acpi-fix-build-with-config_pm_sleep=n.patch calgary-fix-a-comparison-warning-the-pci-calgary-64-driver.patch alsa-fix-a-const-pointer-usage-warning-in-the-digigram-pcxhr-soundcard-driver.patch alsa-fix-a-const-pointer-usage-warning-in-the-digigram-mixart-soundcard-driver.patch cifs-fix-range-check.patch sis-drm-fix-the-memory-allocator-if-the-sis-fb-is-built-as-a-module.patch sis-drm-fix-a-pointer-cast-warning.patch ivtv-framebuffer-driver-fix-pointer-cast-warnings.patch drx397xd-demodulator-driver-fix-a-const-pointer-assignment.patch mtd-fix-const-assignment-in-the-command-line-partitioning-driver.patch atm-fix-const-assignment-discard-warnings-in-the-atm-networking-driver.patch atm-fix-direct-casts-of-pointers-to-u32-in-the-interphase-driver.patch hysdn-remove-the-packed-attribute-from-poftimstamp_tag.patch git-unionfs.patch xfs-fix-disabled-xfs-posix-acl-handling.patch mn10300-move-sg_dma_addresslen-to-asm-scatterlisth.patch inflate-refactor-inflate-malloc-code.patch inflate-refactor-inflate-malloc-code-checkpatch-fixes.patch pnpacpi-fix-pnpacpi_parse_irq_options-test-against-pnp_irq_nr.patch include-asm-ptraceh-userspace-headers-cleanup.patch sdio-fix-break-control-to-now-return-success-or-an-error.patch ip2-fix-iielliscleanup-as-it-is-static-but-not-always-used.patch fix-a-const-assignment-in-moxa_load_fw.patch frv-use-the-common-ascii-hex-helpers.patch mn10300-use-the-common-ascii-hex-helpers.patch mutex-subsystem-synchro-test-module.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