Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 853298bc authored by Alexey Starikovskiy's avatar Alexey Starikovskiy Committed by Len Brown
Browse files

ACPI: CONFIG_ACPI_SLEEP=n power off regression in 2.6.23-rc8 (NOT in rc7) 



Signed-off-by: default avatarAlexey Starikovskiy <astarikovskiy@suse.de>
Acked-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 2f3f2226

drivers/acpi/sleep/Makefile

+1 −1
Original line number Diff line number Diff line 
obj-y					:= wakeup.o

obj-$(CONFIG_ACPI_SLEEP)		+= main.o

obj-y					+= main.o

obj-$(CONFIG_ACPI_SLEEP)		+= proc.o



EXTRA_CFLAGS += $(ACPI_CFLAGS)

drivers/acpi/sleep/main.c

+4 −0
Original line number Diff line number Diff line
@@ -24,7 +24,9 @@ 


u8 sleep_states[ACPI_S_STATE_COUNT];



#ifdef CONFIG_PM_SLEEP

static u32 acpi_target_sleep_state = ACPI_STATE_S0;

#endif



int acpi_sleep_prepare(u32 acpi_state)

{
@@ -299,6 +301,7 @@ int acpi_suspend(u32 acpi_state) 
	return -EINVAL;

}



#ifdef CONFIG_PM_SLEEP

/**

 *	acpi_pm_device_sleep_state - return preferred power state of ACPI device

 *		in the system sleep state given by %acpi_target_sleep_state
@@ -373,6 +376,7 @@ int acpi_pm_device_sleep_state(struct device *dev, int wake, int *d_min_p) 
		*d_min_p = d_min;

	return d_max;

}

#endif



static void acpi_power_off_prepare(void)

{

include/acpi/acpi_drivers.h

+0 −4
Original line number Diff line number Diff line
@@ -147,10 +147,6 @@ static inline void unregister_hotplug_dock_device(acpi_handle handle) 
/*--------------------------------------------------------------------------

                                  Suspend/Resume

  -------------------------------------------------------------------------- */

#ifdef CONFIG_ACPI_SLEEP

extern int acpi_sleep_init(void);

#else

static inline int acpi_sleep_init(void) { return 0; }

#endif



#endif /*__ACPI_DRIVERS_H__*/