Commit d7197a5a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 platform updates from Ingo Molnar:
 "Two minor OLPC changes: a build fix and a new quirk"

* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/olpc: Fix build error with CONFIG_MFD_CS5535=m
  x86/olpc: Indicate that legacy PC XO-1 platform should not register RTC
parents f682a792 fa112cf1

arch/x86/Kconfig

+1 −2
Original line number Original line Diff line number Diff line
@@ -2749,8 +2749,7 @@ config OLPC 




config OLPC_XO1_PM

config OLPC_XO1_PM

	bool "OLPC XO-1 Power Management"

	bool "OLPC XO-1 Power Management"

	depends on OLPC && MFD_CS5535 && PM_SLEEP

	depends on OLPC && MFD_CS5535=y && PM_SLEEP

	select MFD_CORE

	---help---

	---help---

	  Add support for poweroff and suspend of the OLPC XO-1 laptop.

	  Add support for poweroff and suspend of the OLPC XO-1 laptop.

arch/x86/platform/olpc/olpc-xo1-rtc.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ 




#include <asm/msr.h>

#include <asm/msr.h>

#include <asm/olpc.h>

#include <asm/olpc.h>

#include <asm/x86_init.h>





static void rtc_wake_on(struct device *dev)

static void rtc_wake_on(struct device *dev)

{

{
@@ -75,6 +76,8 @@ static int __init xo1_rtc_init(void) 
	if (r)

	if (r)

		return r;

		return r;





	x86_platform.legacy.rtc = 0;



	device_init_wakeup(&xo1_rtc_device.dev, 1);

	device_init_wakeup(&xo1_rtc_device.dev, 1);

	return 0;

	return 0;

}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE