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

Commit 332edc2f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
  staging: pcc_acpi: delete obsolete driver
parents f8aea200 f81db820

drivers/staging/Kconfig

+0 −2
Original line number Original line Diff line number Diff line
@@ -43,8 +43,6 @@ source "drivers/staging/echo/Kconfig" 




source "drivers/staging/at76_usb/Kconfig"

source "drivers/staging/at76_usb/Kconfig"





source "drivers/staging/pcc-acpi/Kconfig"



source "drivers/staging/poch/Kconfig"

source "drivers/staging/poch/Kconfig"





endif # STAGING
 
endif # STAGING

drivers/staging/Makefile

+0 −1
Original line number Original line Diff line number Diff line
@@ -13,5 +13,4 @@ obj-$(CONFIG_W35UND) += winbond/ 
obj-$(CONFIG_PRISM2_USB)	+= wlan-ng/

obj-$(CONFIG_PRISM2_USB)	+= wlan-ng/

obj-$(CONFIG_ECHO)		+= echo/

obj-$(CONFIG_ECHO)		+= echo/

obj-$(CONFIG_USB_ATMEL)		+= at76_usb/

obj-$(CONFIG_USB_ATMEL)		+= at76_usb/

obj-$(CONFIG_PCC_ACPI)		+= pcc-acpi/

obj-$(CONFIG_POCH)		+= poch/
 
obj-$(CONFIG_POCH)		+= poch/

drivers/staging/pcc-acpi/Kconfig

deleted100644 → 0
+0 −11
Original line number Original line Diff line number Diff line 
config PCC_ACPI

	tristate "Panasonic ACPI Hotkey support"

	depends on ACPI

	default n

	---help---

	  This driver provides support for Panasonic hotkeys through the

	  ACPI interface.  This works for the Panasonic R1 (N variant),

	  R2, R3, T2, W2, and Y2 laptops.



	  To compile this driver as a module, choose M here. The module

	  will be called pcc-acpi.

drivers/staging/pcc-acpi/Makefile

deleted100644 → 0
+0 −1
Original line number Original line Diff line number Diff line 
obj-$(CONFIG_PCC_ACPI)		+= pcc-acpi.o

drivers/staging/pcc-acpi/TODO

deleted100644 → 0
+0 −7
Original line number Original line Diff line number Diff line 
TODO:

	- Lindent fixes

	- checkpatch.pl fixes

	- verify that the acpi interface is correct

	- remove /proc dependancy if needed (not sure yet.)



Please send any patches for this driver to Greg Kroah-Hartman <greg@kroah.com>