diff options
author | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-04 08:55:57 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-04 08:55:57 -0800 |
commit | d1398a6ff503a849f3c123bc5f0fdff383a1b6ec (patch) | |
tree | 55f305f0170e667d2f1719be257ec8cf3ef7c6e6 | |
parent | 69e4d94818cabf44d845b9f4b46d88de6e518dcf (diff) | |
parent | 0b67d94659a72734584a40b5e113e9261f97ae8c (diff) | |
download | kernel_samsung_smdk4412-d1398a6ff503a849f3c123bc5f0fdff383a1b6ec.zip kernel_samsung_smdk4412-d1398a6ff503a849f3c123bc5f0fdff383a1b6ec.tar.gz kernel_samsung_smdk4412-d1398a6ff503a849f3c123bc5f0fdff383a1b6ec.tar.bz2 |
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
-rw-r--r-- | MAINTAINERS | 6 | ||||
-rw-r--r-- | arch/i386/kernel/acpi/boot.c | 2 | ||||
-rw-r--r-- | drivers/acpi/ec.c | 2 | ||||
-rw-r--r-- | drivers/video/backlight/corgi_bl.c | 2 | ||||
-rw-r--r-- | drivers/video/backlight/hp680_bl.c | 2 | ||||
-rw-r--r-- | drivers/video/backlight/locomolcd.c | 2 | ||||
-rw-r--r-- | include/acpi/acconfig.h | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 7f6c051..0f6d13b 100644 --- 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 094300b..cbcb2c2 100644 --- 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 9c52d87..4144d5d 100644 --- 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 61587ca..fde1d95 100644 --- 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 1c569fb..c07d820 100644 --- 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 2d79054..fc812d9 100644 --- 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 9e6c23c..ebc1f69 100644 --- 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 */ |