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

Commit a4144e45 authored by Len Brown's avatar Len Brown
Browse files

Pull asus into test branch

parents eee3c859 8def05fa

MAINTAINERS

+8 −0
Original line number Original line Diff line number Diff line
@@ -584,6 +584,14 @@ W: http://sourceforge.net/projects/acpi4asus 
W:	http://xf.iksaif.net/acpi4asus

W:	http://xf.iksaif.net/acpi4asus

S:	Maintained

S:	Maintained





ASUS LAPTOP EXTRAS DRIVER

P:	Corentin Chary

M:	corentincj@iksaif.net

L:	acpi4asus-user@lists.sourceforge.net

W:	http://sourceforge.net/projects/acpi4asus

W:	http://xf.iksaif.net/acpi4asus

S:	Maintained



ATA OVER ETHERNET DRIVER

ATA OVER ETHERNET DRIVER

P:	Ed L. Cashin

P:	Ed L. Cashin

M:	ecashin@coraid.com

M:	ecashin@coraid.com

drivers/acpi/Kconfig

+8 −5
Original line number Original line Diff line number Diff line
@@ -218,7 +218,10 @@ config ACPI_ASUS 
          If you have an ACPI-compatible ASUS laptop, say Y or M here. This

          If you have an ACPI-compatible ASUS laptop, say Y or M here. This

          driver is still under development, so if your laptop is unsupported or

          driver is still under development, so if your laptop is unsupported or

          something works not quite as expected, please use the mailing list

          something works not quite as expected, please use the mailing list

          available on the above page (acpi4asus-user@lists.sourceforge.net)

          available on the above page (acpi4asus-user@lists.sourceforge.net).



	  NOTE: This driver is deprecated and will probably be removed soon,

	  use asus-laptop instead.





config ACPI_IBM

config ACPI_IBM

	tristate "IBM ThinkPad Laptop Extras"

	tristate "IBM ThinkPad Laptop Extras"

drivers/misc/Kconfig

+19 −0
Original line number Original line Diff line number Diff line
@@ -69,6 +69,25 @@ config TIFM_7XX1 
          To compile this driver as a module, choose M here: the module will

          To compile this driver as a module, choose M here: the module will

	  be called tifm_7xx1.

	  be called tifm_7xx1.





config ASUS_LAPTOP

        tristate "Asus Laptop Extras (EXPERIMENTAL)"

        depends on X86

        depends on ACPI

	depends on EXPERIMENTAL && !ACPI_ASUS

	depends on LEDS_CLASS

	depends on BACKLIGHT_CLASS_DEVICE

        ---help---

	  This is the new Linux driver for Asus laptops. It may also support some

	  MEDION, JVC or VICTOR laptops. It makes all the extra buttons generate

	  standard ACPI events that go through /proc/acpi/events. It also adds

	  support for video output switching, LCD backlight control, Bluetooth and

	  Wlan control, and most importantly, allows you to blink those fancy LEDs.



	  For more information and a userspace daemon for handling the extra

	  buttons see <http://acpi4asus.sf.net/>.



	  If you have an ACPI-compatible ASUS laptop, say Y or M here.



config MSI_LAPTOP

config MSI_LAPTOP

        tristate "MSI Laptop Extras"

        tristate "MSI Laptop Extras"

        depends on X86

        depends on X86

drivers/misc/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -6,6 +6,7 @@ obj- := misc.o # Dummy rule to force built-in.o to be made 
obj-$(CONFIG_IBM_ASM)		+= ibmasm/

obj-$(CONFIG_IBM_ASM)		+= ibmasm/

obj-$(CONFIG_HDPU_FEATURES)	+= hdpuftrs/

obj-$(CONFIG_HDPU_FEATURES)	+= hdpuftrs/

obj-$(CONFIG_MSI_LAPTOP)     += msi-laptop.o

obj-$(CONFIG_MSI_LAPTOP)     += msi-laptop.o

obj-$(CONFIG_ASUS_LAPTOP)     += asus-laptop.o

obj-$(CONFIG_LKDTM)		+= lkdtm.o

obj-$(CONFIG_LKDTM)		+= lkdtm.o

obj-$(CONFIG_TIFM_CORE)       	+= tifm_core.o

obj-$(CONFIG_TIFM_CORE)       	+= tifm_core.o

obj-$(CONFIG_TIFM_7XX1)       	+= tifm_7xx1.o

obj-$(CONFIG_TIFM_7XX1)       	+= tifm_7xx1.o