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

Commit 006b20fe authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'perf/urgent' into perf/core 



Merge reason: We want to apply a dependent patch.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 5f29805a d949750f

Documentation/ABI/testing/sysfs-platform-asus-laptop

+15 −1
Original line number Diff line number Diff line
@@ -47,6 +47,20 @@ Date: January 2007 
KernelVersion:	2.6.20

Contact:	"Corentin Chary" <corentincj@iksaif.net>

Description:

		Control the bluetooth device. 1 means on, 0 means off.

		Control the wlan device. 1 means on, 0 means off.

		This may control the led, the device or both.

Users:		Lapsus



What:		/sys/devices/platform/asus_laptop/wimax

Date:		October 2010

KernelVersion:	2.6.37

Contact:	"Corentin Chary" <corentincj@iksaif.net>

Description:

		Control the wimax device. 1 means on, 0 means off.



What:		/sys/devices/platform/asus_laptop/wwan

Date:		October 2010

KernelVersion:	2.6.37

Contact:	"Corentin Chary" <corentincj@iksaif.net>

Description:

		Control the wwan (3G) device. 1 means on, 0 means off.

Documentation/ABI/testing/sysfs-platform-eeepc-wmi

0 → 100644
+10 −0
Original line number Diff line number Diff line 
What:		/sys/devices/platform/eeepc-wmi/cpufv

Date:		Oct 2010

KernelVersion:	2.6.37

Contact:	"Corentin Chary" <corentincj@iksaif.net>

Description:

		Change CPU clock configuration (write-only).

		There are three available clock configuration:

		    * 0 -> Super Performance Mode

		    * 1 -> High Performance Mode

		    * 2 -> Power Saving Mode

arch/arm/mach-s3c2412/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ config CPU_S3C2412 
config CPU_S3C2412_ONLY

	bool

	depends on ARCH_S3C2410 && !CPU_S3C2400 && !CPU_S3C2410 && \

		   !CPU_2416 && !CPU_S3C2440 && !CPU_S3C2442 && \

		   !CPU_S3C2416 && !CPU_S3C2440 && !CPU_S3C2442 && \

		   !CPU_S3C2443 && CPU_S3C2412

	default y if CPU_S3C2412

arch/arm/mach-s3c2416/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -35,9 +35,12 @@ menu "S3C2416 Machines" 
config MACH_SMDK2416

	bool "SMDK2416"

	select CPU_S3C2416

	select MACH_SMDK

	select S3C_DEV_FB

	select S3C_DEV_HSMMC

	select S3C_DEV_HSMMC1

	select S3C_DEV_NAND

	select S3C_DEV_USB_HOST

	select S3C2416_PM if PM

	help

	  Say Y here if you are using an SMDK2416

arch/arm/mach-s3c2440/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ config CPU_S3C2440 
config CPU_S3C2442

	bool

	select CPU_ARM920T

	select S3C_GPIO_PULL_DOWN

	select S3C2410_CLOCK

	select S3C2410_GPIO

	select S3C2410_PM if PM
@@ -178,6 +179,9 @@ config MACH_MINI2440 
	bool "MINI2440 development board"

	select CPU_S3C2440

	select EEPROM_AT24

	select NEW_LEDS

	select LEDS_CLASS

	select LEDS_TRIGGER

	select LEDS_TRIGGER_BACKLIGHT

	select S3C_DEV_NAND

	select S3C_DEV_USB_HOST