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

+9 -9
+3 -3
MAINTAINERS
··· 532 S: Maintained 533 534 ASUS ACPI EXTRAS DRIVER 535 P: Karol Kozimor 536 M: sziwan@users.sourceforge.net 537 - P: Julien Lerouge 538 - M: julien.lerouge@free.fr 539 L: acpi4asus-user@lists.sourceforge.net 540 W: http://sourceforge.net/projects/acpi4asus 541 - W: http://julien.lerouge.free.fr 542 S: Maintained 543 544 ATA OVER ETHERNET DRIVER
··· 532 S: Maintained 533 534 ASUS ACPI EXTRAS DRIVER 535 + P: Corentin Chary 536 + M: corentincj@iksaif.net 537 P: Karol Kozimor 538 M: sziwan@users.sourceforge.net 539 L: acpi4asus-user@lists.sourceforge.net 540 W: http://sourceforge.net/projects/acpi4asus 541 + W: http://xf.iksaif.net/acpi4asus 542 S: Maintained 543 544 ATA OVER ETHERNET DRIVER
+1 -1
arch/i386/kernel/acpi/boot.c
··· 333 /* 334 * Parse Interrupt Source Override for the ACPI SCI 335 */ 336 - static void acpi_sci_ioapic_setup(u32 gsi, u16 polarity, u16 trigger) 337 { 338 if (trigger == 0) /* compatible SCI trigger is level */ 339 trigger = 3;
··· 333 /* 334 * Parse Interrupt Source Override for the ACPI SCI 335 */ 336 + static void __init acpi_sci_ioapic_setup(u32 gsi, u16 polarity, u16 trigger) 337 { 338 if (trigger == 0) /* compatible SCI trigger is level */ 339 trigger = 3;
+1 -1
drivers/acpi/ec.c
··· 424 425 snprintf(object_name, 8, "_Q%2.2X", value); 426 427 - printk(KERN_INFO PREFIX "evaluating %s\n", object_name); 428 429 acpi_evaluate_object(ec->handle, object_name, NULL, NULL); 430 }
··· 424 425 snprintf(object_name, 8, "_Q%2.2X", value); 426 427 + ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Evaluating %s", object_name)); 428 429 acpi_evaluate_object(ec->handle, object_name, NULL, NULL); 430 }
+1 -1
drivers/video/backlight/corgi_bl.c
··· 121 machinfo->limit_mask = -1; 122 123 corgi_backlight_device = backlight_device_register ("corgi-bl", 124 - NULL, &corgibl_data); 125 if (IS_ERR (corgi_backlight_device)) 126 return PTR_ERR (corgi_backlight_device); 127
··· 121 machinfo->limit_mask = -1; 122 123 corgi_backlight_device = backlight_device_register ("corgi-bl", 124 + &pdev->dev, NULL, &corgibl_data); 125 if (IS_ERR (corgi_backlight_device)) 126 return PTR_ERR (corgi_backlight_device); 127
+1 -1
drivers/video/backlight/hp680_bl.c
··· 105 static int __init hp680bl_probe(struct platform_device *dev) 106 { 107 hp680_backlight_device = backlight_device_register ("hp680-bl", 108 - NULL, &hp680bl_data); 109 if (IS_ERR (hp680_backlight_device)) 110 return PTR_ERR (hp680_backlight_device); 111
··· 105 static int __init hp680bl_probe(struct platform_device *dev) 106 { 107 hp680_backlight_device = backlight_device_register ("hp680-bl", 108 + &dev->dev, NULL, &hp680bl_data); 109 if (IS_ERR (hp680_backlight_device)) 110 return PTR_ERR (hp680_backlight_device); 111
+1 -1
drivers/video/backlight/locomolcd.c
··· 184 185 local_irq_restore(flags); 186 187 - locomolcd_bl_device = backlight_device_register("locomo-bl", NULL, &locomobl_data); 188 189 if (IS_ERR (locomolcd_bl_device)) 190 return PTR_ERR (locomolcd_bl_device);
··· 184 185 local_irq_restore(flags); 186 187 + locomolcd_bl_device = backlight_device_register("locomo-bl", &ldev->dev, NULL, &locomobl_data); 188 189 if (IS_ERR (locomolcd_bl_device)) 190 return PTR_ERR (locomolcd_bl_device);
+1 -1
include/acpi/acconfig.h
··· 105 106 /* Maximum object reference count (detects object deletion issues) */ 107 108 - #define ACPI_MAX_REFERENCE_COUNT 0x800 109 110 /* Size of cached memory mapping for system memory operation region */ 111
··· 105 106 /* Maximum object reference count (detects object deletion issues) */ 107 108 + #define ACPI_MAX_REFERENCE_COUNT 0x1000 109 110 /* Size of cached memory mapping for system memory operation region */ 111