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

Commit d1398a6f 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:
  ACPI: asus_acpi: new MAINTAINER
  ACPI: fix section mis-match build warning
  ACPI: increase ACPI_MAX_REFERENCE_COUNT for larger systems
  ACPI: EC: move verbose printk to debug build only
  backlight: fix backlight_device_register compile failures
parents 69e4d948 0b67d946

MAINTAINERS

+3 −3
Original line number Diff line number Diff line
@@ -532,13 +532,13 @@ L: netdev@vger.kernel.org 
S:	Maintained



ASUS ACPI EXTRAS DRIVER

P:	Corentin Chary

M:	corentincj@iksaif.net

P:	Karol Kozimor

M:	sziwan@users.sourceforge.net

P:	Julien Lerouge

M:	julien.lerouge@free.fr

L:	acpi4asus-user@lists.sourceforge.net

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

W:	http://julien.lerouge.free.fr

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

S:	Maintained



ATA OVER ETHERNET DRIVER

arch/i386/kernel/acpi/boot.c

+1 −1
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ acpi_parse_ioapic(acpi_table_entry_header * header, const unsigned long end) 
/*

 * Parse Interrupt Source Override for the ACPI SCI

 */

static void acpi_sci_ioapic_setup(u32 gsi, u16 polarity, u16 trigger)

static void __init acpi_sci_ioapic_setup(u32 gsi, u16 polarity, u16 trigger)

{

	if (trigger == 0)	/* compatible SCI trigger is level */

		trigger = 3;

drivers/acpi/ec.c

+1 −1
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ static void acpi_ec_gpe_query(void *ec_cxt) 


	snprintf(object_name, 8, "_Q%2.2X", value);



	printk(KERN_INFO PREFIX "evaluating %s\n", object_name);

	ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Evaluating %s", object_name));



	acpi_evaluate_object(ec->handle, object_name, NULL, NULL);

}

drivers/video/backlight/corgi_bl.c

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ static int corgibl_probe(struct platform_device *pdev) 
		machinfo->limit_mask = -1;



	corgi_backlight_device = backlight_device_register ("corgi-bl",

		NULL, &corgibl_data);

		&pdev->dev, NULL, &corgibl_data);

	if (IS_ERR (corgi_backlight_device))

		return PTR_ERR (corgi_backlight_device);

drivers/video/backlight/hp680_bl.c

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ static struct backlight_properties hp680bl_data = { 
static int __init hp680bl_probe(struct platform_device *dev)

{

	hp680_backlight_device = backlight_device_register ("hp680-bl",

		NULL, &hp680bl_data);

		&dev->dev, NULL, &hp680bl_data);

	if (IS_ERR (hp680_backlight_device))

		return PTR_ERR (hp680_backlight_device);