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

* '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

diff --git a/MAINTAINERS b/MAINTAINERS
index 7f6c051cac65faf2c06626d6370fcceaa038f74b..0f6d13bd4688fc6a11a471dba16e3a1401837765 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -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

diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c
index 094300b3a81fad123f347403434ff20f645cb5cc..cbcb2c27f48b8e796b87fc79b7f0fd3c92c5e81b 100644 (file)
--- a/arch/i386/kernel/acpi/boot.c
+++ b/arch/i386/kernel/acpi/boot.c
@@ -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;

diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 9c52d87d6f0439b2f50f1e519e2ecca289013efd..4144d5dd442e762a27e8c71b7bf430c66d35bdaa 100644 (file)
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -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);
 }

diff --git a/drivers/video/backlight/corgi_bl.c b/drivers/video/backlight/corgi_bl.c
index 61587ca2cdbb5f708f3d0f37babec91fa3153163..fde1d9518123b6b04a024184a023537379a7324f 100644 (file)
--- a/drivers/video/backlight/corgi_bl.c
+++ b/drivers/video/backlight/corgi_bl.c
@@ -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);
 

diff --git a/drivers/video/backlight/hp680_bl.c b/drivers/video/backlight/hp680_bl.c
index 1c569fb543ae80f6bef9d6954954398ae358a1c2..c07d8207fb549e1412b91a793f98e8b3d9719646 100644 (file)
--- a/drivers/video/backlight/hp680_bl.c
+++ b/drivers/video/backlight/hp680_bl.c
@@ -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);
 

diff --git a/drivers/video/backlight/locomolcd.c b/drivers/video/backlight/locomolcd.c
index 2d7905410b2ac61a11b1a9d83d0f59e42a6b86ba..fc812d96c31dfc5fae102db6512afc9592b409da 100644 (file)
--- a/drivers/video/backlight/locomolcd.c
+++ b/drivers/video/backlight/locomolcd.c
@@ -184,7 +184,7 @@ static int locomolcd_probe(struct locomo_dev *ldev)
 
        local_irq_restore(flags);
 
-       locomolcd_bl_device = backlight_device_register("locomo-bl", NULL, &locomobl_data);
+       locomolcd_bl_device = backlight_device_register("locomo-bl", &ldev->dev, NULL, &locomobl_data);
 
        if (IS_ERR (locomolcd_bl_device))
                return PTR_ERR (locomolcd_bl_device);

diff --git a/include/acpi/acconfig.h b/include/acpi/acconfig.h
index 9e6c23c360b2c0076688abc3ffe2c7bfca4d72f0..ebc1f697615a15a79cfdba299299668aacd1ad45 100644 (file)
--- a/include/acpi/acconfig.h
+++ b/include/acpi/acconfig.h
@@ -105,7 +105,7 @@
 
 /* Maximum object reference count (detects object deletion issues) */
 
-#define ACPI_MAX_REFERENCE_COUNT        0x800
+#define ACPI_MAX_REFERENCE_COUNT        0x1000
 
 /* Size of cached memory mapping for system memory operation region */